Symplify TypeError messages in Expression.__new__

[linpy.git] / pypol / tests / test_polyhedra.py

diff --git a/pypol/tests/test_polyhedra.py b/pypol/tests/test_polyhedra.py
index cb2015f..689602b 100644 (file)
--- a/pypol/tests/test_polyhedra.py
+++ b/pypol/tests/test_polyhedra.py
@@ -13,18 +13,18 @@ class TestPolyhedron(unittest.TestCase):
         self.square = Polyhedron(inequalities=[x, 1 - x, y, 1 - y])
 
     def test_symbols(self):
         self.square = Polyhedron(inequalities=[x, 1 - x, y, 1 - y])
 
     def test_symbols(self):

-        self.assertCountEqual(self.square.symbols, symbols('x y'))
+        self.assertTupleEqual(self.square.symbols, symbols('x y'))

 
     def test_dimension(self):
         self.assertEqual(self.square.dimension, 2)
 
     def test_str(self):
         self.assertEqual(str(self.square),
 
     def test_dimension(self):
         self.assertEqual(self.square.dimension, 2)
 
     def test_str(self):
         self.assertEqual(str(self.square),

-            'And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))')
+            'And(0 <= x, 0 <= -x + 1, 0 <= y, 0 <= -y + 1)')

 
     def test_repr(self):
         self.assertEqual(repr(self.square),
 
     def test_repr(self):
         self.assertEqual(repr(self.square),

-            "And(Ge(x, 0), Ge(-x + 1, 0), Ge(y, 0), Ge(-y + 1, 0))")
+            "And(0 <= x, 0 <= -x + 1, 0 <= y, 0 <= -y + 1)")

 
     def test_fromstring(self):
         self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '
 
     def test_fromstring(self):
         self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '