Add some simplification test coverage

cjdrake · Feb 27, 2015 · 140010c · 140010c
1 parent ea7d3af
commit 140010c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/extension/boolexpr/simple.c b/extension/boolexpr/simple.c
@@ -338,12 +338,7 @@ _eq_simplify(BoolExpr *op)
 static BoolExpr *
 _not_simplify(BoolExpr *op)
 {
-    BoolExpr *x = op->data.xs->items[0];
-    BoolExpr *y;
-
-    CHECK_NULL(y, Not(x));
-
-    return y;
+    return Not(op->data.xs->items[0]);
 }
 
 

diff --git a/extension/boolexpr/test/test_simple.cpp b/extension/boolexpr/test/test_simple.cpp
@@ -365,6 +365,18 @@ TEST_F(BoolExprSimpleTest, EqualCases)
 }
 
 
+TEST_F(BoolExprSimpleTest, NotCases)
+{
+    ops[0] = NorN(3, xs[0], &One, xs[1]);
+    ops[1] = BoolExpr_Simplify(ops[0]);
+    EXPECT_EQ(ops[1], &Zero);
+
+    ops[2] = NandN(3, xs[0], xs[1], xs[2]);
+    ops[3] = BoolExpr_Simplify(ops[2]);
+    EXPECT_TRUE(Similar(ops[2], ops[3]));
+}
+
+
 TEST_F(BoolExprSimpleTest, ImpliesCases)
 {
     ops[0] = Implies(&Zero, xs[0]);
@@ -390,6 +402,10 @@ TEST_F(BoolExprSimpleTest, ImpliesCases)
     ops[10] = Implies(xns[0], xs[0]);
     ops[11] = BoolExpr_Simplify(ops[10]);
     EXPECT_EQ(ops[11], xs[0]);
+
+    ops[12] = Implies(xs[1], xs[2]);
+    ops[13] = BoolExpr_Simplify(ops[12]);
+    EXPECT_TRUE(Similar(ops[12], ops[13]));
 }
 
 
@@ -455,5 +471,9 @@ TEST_F(BoolExprSimpleTest, ITECases)
     ops[21] = BoolExpr_Simplify(ops[20]);
     exps[5] = AndN(2, xs[0], xs[1]);
     EXPECT_TRUE(Similar(ops[21], exps[5]));
+
+    ops[22] = ITE(xs[0], xs[1], xs[2]);
+    ops[23] = BoolExpr_Simplify(ops[22]);
+    EXPECT_TRUE(Similar(ops[22], ops[23]));
 }