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 ce42473..6cd1ff4 100644 (file)
--- a/tests/test_linear.py
+++ b/tests/test_linear.py
@@ -8,13 +8,13 @@ from pypol.linear import *
 
 try:
     import sympy
 
 try:
     import sympy

-    def _with_sympy(func):
+    def _requires_sympy(func):

         @functools.wraps(func)
         def wrapper(self):
             return func(self)
         return wrapper
 except ImportError:
         @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')
         @functools.wraps(func)
         def wrapper(self):
             raise unittest.SkipTest('SymPy is not available')


@@ -168,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)
 
         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)
     def test_fromsympy(self):
         sp_x, sp_y = sympy.symbols('x y')
         self.assertEqual(Expression.fromsympy(sp_x), self.x)


@@ -177,7 +177,7 @@ class TestExpression(unittest.TestCase):
         with self.assertRaises(ValueError):
             Expression.fromsympy(sp_x*sp_y)
 
         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)
     def test_tosympy(self):
         sp_x, sp_y = sympy.symbols('x y')
         self.assertEqual(self.x.tosympy(), sp_x)


@@ -192,7 +192,7 @@ class TestConstant(unittest.TestCase):
         self.one = Constant(1)
         self.pi = Constant(Fraction(22, 7))
 
         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):
     def test_fromsympy(self):
         self.assertEqual(Constant.fromsympy(sympy.Rational(22, 7)), self.pi)
         with self.assertRaises(TypeError):


@@ -213,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])
 
         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)
     def test_fromsympy(self):
         sp_x = sympy.Symbol('x')
         self.assertEqual(Symbol.fromsympy(sp_x), self.x)


@@ -261,13 +261,13 @@ class TestPolyhedron(unittest.TestCase):
         self.assertFalse(self.square.isuniverse())
 
     @unittest.expectedFailure
         self.assertFalse(self.square.isuniverse())
 
     @unittest.expectedFailure

-    @_with_sympy
+    @_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)
 
     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)
 

-    @_with_sympy
+    @_requires_sympy

     def test_tosympy(self):
         sp_x, sp_y = sympy.symbols('x y')
         self.assertEqual(self.square.tosympy(),
     def test_tosympy(self):
         sp_x, sp_y = sympy.symbols('x y')
         self.assertEqual(self.square.tosympy(),