X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/1d494bb187b70135df721c13306d7f26fdf33f50..e27fd6a18fd36b8ec81f37cd800399703bf7ef4f:/pypol/tests/test_polyhedra.py diff --git a/pypol/tests/test_polyhedra.py b/pypol/tests/test_polyhedra.py index c74e25f..c7a58a4 100644 --- a/pypol/tests/test_polyhedra.py +++ b/pypol/tests/test_polyhedra.py @@ -3,21 +3,7 @@ import unittest from ..linexprs import symbols from ..polyhedra import * - - -try: - import sympy - def _requires_sympy(func): - @functools.wraps(func) - def wrapper(self): - return func(self) - return wrapper -except ImportError: - def _requires_sympy(func): - @functools.wraps(func) - def wrapper(self): - raise unittest.SkipTest('SymPy is not available') - return wrapper +from .libhelper import requires_sympy class TestPolyhedron(unittest.TestCase): @@ -50,14 +36,16 @@ class TestPolyhedron(unittest.TestCase): def test_isuniverse(self): self.assertFalse(self.square.isuniverse()) - @_requires_sympy + @requires_sympy def test_fromsympy(self): + import sympy 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 + @requires_sympy def test_tosympy(self): + import sympy 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))