X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/29ed88d1a15d283ea6f3340a4dd97e8cc7c2d2d4..25ce908cffca380f930182a77c1e5a4491042a1c:/pypol/tests/test_linexprs.py?ds=sidebyside diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py index 8dfd13e..1966b2a 100644 --- a/pypol/tests/test_linexprs.py +++ b/pypol/tests/test_linexprs.py @@ -19,10 +19,10 @@ 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, Constant) + 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, Constant) + self.assertNotIsInstance(self.x + self.pi, Rational) xx = Expression({self.x: 2}) self.assertNotIsInstance(xx, Symbol) with self.assertRaises(TypeError): @@ -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) @@ -117,11 +117,15 @@ class TestExpression(unittest.TestCase): self.assertEqual(self.expr * 0, 0) self.assertEqual(0 * self.expr, 0) self.assertEqual(self.expr * 2, 2*self.x - 4*self.y + 6) + with self.assertRaises(TypeError): + self.x * self.x def test_truediv(self): with self.assertRaises(ZeroDivisionError): self.expr / 0 self.assertEqual(self.expr / 2, self.x / 2 - self.y + Fraction(3, 2)) + with self.assertRaises(TypeError): + self.x / self.x def test_eq(self): self.assertEqual(self.expr, self.expr) @@ -225,24 +229,63 @@ class TestSymbol(unittest.TestCase): with self.assertRaises(TypeError): Symbol.fromsympy(sp_x*sp_x) - def test_symbols(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]) +class TestDummy(unittest.TestCase): + + def setUp(self): + self.x = Dummy('x') + + def test_new(self): + self.assertEqual(self.x.name, 'x') + self.assertTrue(Dummy().name.startswith('Dummy')) + + def test_eq(self): + self.assertEqual(self.x, self.x) + self.assertNotEqual(self.x, Symbol('x')) + self.assertNotEqual(Symbol('x'), self.x) + self.assertNotEqual(self.x, Dummy('x')) + self.assertNotEqual(Dummy(), Dummy()) -class TestConstant(unittest.TestCase): + 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): def setUp(self): - self.zero = Constant(0) - self.one = Constant(1) - self.pi = Constant(Fraction(22, 7)) + self.x = Symbol('x') + self.y = Symbol('y') + + def test(self): + 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): + symbols(['a', 1]) + + +class TestRational(unittest.TestCase): + + def setUp(self): + self.zero = Rational(0) + self.one = Rational(1) + self.pi = Rational(22, 7) def test_new(self): - self.assertEqual(Constant(), self.zero) - self.assertEqual(Constant(1), self.one) - self.assertEqual(Constant(self.pi), self.pi) - self.assertEqual(Constant('22/7'), self.pi) + self.assertEqual(Rational(), self.zero) + self.assertEqual(Rational(1), self.one) + self.assertEqual(Rational(self.pi), self.pi) + self.assertEqual(Rational('22/7'), self.pi) + + def test_hash(self): + self.assertEqual(hash(self.one), hash(1)) + self.assertEqual(hash(self.pi), hash(Fraction(22, 7))) def test_isconstant(self): self.assertTrue(self.zero.isconstant()) @@ -251,13 +294,6 @@ class TestConstant(unittest.TestCase): self.assertFalse(self.zero) self.assertTrue(self.pi) - def test_fromstring(self): - self.assertEqual(Constant.fromstring('22/7'), self.pi) - with self.assertRaises(ValueError): - Constant.fromstring('a') - with self.assertRaises(TypeError): - Constant.fromstring(1) - def test_repr(self): self.assertEqual(repr(self.zero), '0') self.assertEqual(repr(self.one), '1') @@ -266,6 +302,6 @@ class TestConstant(unittest.TestCase): @requires_sympy def test_fromsympy(self): import sympy - self.assertEqual(Constant.fromsympy(sympy.Rational(22, 7)), self.pi) + self.assertEqual(Rational.fromsympy(sympy.Rational(22, 7)), self.pi) with self.assertRaises(TypeError): - Constant.fromsympy(sympy.Symbol('x')) + Rational.fromsympy(sympy.Symbol('x'))