MDL-9643 minor maths unit test cleanup

This commit is contained in:
skodak 2007-05-25 07:07:05 +00:00
parent 8ae28b4959
commit a9cca58ea2

View File

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