Separate unit test for overlapping conditions

jeffmay · Feb 21, 2022 · f1a248e · f1a248e
1 parent 0c05312
commit f1a248e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/core-v1/src/test/scala/SimpleJustifiedMatchSpec.scala b/core-v1/src/test/scala/SimpleJustifiedMatchSpec.scala
@@ -44,16 +44,26 @@ class SimpleJustifiedMatchSpec extends FunSuite {
   test("Expr.Match only evaluates the expression when the guard expression returns true") {
     val expr = valuesOfType(FactTypes.RoleClass).filter {
       _.matching(
-        Case[Author].when(_.get(_.select(_.articles)) < 5.const) ==> false.const,
-        Case[Author].when(_.get(_.select(_.articles)) > 4.const) ==> true.const,
+        Case[Author].when(_.get(_.select(_.articles)) >= 5.const) ==> true.const,
       ).getOrElse(false.const)
     }
     val matched = expr.run(FactTable(all))
     val expected = Seq(admin, editor).map(v => Justified.byFact(FactTypes.RoleClass(v)))
     assertEquals(matched, expected)
   }
 
-  test("Expr.Match only evaluates the expression when the guard expression returns true") {
+  test("Expr.Match does not evaluate the expression when the guard expression returns false") {
+    val expr = valuesOfType(FactTypes.RoleClass).filter {
+      _.matching(
+        Case[Author].when(_.get(_.select(_.articles)) < 5.const) ==> true.const,
+      ).getOrElse(false.const)
+    }
+    val matched = expr.run(FactTable(all))
+    val expected = Seq(author).map(v => Justified.byFact(FactTypes.RoleClass(v)))
+    assertEquals(matched, expected)
+  }
+
+  test("Expr.Match only evaluates overlapping guard expressions in sequence") {
     val expr = valuesOfType(FactTypes.RoleClass).filter {
       _.matching(
         Case[Author].when(_.get(_.select(_.articles)) > 5.const) ==> false.const,

diff --git a/core-v1/src/test/scala/SimpleMatchSpec.scala b/core-v1/src/test/scala/SimpleMatchSpec.scala
@@ -43,15 +43,24 @@ class SimpleMatchSpec extends FunSuite {
   test("Expr.Match only evaluates the expression when the guard expression returns true") {
     val expr = valuesOfType(FactTypes.RoleClass).filter {
       _.matching(
-        Case[Author].when(_.get(_.select(_.articles)) < 5.const) ==> false.const,
-        Case[Author].when(_.get(_.select(_.articles)) > 4.const) ==> true.const,
+        Case[Author].when(_.get(_.select(_.articles)) >= 5.const) ==> true.const,
       ).getOrElse(false.const)
     }
     val matched = expr.run(FactTable(all))
     assertEquals(matched, Seq(admin, editor))
   }
 
-  test("Expr.Match only evaluates guard expressions in sequence") {
+  test("Expr.Match does not evaluate the expression when the guard expression returns false") {
+    val expr = valuesOfType(FactTypes.RoleClass).filter {
+      _.matching(
+        Case[Author].when(_.get(_.select(_.articles)) < 5.const) ==> true.const,
+      ).getOrElse(false.const)
+    }
+    val matched = expr.run(FactTable(all))
+    assertEquals(matched, Seq(author))
+  }
+
+  test("Expr.Match only evaluates overlapping guard expressions in sequence") {
     val expr = valuesOfType(FactTypes.RoleClass).filter {
       _.matching(
         Case[Author].when(_.get(_.select(_.articles)) > 5.const) ==> false.const,