X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/7afcb0a1ded9e9a331b131689d68c085f712143f..d585b06ccf67b2837519f4b48c6800dcdb924d9d:/linpy/tests/test_linexprs.py

diff --git a/linpy/tests/test_linexprs.py b/linpy/tests/test_linexprs.py
index fb7e4a2..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 <http://www.gnu.org/licenses/>.
 
-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):
@@ -195,7 +198,7 @@ class TestLinExpr(unittest.TestCase):
         self.assertEqual(LinExpr.fromsympy(sp_x), self.x)
         self.assertEqual(LinExpr.fromsympy(sympy.Rational(22, 7)), self.pi)
         self.assertEqual(LinExpr.fromsympy(sp_x - 2*sp_y + 3), self.expr)
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TypeError):
             LinExpr.fromsympy(sp_x*sp_y)
 
     @requires_sympy
@@ -214,11 +217,20 @@ class TestSymbol(unittest.TestCase):
         self.y = Symbol('y')
 
     def test_new(self):
-        self.assertEqual(Symbol(' x '), self.x)
+        self.assertEqual(Symbol('x'), self.x)
         with self.assertRaises(TypeError):
             Symbol(self.x)
         with self.assertRaises(TypeError):
             Symbol(1)
+        with self.assertRaises(SyntaxError):
+            Symbol('1')
+        with self.assertRaises(SyntaxError):
+            Symbol('x.1')
+        with self.assertRaises(SyntaxError):
+            Symbol('x 1')
+        Symbol('_')
+        Symbol('_x')
+        Symbol('x_1')
 
     def test_name(self):
         self.assertEqual(self.x.name, 'x')