[pypy-svn] r72710 - pypy/branch/fix-64/pypy/objspace/std/test

[arigo at codespeak.net]

Author: arigo
Date: Wed Mar 24 15:27:54 2010
New Revision: 72710

Modified:
   pypy/branch/fix-64/pypy/objspace/std/test/test_longobject.py
Log:
Improve the failing test.


Modified: pypy/branch/fix-64/pypy/objspace/std/test/test_longobject.py
==============================================================================
--- pypy/branch/fix-64/pypy/objspace/std/test/test_longobject.py	(original)
+++ pypy/branch/fix-64/pypy/objspace/std/test/test_longobject.py	Wed Mar 24 15:27:54 2010
@@ -60,37 +60,79 @@
         assert a == 3L
 
     def test_compare(self):
-        BIG = 1L << 9999
-        assert 0 == 0L
-        assert not (0 != 0L)
-        assert 0L == 0
-        assert not (0L != 0)
-        assert not (0 == BIG)
-        assert 0 != BIG
-        assert not (BIG == 0)
-        assert BIG != 0
-        assert not (0L == BIG)
-        assert 0L != BIG
-        assert 0 <= 0L
-        assert not (0 < 0L)
-        assert 0 <= BIG
-        assert 0 < BIG
-        assert not (BIG <= 0)
-        assert not (BIG < 0)
-        assert 0L <= 0L
-        assert not (0L < 0L)
-        assert 0L <= BIG
-        assert 0L < BIG
-        assert not (BIG <= 0L)
-        assert not (BIG < 0L)
-        assert not (0 <= -BIG)
-        assert not (0 < -BIG)
-        assert -BIG <= 0
-        assert -BIG < 0
-        assert not (0L <= -BIG)
-        assert not (0L < -BIG)
-        assert -BIG <= 0L
-        assert -BIG < 0L
+        for BIG in (1L, 1L << 62, 1L << 9999):
+            assert 0 == 0L
+            assert not (0 != 0L)
+            assert 0L == 0
+            assert not (0L != 0)
+            assert not (0 == BIG)
+            assert 0 != BIG
+            assert not (BIG == 0)
+            assert BIG != 0
+            assert not (0L == BIG)
+            assert 0L != BIG
+            assert 0 <= 0L
+            assert not (0 < 0L)
+            assert 0 <= BIG
+            assert 0 < BIG
+            assert not (BIG <= 0)
+            assert not (BIG < 0)
+            assert 0L <= 0L
+            assert not (0L < 0L)
+            assert 0L <= BIG
+            assert 0L < BIG
+            assert not (BIG <= 0L)
+            assert not (BIG < 0L)
+            assert not (0 <= -BIG)
+            assert not (0 < -BIG)
+            assert -BIG <= 0
+            assert -BIG < 0
+            assert not (0L <= -BIG)
+            assert not (0L < -BIG)
+            assert -BIG <= 0L
+            assert -BIG < 0L
+            #
+            assert not (BIG <  int(BIG))
+            assert     (BIG <= int(BIG))
+            assert     (BIG == int(BIG))
+            assert not (BIG != int(BIG))
+            assert not (BIG >  int(BIG))
+            assert     (BIG >= int(BIG))
+            #
+            assert     (BIG <  int(BIG)+1)
+            assert     (BIG <= int(BIG)+1)
+            assert not (BIG == int(BIG)+1)
+            assert     (BIG != int(BIG)+1)
+            assert not (BIG >  int(BIG)+1)
+            assert not (BIG >= int(BIG)+1)
+            #
+            assert not (BIG <  int(BIG)-1)
+            assert not (BIG <= int(BIG)-1)
+            assert not (BIG == int(BIG)-1)
+            assert     (BIG != int(BIG)-1)
+            assert     (BIG >  int(BIG)-1)
+            assert     (BIG >= int(BIG)-1)
+            #
+            assert not (int(BIG) <  BIG)
+            assert     (int(BIG) <= BIG)
+            assert     (int(BIG) == BIG)
+            assert not (int(BIG) != BIG)
+            assert not (int(BIG) >  BIG)
+            assert     (int(BIG) >= BIG)
+            #
+            assert not (int(BIG)+1 <  BIG)
+            assert not (int(BIG)+1 <= BIG)
+            assert not (int(BIG)+1 == BIG)
+            assert     (int(BIG)+1 != BIG)
+            assert     (int(BIG)+1 >  BIG)
+            assert     (int(BIG)+1 >= BIG)
+            #
+            assert     (int(BIG)-1 <  BIG)
+            assert     (int(BIG)-1 <= BIG)
+            assert not (int(BIG)-1 == BIG)
+            assert     (int(BIG)-1 != BIG)
+            assert not (int(BIG)-1 >  BIG)
+            assert not (int(BIG)-1 >= BIG)
 
     def test_conversion(self):
         class long2(long):