From a9cca58ea25fe3f99ea51498cc2da761de6faafb Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Fri, 25 May 2007 07:07:05 +0000
Subject: [PATCH] MDL-9643 minor maths unit test cleanup

---
 lib/simpletest/testmathslib.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/simpletest/testmathslib.php b/lib/simpletest/testmathslib.php
index 541a3f9678..783fdd3c28 100755
--- a/lib/simpletest/testmathslib.php
+++ b/lib/simpletest/testmathslib.php
@@ -16,8 +16,8 @@ class mathsslib_test extends UnitTestCase {
      * Tests the basic formula execition
      */
     function test__basic() {
-        $calc = new calc_formula('=1+2');
-        $res = $calc->evaluate();
+        $formula = new calc_formula('=1+2');
+        $res = $formula->evaluate();
         $this->assertEqual($res, 3, '3+1 is: %s');
     }
 
@@ -25,8 +25,8 @@ class mathsslib_test extends UnitTestCase {
      * Tests the formula params
      */
     function test__params() {
-        $calc = new calc_formula('=a+b+c', array('a'=>10,'b'=>20,'c'=>30));
-        $res = $calc->evaluate();
+        $formula = new calc_formula('=a+b+c', array('a'=>10,'b'=>20,'c'=>30));
+        $res = $formula->evaluate();
         $this->assertEqual($res, 60, '10+20+30 is: %s');
     }
 
@@ -34,8 +34,8 @@ class mathsslib_test extends UnitTestCase {
      * Tests the formula params
      */
     function test__calc_function() {
-        $calc = new calc_formula('=sum(a,b,c)', array('a'=>10,'b'=>20,'c'=>30));
-        $res = $calc->evaluate();
+        $formula = new calc_formula('=sum(a,b,c)', array('a'=>10,'b'=>20,'c'=>30));
+        $res = $formula->evaluate();
         $this->assertEqual($res, 60, 'sum(a,b,c) is: %s');
     }
 
@@ -43,12 +43,12 @@ class mathsslib_test extends UnitTestCase {
      * Tests the formula changed params
      */
     function test__changing_params() {
-        $calc = new calc_formula('=a+b+c', array('a'=>10,'b'=>20,'c'=>30));
-        $res = $calc->evaluate();
+        $formula = new calc_formula('=a+b+c', array('a'=>10,'b'=>20,'c'=>30));
+        $res = $formula->evaluate();
         $this->assertEqual($res, 60, '10+20+30 is: %s');
-        $calc->set_params(array('a'=>1,'b'=>2,'c'=>3));
-        $res = $calc->evaluate();
-        $this->assertEqual($res, 6, '1+2+3 is: %s');
+        $formula->set_params(array('a'=>1,'b'=>2,'c'=>3));
+        $res = $formula->evaluate();
+        $this->assertEqual($res, 6, 'changed params - 1+2+3 is: %s');
     }
 
 }
-- 
2.39.5