Merge branch 'master' into dev

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/MathTest.php b/tests/MathTest.php
index 2b2727f..9bf8d97 100644
--- a/tests/MathTest.php
+++ b/tests/MathTest.php
@@ -27,6 +27,18 @@ class MathTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($calculator->execute($expression), $phpResult);
     }
 
+    public function testZeroDevision()
+    {
+        $calculator = new MathExecutor();
+        $this->assertEquals($calculator->execute('1 / 0'), 0);
+    }
+
+    public function testExponentiation()
+    {
+        $calculator = new MathExecutor();
+        $this->assertEquals($calculator->execute('10 ^ 2'), 100);
+    }
+
     /**
      * Expressions data provider
      */