Changeset 391 for python/trunk/Lib/test/test_unary.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_unary.py (modified) (1 diff)

python/trunk/Lib/test/test_unary.py

@@ -7 +7 @@
 
     def test_negative(self):
-        self.assert_(-2 == 0 - 2)
-        self.assert_(-0 == 0)
-        self.assert_(--2 == 2)
-        self.assert_(-2L == 0 - 2L)
-        self.assert_(-2.0 == 0 - 2.0)
-        self.assert_(-2j == 0 - 2j)
+        self.assertTrue(-2 == 0 - 2)
+        self.assertTrue(-0 == 0)
+        self.assertTrue(--2 == 2)
+        self.assertTrue(-2L == 0 - 2L)
+        self.assertTrue(-2.0 == 0 - 2.0)
+        self.assertTrue(-2j == 0 - 2j)
 
     def test_positive(self):
-        self.assert_(+2 == 2)
-        self.assert_(+0 == 0)
-        self.assert_(++2 == 2)
-        self.assert_(+2L == 2L)
-        self.assert_(+2.0 == 2.0)
-        self.assert_(+2j == 2j)
+        self.assertTrue(+2 == 2)
+        self.assertTrue(+0 == 0)
+        self.assertTrue(++2 == 2)
+        self.assertTrue(+2L == 2L)
+        self.assertTrue(+2.0 == 2.0)
+        self.assertTrue(+2j == 2j)
 
     def test_invert(self):
-        self.assert_(-2 == 0 - 2)
-        self.assert_(-0 == 0)
-        self.assert_(--2 == 2)
-        self.assert_(-2L == 0 - 2L)
+        self.assertTrue(-2 == 0 - 2)
+        self.assertTrue(-0 == 0)
+        self.assertTrue(--2 == 2)
+        self.assertTrue(-2L == 0 - 2L)
 
     def test_no_overflow(self):
         nines = "9" * 32
-        self.assert_(eval("+" + nines) == eval("+" + nines + "L"))
-        self.assert_(eval("-" + nines) == eval("-" + nines + "L"))
-        self.assert_(eval("~" + nines) == eval("~" + nines + "L"))
+        self.assertTrue(eval("+" + nines) == eval("+" + nines + "L"))
+        self.assertTrue(eval("-" + nines) == eval("-" + nines + "L"))
+        self.assertTrue(eval("~" + nines) == eval("~" + nines + "L"))
 
     def test_negation_of_exponentiation(self):