messy and needs reformatting but returning correct values for now

[linpy.git] / tests / test_linear.py

diff --git a/tests/test_linear.py b/tests/test_linear.py
index 879cc17..6cd1ff4 100644 (file)
--- a/tests/test_linear.py
+++ b/tests/test_linear.py
@@ -8,13 +8,13 @@ from pypol.linear import *
 
 try:
     import sympy
-    def _with_sympy(func):
+    def _requires_sympy(func):
         @functools.wraps(func)
         def wrapper(self):
             return func(self)
         return wrapper
 except ImportError:
-    def _with_sympy(func):
+    def _requires_sympy(func):
         @functools.wraps(func)
         def wrapper(self):
             raise unittest.SkipTest('SymPy is not available')
@@ -148,7 +148,8 @@ class TestExpression(unittest.TestCase):
         self.assertEqual(repr(self.x), "Symbol('x')")
         self.assertEqual(repr(self.one), 'Constant(1)')
         self.assertEqual(repr(self.pi), 'Constant(22, 7)')
-        self.assertEqual(repr(self.expr), "Expression({'x': 1, 'y': -2}, 3)")
+        self.assertEqual(repr(self.x + self.one), "Expression('x + 1')")
+        self.assertEqual(repr(self.expr), "Expression('x - 2*y + 3')")
 
     def test_fromstring(self):
         self.assertEqual(Expression.fromstring('x'), self.x)
@@ -167,7 +168,7 @@ class TestExpression(unittest.TestCase):
         self.assertEqual((self.x + self.y/2 + self.z/3)._toint(),
                 6*self.x + 3*self.y + 2*self.z)
 
-    @_with_sympy
+    @_requires_sympy
     def test_fromsympy(self):
         sp_x, sp_y = sympy.symbols('x y')
         self.assertEqual(Expression.fromsympy(sp_x), self.x)
@@ -176,7 +177,7 @@ class TestExpression(unittest.TestCase):
         with self.assertRaises(ValueError):
             Expression.fromsympy(sp_x*sp_y)
 
-    @_with_sympy
+    @_requires_sympy
     def test_tosympy(self):
         sp_x, sp_y = sympy.symbols('x y')
         self.assertEqual(self.x.tosympy(), sp_x)
@@ -191,7 +192,7 @@ class TestConstant(unittest.TestCase):
         self.one = Constant(1)
         self.pi = Constant(Fraction(22, 7))
 
-    @_with_sympy
+    @_requires_sympy
     def test_fromsympy(self):
         self.assertEqual(Constant.fromsympy(sympy.Rational(22, 7)), self.pi)
         with self.assertRaises(TypeError):
@@ -212,7 +213,7 @@ class TestSymbol(unittest.TestCase):
         self.assertListEqual(list(symbols('x,y')), [self.x, self.y])
         self.assertListEqual(list(symbols(['x', 'y'])), [self.x, self.y])
 
-    @_with_sympy
+    @_requires_sympy
     def test_fromsympy(self):
         sp_x = sympy.Symbol('x')
         self.assertEqual(Symbol.fromsympy(sp_x), self.x)
@@ -231,4 +232,67 @@ class TestOperators(unittest.TestCase):
 
 class TestPolyhedron(unittest.TestCase):
 
-    pass
+    def setUp(self):
+        x, y = symbols('x y')
+        self.square = Polyhedron(inequalities=[x, 1 - x, y, 1 - y])
+
+    def test_symbols(self):
+        self.assertCountEqual(self.square.symbols, ['x', 'y'])
+
+    def test_dimension(self):
+        self.assertEqual(self.square.dimension, 2)
+
+    def test_str(self):
+        self.assertEqual(str(self.square),
+            'x >= 0, -x + 1 >= 0, y >= 0, -y + 1 >= 0')
+
+    def test_repr(self):
+        self.assertEqual(repr(self.square),
+            "Polyhedron('x >= 0, -x + 1 >= 0, y >= 0, -y + 1 >= 0')")
+
+    def test_fromstring(self):
+        self.assertEqual(Polyhedron.fromstring('{x >= 0, -x + 1 >= 0, '
+            'y >= 0, -y + 1 >= 0}'), self.square)
+
+    def test_isempty(self):
+        self.assertFalse(self.square.isempty())
+
+    def test_isuniverse(self):
+        self.assertFalse(self.square.isuniverse())
+
+    @unittest.expectedFailure
+    @_requires_sympy
+    def test_fromsympy(self):
+        sp_x, sp_y = sympy.symbols('x y')
+        self.assertEqual(Polyhedron.fromsympy((sp_x >= 0) & (sp_x <= 1) &
+            (sp_y >= 0) & (sp_y <= 1)), self.square)
+
+    @_requires_sympy
+    def test_tosympy(self):
+        sp_x, sp_y = sympy.symbols('x y')
+        self.assertEqual(self.square.tosympy(),
+            sympy.And(-sp_x + 1 >= 0, -sp_y + 1 >= 0, sp_x >= 0, sp_y >= 0))
+
+
+class TestEmpty:
+
+    def test_repr(self):
+        self.assertEqual(repr(Empty), 'Empty')
+
+    def test_isempty(self):
+        self.assertTrue(Empty.isempty())
+
+    def test_isuniverse(self):
+        self.assertFalse(Empty.isuniverse())
+
+
+class TestUniverse:
+
+    def test_repr(self):
+        self.assertEqual(repr(Universe), 'Universe')
+
+    def test_isempty(self):
+        self.assertTrue(Universe.isempty())
+
+    def test_isuniverse(self):
+        self.assertTrue(Universe.isuniverse())