Merge pull request #1 from NeonXP/master

Merge from upstream master

1 files changed, 32 insertions, 22 deletions

diff --git a/tests/MathTest.php b/tests/MathTest.php
index a83a0d4..db6e486 100644
--- a/tests/MathTest.php
+++ b/tests/MathTest.php
@@ -27,7 +27,7 @@ class MathTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($calculator->execute($expression), $phpResult);
     }
 
-    public function testZeroDevision()
+    public function testZeroDivision()
     {
         $calculator = new MathExecutor();
         $this->assertEquals($calculator->execute('1 / 0'), 0);
@@ -44,34 +44,44 @@ class MathTest extends \PHPUnit_Framework_TestCase
      */
     public function providerExpressions()
     {
-        return array(
-            array('0.1 + 0.2'),
-            array('1 + 2'),
+        return [
+            ['0.1 + 0.2'],
+            ['1 + 2'],
 
-            array('0.1 - 0.2'),
-            array('1 - 2'),
+            ['0.1 - 0.2'],
+            ['1 - 2'],
 
-            array('0.1 * 2'),
-            array('1 * 2'),
+            ['0.1 * 2'],
+            ['1 * 2'],
 
-            array('0.1 / 0.2'),
-            array('1 / 2'),
+            ['0.1 / 0.2'],
+            ['1 / 2'],
 
-            array('2 * 2 + 3 * 3'),
+            ['2 * 2 + 3 * 3'],
 
-            array('1 + 0.6 - 3 * 2 / 50'),
+            ['1 + 0.6 - 3 * 2 / 50'],
 
-            array('(5 + 3) * -1'),
+            ['(5 + 3) * -1'],
 
-            array('2+2*2'),
-            array('(2+2)*2'),
-            array('(2+2)*-2'),
-            array('(2+-2)*2'),
+            ['2+2*2'],
+            ['(2+2)*2'],
+            ['(2+2)*-2'],
+            ['(2+-2)*2'],
 
-            array('sin(10) * cos(50) / min(10, 20/2)'),
+            ['sin(10) * cos(50) / min(10, 20/2)'],
 
-            array('100500 * 3.5E5'),
-            array('100500 * 3.5E-5')
-        );
+            ['100500 * 3.5E5'],
+            ['100500 * 3.5E-5'],
+        ];
     }
-}
+
+    public function testFunction()
+    {
+        $calculator = new MathExecutor();
+
+        $calculator->addFunction('round', function ($arg) { return round($arg); }, 1);
+        /** @var float $phpResult */
+        eval('$phpResult = round(100/30);');
+        $this->assertEquals($calculator->execute('round(100/30)'), $phpResult);
+    }
+}
\ No newline at end of file