Implement standard widening

[linpy.git] / pypol / tests / test_linexprs.py

diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py
index 4c27b21..1966b2a 100644 (file)
--- 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.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})
         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.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)
 
     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.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)
 
     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.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)
 
     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)
         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))
 
     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)
 
     def test_eq(self):
         self.assertEqual(self.expr, self.expr)


@@ -242,6 +246,13 @@ class TestDummy(unittest.TestCase):
         self.assertNotEqual(self.x, Dummy('x'))
         self.assertNotEqual(Dummy(), Dummy())
 
         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):
 
 
 class TestSymbols(unittest.TestCase):
 


@@ -250,9 +261,9 @@ class TestSymbols(unittest.TestCase):
         self.y = Symbol('y')
 
     def test(self):
         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):
         with self.assertRaises(TypeError):
             symbols(1)
         with self.assertRaises(TypeError):


@@ -264,7 +275,7 @@ class TestRational(unittest.TestCase):
     def setUp(self):
         self.zero = Rational(0)
         self.one = Rational(1)
     def setUp(self):
         self.zero = Rational(0)
         self.one = Rational(1)

-        self.pi = Rational(Fraction(22, 7))
+        self.pi = Rational(22, 7)

 
     def test_new(self):
         self.assertEqual(Rational(), self.zero)
 
     def test_new(self):
         self.assertEqual(Rational(), self.zero)


@@ -272,6 +283,10 @@ class TestRational(unittest.TestCase):
         self.assertEqual(Rational(self.pi), self.pi)
         self.assertEqual(Rational('22/7'), self.pi)
 
         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())
 
     def test_isconstant(self):
         self.assertTrue(self.zero.isconstant())
 


@@ -279,13 +294,6 @@ class TestRational(unittest.TestCase):
         self.assertFalse(self.zero)
         self.assertTrue(self.pi)
 
         self.assertFalse(self.zero)
         self.assertTrue(self.pi)
 

-    def test_fromstring(self):
-        self.assertEqual(Rational.fromstring('22/7'), self.pi)
-        with self.assertRaises(ValueError):
-            Rational.fromstring('a')
-        with self.assertRaises(TypeError):
-            Rational.fromstring(1)
-

     def test_repr(self):
         self.assertEqual(repr(self.zero), '0')
         self.assertEqual(repr(self.one), '1')
     def test_repr(self):
         self.assertEqual(repr(self.zero), '0')
         self.assertEqual(repr(self.one), '1')