[pypy-svn] rev 2428 - pypy/trunk/src/pypy/objspace/std/test

[jacob at codespeak.net]

Author: jacob
Date: Wed Dec 17 13:14:38 2003
New Revision: 2428

Modified:
   pypy/trunk/src/pypy/objspace/std/test/test_intobject.py
Log:
Changed tests for changed parameters to pow.

Modified: pypy/trunk/src/pypy/objspace/std/test/test_intobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_intobject.py	(original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_intobject.py	Wed Dec 17 13:14:38 2003
@@ -90,7 +90,6 @@
         self.assertEquals(self.space.w_OverflowError,
                           self._unwrap_nonimpl(iobj.sub__Int_Int, self.space, f1, f2))
 
-
     def test_mul(self):
         x = 2
         y = 3
@@ -105,7 +104,6 @@
         self.assertEquals(self.space.w_OverflowError,
                           self._unwrap_nonimpl(iobj.mul__Int_Int, self.space, f1, f2))
 
-
     def test_div(self):
         for i in range(10):
             res = i//3
@@ -151,15 +149,15 @@
         f1 = iobj.W_IntObject(self.space, x)
         f2 = iobj.W_IntObject(self.space, y)
         f3 = iobj.W_IntObject(self.space, z)
-        v = iobj.pow__Int_Int_Int(self.space, f1, f2, f3)
+        v = iobj.pow__Int_Int_ANY(self.space, f1, f2, f3)
         self.assertEquals(v.intval, pow(x, y, z))
         f1, f2, f3 = [iobj.W_IntObject(self.space, i) for i in (10, -1, 42)]
         self.assertRaises_w(self.space.w_TypeError,
-                            iobj.pow__Int_Int_Int,
+                            iobj.pow__Int_Int_ANY,
                             self.space, f1, f2, f3)
         f1, f2, f3 = [iobj.W_IntObject(self.space, i) for i in (10, 5, 0)]
         self.assertRaises_w(self.space.w_ValueError,
-                            iobj.pow__Int_Int_Int,
+                            iobj.pow__Int_Int_ANY,
                             self.space, f1, f2, f3)
 
     def test_pow_iin(self):
@@ -167,14 +165,14 @@
         y = 2
         f1 = iobj.W_IntObject(self.space, x)
         f2 = iobj.W_IntObject(self.space, y)
-        v = iobj.pow__Int_Int_None(self.space, f1, f2)
+        v = iobj.pow__Int_Int_ANY(self.space, f1, f2, self.space.w_None)
         self.assertEquals(v.intval, x ** y)
         f1, f2 = [iobj.W_IntObject(self.space, i) for i in (10, 20)]
         self.assertEquals(self.space.w_OverflowError,
-                          self._unwrap_nonimpl(iobj.pow__Int_Int_None, self.space, f1, f2))
+                          self._unwrap_nonimpl(iobj.pow__Int_Int_ANY, self.space, f1, f2, self.space.w_None))
         f1, f2 = [iobj.W_IntObject(self.space, i) for i in (10, -1)]
         self.assertEquals(self.space.w_ValueError,
-                          self._unwrap_nonimpl(iobj.pow__Int_Int_None, self.space, f1, f2))
+                          self._unwrap_nonimpl(iobj.pow__Int_Int_ANY, self.space, f1, f2, self.space.w_None))
 
     def test_neg(self):
         x = 42
@@ -191,6 +189,10 @@
         f1 = iobj.W_IntObject(self.space, x)
         v = iobj.pos__Int(self.space, f1)
         self.assertEquals(v.intval, +x)
+        x = -42
+        f1 = iobj.W_IntObject(self.space, x)
+        v = iobj.pos__Int(self.space, f1)
+        self.assertEquals(v.intval, +x)
 
     def test_abs(self):
         x = 42