X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/blobdiff_plain/7afcb0a1ded9e9a331b131689d68c085f712143f..996195732e096c8f1c3c3db6263af895c66cfe4c:/linpy/tests/test_linexprs.py

diff --git a/linpy/tests/test_linexprs.py b/linpy/tests/test_linexprs.py
index fb7e4a2..f189260 100644
--- a/linpy/tests/test_linexprs.py
+++ b/linpy/tests/test_linexprs.py
@@ -161,7 +161,7 @@ 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.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):
@@ -195,7 +195,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 +214,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')