Cleanup backwards-incompatible test changes

cjdrake · Feb 25, 2015 · c1d3fde · c1d3fde
1 parent 33dbdb0
commit c1d3fde
Show file tree

Hide file tree

Showing 2 changed files with 355 additions and 429 deletions.
diff --git a/pyeda/boolalg/test/test_bdd.py b/pyeda/boolalg/test/test_bdd.py
@@ -7,7 +7,7 @@
     BinaryDecisionDiagram,
     BDDNODEZERO, BDDNODEONE,
 )
-from pyeda.boolalg.expr import expr, ExprOr, ExprAnd
+from pyeda.boolalg.expr import expr, OrOp, AndOp
 
 
 zero = BinaryDecisionDiagram.box(0)
@@ -47,11 +47,11 @@ def test_expr2bdd():
 def test_bdd2expr():
     ex = bdd2expr(a ^ b ^ c, conj=False)
     assert ex.equivalent(expr("a ^ b ^ c"))
-    assert type(ex) is ExprOr and ex.depth == 2
+    assert type(ex) is OrOp and ex.depth == 2
 
     ex = bdd2expr(a ^ b ^ c, conj=True)
     assert ex.equivalent(expr("a ^ b ^ c"))
-    assert type(ex) is ExprAnd and ex.depth == 2
+    assert type(ex) is AndOp and ex.depth == 2
 
 def test_upoint2bddpoint():
     upoint = (frozenset([a.uniqid, c.uniqid]), frozenset([b.uniqid, d.uniqid]))