X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/de11b4e658edf3ea876aaea3d3d681eaec13dcc4..e2a9aaf40294f77a0c7c6fbccf6fd968b6355c90:/pypol/tests/test_linexprs.py diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py index 4c27b21..c55c842 100644 --- a/pypol/tests/test_linexprs.py +++ b/pypol/tests/test_linexprs.py @@ -19,8 +19,8 @@ class TestExpression(unittest.TestCase): self.expr = self.x - 2*self.y + 3 def test_new(self): - self.assertIsInstance(self.x, Symbol) - self.assertIsInstance(self.pi, Rational) + self.assertIsInstance(Expression(coefficients={self.x: 1}), Symbol) + self.assertIsInstance(Expression(constant=self.pi), Rational) self.assertNotIsInstance(self.x + self.pi, Symbol) self.assertNotIsInstance(self.x + self.pi, Rational) xx = Expression({self.x: 2}) @@ -59,7 +59,7 @@ class TestExpression(unittest.TestCase): self.expr[self.expr] def test_coefficients(self): - self.assertCountEqual(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) @@ -67,9 +67,9 @@ class TestExpression(unittest.TestCase): self.assertEqual(self.expr.constant, 3) def test_symbols(self): - self.assertCountEqual(self.x.symbols, [self.x]) - self.assertCountEqual(self.pi.symbols, []) - self.assertCountEqual(self.expr.symbols, [self.x, self.y]) + self.assertTupleEqual(self.x.symbols, (self.x,)) + self.assertTupleEqual(self.pi.symbols, ()) + self.assertTupleEqual(self.expr.symbols, (self.x, self.y)) def test_dimension(self): self.assertEqual(self.x.dimension, 1) @@ -87,7 +87,7 @@ class TestExpression(unittest.TestCase): self.assertFalse(self.expr.issymbol()) def test_values(self): - self.assertCountEqual(self.expr.values(), [1, -2, 3]) + self.assertListEqual(list(self.expr.values()), [1, -2, 3]) def test_bool(self): self.assertTrue(self.x) @@ -242,6 +242,13 @@ class TestDummy(unittest.TestCase): self.assertNotEqual(self.x, Dummy('x')) self.assertNotEqual(Dummy(), Dummy()) + def test_repr(self): + self.assertEqual(repr(self.x), '_x') + dummy1 = Dummy() + dummy2 = Dummy() + self.assertTrue(repr(dummy1).startswith('_Dummy_')) + self.assertNotEqual(repr(dummy1), repr(dummy2)) + class TestSymbols(unittest.TestCase): @@ -250,9 +257,9 @@ class TestSymbols(unittest.TestCase): self.y = Symbol('y') def test(self): - 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.assertTupleEqual(symbols('x y'), (self.x, self.y)) + self.assertTupleEqual(symbols('x,y'), (self.x, self.y)) + self.assertTupleEqual(symbols(['x', 'y']), (self.x, self.y)) with self.assertRaises(TypeError): symbols(1) with self.assertRaises(TypeError):