X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/49fa0d574a20817712006d479549dd96ccfff652..refs/heads/master:/linpy/tests/test_linexprs.py?ds=sidebyside diff --git a/linpy/tests/test_linexprs.py b/linpy/tests/test_linexprs.py index 1b01186..0c50e6c 100644 --- a/linpy/tests/test_linexprs.py +++ b/linpy/tests/test_linexprs.py @@ -15,12 +15,11 @@ # You should have received a copy of the GNU General Public License # along with LinPy. If not, see . -import functools import unittest from fractions import Fraction -from ..linexprs import * +from ..linexprs import Dummy, LinExpr, Rational, Symbol, symbols from .libhelper import requires_sympy @@ -76,7 +75,8 @@ class TestLinExpr(unittest.TestCase): self.expr[self.expr] def test_coefficients(self): - self.assertListEqual(list(self.expr.coefficients()), [(self.x, 1), (self.y, -2)]) + self.assertListEqual(list(self.expr.coefficients()), + [(self.x, 1), (self.y, -2)]) def test_constant(self): self.assertEqual(self.x.constant, 0) @@ -151,7 +151,7 @@ class TestLinExpr(unittest.TestCase): def test_scaleint(self): self.assertEqual((self.x + self.y/2 + self.z/3).scaleint(), - 6*self.x + 3*self.y + 2*self.z) + 6*self.x + 3*self.y + 2*self.z) def test_subs(self): self.assertEqual(self.x.subs(self.x, 3), 3) @@ -161,9 +161,12 @@ class TestLinExpr(unittest.TestCase): self.assertEqual(self.x.subs(self.y, 3), self.x) self.assertEqual(self.pi.subs(self.x, 3), self.pi) self.assertEqual(self.expr.subs(self.x, -3), -2 * self.y) - self.assertEqual(self.expr.subs([(self.x, self.y), (self.y, self.x)]), 3 - self.x) - self.assertEqual(self.expr.subs({self.x: self.z, self.y: self.z}), 3 - self.z) - self.assertEqual(self.expr.subs({self.x: self.z, self.y: self.z}), 3 - self.z) + self.assertEqual(self.expr.subs([(self.x, self.y), (self.y, self.x)]), + -2*self.x + self.y + 3) + self.assertEqual(self.expr.subs({self.x: self.z, self.y: self.z}), + 3 - self.z) + self.assertEqual(self.expr.subs({self.x: self.z, self.y: self.z}), + 3 - self.z) with self.assertRaises(TypeError): self.x.subs('x', 3) with self.assertRaises(TypeError):