Simplify C code

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

diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py
index adfec7d..5beaa17 100644 (file)
--- a/pypol/tests/test_linexprs.py
+++ b/pypol/tests/test_linexprs.py
@@ -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)


@@ -225,10 +225,45 @@ class TestSymbol(unittest.TestCase):
         with self.assertRaises(TypeError):
             Symbol.fromsympy(sp_x*sp_x)
 
         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())
+
+    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.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):
 
 
 class TestRational(unittest.TestCase):