From 8a2cae984f77ed55195bed071b12a165fa532561 Mon Sep 17 00:00:00 2001
From: Bruce Wells <brucekwells@gmail.com>
Date: Mon, 27 Jul 2020 12:25:59 -0400
Subject: Better setVar error message (#70)
Additional unit tests
Readme update
---
tests/MathTest.php | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 53 insertions(+), 4 deletions(-)
(limited to 'tests')
diff --git a/tests/MathTest.php b/tests/MathTest.php
index 2669ccd..8f5665b 100644
--- a/tests/MathTest.php
+++ b/tests/MathTest.php
@@ -15,6 +15,7 @@ use Exception;
use NXP\Exception\DivisionByZeroException;
use NXP\Exception\IncorrectExpressionException;
use NXP\Exception\IncorrectNumberOfFunctionParametersException;
+use NXP\Exception\MathExecutorException;
use NXP\Exception\UnknownFunctionException;
use NXP\Exception\UnknownVariableException;
use NXP\MathExecutor;
@@ -332,9 +333,11 @@ class MathTest extends TestCase
{
$calculator = new MathExecutor();
$this->assertEquals(3.14159265359, $calculator->execute('$pi'));
+ $this->assertEquals(3.14159265359, $calculator->execute('pi'));
$this->assertEquals(2.71828182846, $calculator->execute('$e'));
+ $this->assertEquals(2.71828182846, $calculator->execute('e'));
$calculator->setVars([
- 'trx_amount' => 100000,
+ 'trx_amount' => 100000.01,
'ten' => 10,
'nine' => 9,
'eight' => 8,
@@ -347,7 +350,7 @@ class MathTest extends TestCase
'one' => 1,
'zero' => 0,
]);
- $this->assertEquals(100000, $calculator->execute('$trx_amount'));
+ $this->assertEquals(100000.01, $calculator->execute('$trx_amount'));
$this->assertEquals(10 - 9, $calculator->execute('$ten - $nine'));
$this->assertEquals(9 - 10, $calculator->execute('$nine - $ten'));
$this->assertEquals(10 + 9, $calculator->execute('$ten + $nine'));
@@ -355,8 +358,14 @@ class MathTest extends TestCase
$this->assertEquals(10 / 9, $calculator->execute('$ten / $nine'));
$this->assertEquals(10 / (9 / 5), $calculator->execute('$ten / ($nine / $five)'));
- $this->expectException(UnknownVariableException::class);
- $this->assertEquals(0.0, $calculator->execute('$unsetVariable'));
+ // test variables without leading $
+ $this->assertEquals(100000.01, $calculator->execute('trx_amount'));
+ $this->assertEquals(10 - 9, $calculator->execute('ten - nine'));
+ $this->assertEquals(9 - 10, $calculator->execute('nine - ten'));
+ $this->assertEquals(10 + 9, $calculator->execute('ten + nine'));
+ $this->assertEquals(10 * 9, $calculator->execute('ten * nine'));
+ $this->assertEquals(10 / 9, $calculator->execute('ten / nine'));
+ $this->assertEquals(10 / (9 / 5), $calculator->execute('ten / (nine / five)'));
}
public function testEvaluateFunctionParameters()
@@ -477,4 +486,44 @@ class MathTest extends TestCase
$calculator = new MathExecutor();
$this->assertGreaterThan(1, count($calculator->getVars()));
}
+
+ public function testUndefinedVarThrowsExecption()
+ {
+ $calculator = new MathExecutor();
+ $this->assertGreaterThan(1, count($calculator->getVars()));
+ $this->expectException(UnknownVariableException::class);
+ $calculator->execute('5 * undefined');
+ }
+
+ public function testSetVarsAcceptsAllScalars()
+ {
+ $calculator = new MathExecutor();
+ $calculator->setVar('boolTrue', true);
+ $calculator->setVar('boolFalse', false);
+ $calculator->setVar('int', 1);
+ $calculator->setVar('float', 1.1);
+ $calculator->setVar('string', 'string');
+ $this->assertEquals(7, count($calculator->getVars()));
+ }
+
+ public function testSetVarsDoesNoAcceptObject()
+ {
+ $calculator = new MathExecutor();
+ $this->expectException(MathExecutorException::class);
+ $calculator->setVar('object', $this);
+ }
+
+ public function testSetVarsDoesNotAcceptNull()
+ {
+ $calculator = new MathExecutor();
+ $this->expectException(MathExecutorException::class);
+ $calculator->setVar('null', null);
+ }
+
+ public function testSetVarsDoesNotAcceptResource()
+ {
+ $calculator = new MathExecutor();
+ $this->expectException(MathExecutorException::class);
+ $calculator->setVar('resource', tmpfile());
+ }
}
--
cgit v1.2.3