Merge e7688cf into 68c5aca

writeonly · Apr 11, 2019 · 00cc0b9 · 00cc0b9
2 parents 68c5aca + e7688cf
commit 00cc0b9
Showing 1 changed file with 40 additions and 5 deletions.
diff --git a/re/shared/src/test/scala/pl/writeonly/re/shared/calculator/CalculatorParserTest.scala b/re/shared/src/test/scala/pl/writeonly/re/shared/calculator/CalculatorParserTest.scala
@@ -6,21 +6,56 @@ import utest._
 @SuppressWarnings(Array("org.wartremover.warts.Any"))
 object CalculatorParserTest extends TestSuite {
   override val tests: Tests = Tests {
+
     val parser = new CalculatorParser()
     val expr = parser.expr
-    "1+1" - {
-      val result = expr.parse("1+1")
-
+    "2+3" - {
+      val result = expr.parse("2+3")
+      val Expected = 2 + 3
+      assertMatch(result) {
+        case Parsed.Success(Expected, _) =>
+      }
+    }
+    "2-3" - {
+      val result = expr.parse("2-3")
+      val Expected = 2 - 3
+      assertMatch(result) {
+        case Parsed.Success(Expected, _) =>
+      }
+    }
+    "2*3" - {
+      val result = expr.parse("2*3")
+      val Expected = 2 * 3
+      assertMatch(result) {
+        case Parsed.Success(Expected, _) =>
+      }
+    }
+    "2/3" - {
+      val result = expr.parse("2/3")
+      val Expected = 2 / 3
       assertMatch(result) {
-        case Parsed.Success(2, _) =>
+        case Parsed.Success(Expected, _) =>
       }
     }
     "1+1*" - {
       val result = expr.parse("1+1*")
-
       assertMatch(result) {
         case _: Parsed.Failure[_, _] =>
       }
     }
+    "(1+1*2)+3*4" - {
+      val result = expr.parse("(1+1*2)+3*4")
+      val Expected = (1 + 1 * 2) + 3 * 4
+      assertMatch(result) {
+        case Parsed.Success(Expected, _) =>
+      }
+    }
+    "((1+1*2)+3*4*5)/3" - {
+      val result = expr.parse("((1+1*2)+3*4*5)/3")
+      val Expected = ((1 + 1 * 2) + 3 * 4 * 5) / 3
+      assertMatch(result) {
+        case Parsed.Success(Expected, _) =>
+      }
+    }
   }
 }