From ac7c2da4f1d7e2ae44464f3d86fb5b6a01274d12 Mon Sep 17 00:00:00 2001
From: AurumTheEnd <47597303+aurumtheend@users.noreply.github.com>
Date: Mon, 22 Apr 2024 18:26:59 +0200
Subject: [PATCH] feat(test): added expression tests to increase coverage

---
 src/expressions/structs/expression.rs | 44 +++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/expressions/structs/expression.rs b/src/expressions/structs/expression.rs
index 9462d37..968749d 100644
--- a/src/expressions/structs/expression.rs
+++ b/src/expressions/structs/expression.rs
@@ -175,9 +175,11 @@ pub mod tests {
         let x = var("a");
         let y = Expression::negate(&x);
         let z = Expression::negate(&y);
+        let not_it = Expression::binary_and(&x, &x);
         assert!(x.is_literal());
         assert!(y.is_literal());
         assert!(!z.is_literal());
+        assert!(!not_it.is_literal());
     }
 
     #[test]
@@ -211,7 +213,7 @@ pub mod tests {
     }
 
     #[test]
-    fn distribute_basic() {
+    fn distribute_basic_and_right() {
         let input_left = var("a");
         let input_right = var("b") & var("c");
 
@@ -221,6 +223,17 @@ pub mod tests {
         assert!(expected.semantic_eq(&actual));
     }
 
+    #[test]
+    fn distribute_basic_and_left() {
+        let input_left = var("b") & var("c");
+        let input_right = var("a");
+
+        let expected = (var("b") | var("a")) & (var("c") | var("a"));
+        let actual = Expression::distribute(&input_left, &input_right);
+
+        assert!(expected.semantic_eq(&actual));
+    }
+
     #[test]
     fn to_cnf_basic() {
         let input = var("a") | (var("b") & var("c"));
@@ -269,13 +282,13 @@ pub mod tests {
                 &Expression::binary_or(&x, &y),
                 &Expression::binary_or(&x, &y),
             ),
-            &Expression::binary_or(&x, &y),
+            &Expression::binary_or(&x, &Expression::negate(&y)),
         );
 
         let leveled = Expression::n_ary_and(&[
             Expression::binary_or(&x, &y),
             Expression::binary_or(&x, &y),
-            Expression::binary_or(&x, &y),
+            Expression::binary_or(&x, &Expression::negate(&y)),
         ]);
 
         assert!(nested.semantic_eq(&leveled));
@@ -284,6 +297,31 @@ pub mod tests {
         assert!(leveled.is_cnf());
     }
 
+    #[test]
+    fn is_not_cnf() {
+        assert!(!bool(true).is_cnf());
+
+        // We intentionally don't use the built-in operators because they would "level" the expression.
+        let x = var("x");
+        let y = var("y");
+
+        let nested = Expression::binary_or(
+            &Expression::binary_or(
+                &Expression::binary_and(&x, &y),
+                &Expression::binary_and(&x, &y),
+            ),
+            &Expression::binary_and(&x, &Expression::negate(&y)),
+        );
+        assert!(!nested.is_cnf());
+
+        let leveled = Expression::n_ary_or(&[
+            Expression::binary_and(&x, &y),
+            Expression::binary_and(&x, &y),
+            Expression::binary_and(&x, &Expression::negate(&y)),
+        ]);
+        assert!(!leveled.is_cnf());
+    }
+
     #[test]
     fn test_rename_literals_ok() {
         let pairs = [("a", "1"), ("b", "2"), ("c", "3"), ("d", "4"), ("e", "5")];