X-Git-Url: https://scm.cri.ensmp.fr/git/linpy.git/blobdiff_plain/8c9a4d4d0ecef68ff3cd0f7806a69013d34a2013..51e97eade63b2f4c7b500feb503436cc4a886e59:/pypol/tests/test_linexprs.py?ds=sidebyside

diff --git a/pypol/tests/test_linexprs.py b/pypol/tests/test_linexprs.py
index c55c842..2bdd33a 100644
--- a/pypol/tests/test_linexprs.py
+++ b/pypol/tests/test_linexprs.py
@@ -1,3 +1,20 @@
+"""
+    This file is part of Linpy.
+
+    Linpy is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Linpy is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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
 
@@ -117,11 +134,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)
@@ -271,7 +292,7 @@ class TestRational(unittest.TestCase):
     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)
@@ -279,6 +300,10 @@ class TestRational(unittest.TestCase):
         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())
 
@@ -286,13 +311,6 @@ class TestRational(unittest.TestCase):
         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')
@@ -304,3 +322,5 @@ class TestRational(unittest.TestCase):
         self.assertEqual(Rational.fromsympy(sympy.Rational(22, 7)), self.pi)
         with self.assertRaises(TypeError):
             Rational.fromsympy(sympy.Symbol('x'))
+            
+# Copyright 2014 MINES ParisTech