diff options
Diffstat (limited to 'Lib/test/test_unary.py')
| -rw-r--r-- | Lib/test/test_unary.py | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/Lib/test/test_unary.py b/Lib/test/test_unary.py index 598fca8fcff..b8355647fdf 100644 --- a/Lib/test/test_unary.py +++ b/Lib/test/test_unary.py @@ -1,37 +1,37 @@ """Test compiler changes for unary ops (+, -, ~) introduced in Python 2.2""" import unittest -from test.test_support import run_unittest, have_unicode +from test.support import run_unittest class UnaryOpTestCase(unittest.TestCase): def test_negative(self): self.assertTrue(-2 == 0 - 2) - self.assertTrue(-0 == 0) - self.assertTrue(--2 == 2) - self.assertTrue(-2L == 0 - 2L) + self.assertEqual(-0, 0) + self.assertEqual(--2, 2) + self.assertTrue(-2 == 0 - 2) self.assertTrue(-2.0 == 0 - 2.0) self.assertTrue(-2j == 0 - 2j) def test_positive(self): - 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) + self.assertEqual(+2, 2) + self.assertEqual(+0, 0) + self.assertEqual(++2, 2) + self.assertEqual(+2, 2) + self.assertEqual(+2.0, 2.0) + self.assertEqual(+2j, 2j) def test_invert(self): self.assertTrue(-2 == 0 - 2) - self.assertTrue(-0 == 0) - self.assertTrue(--2 == 2) - self.assertTrue(-2L == 0 - 2L) + self.assertEqual(-0, 0) + self.assertEqual(--2, 2) + self.assertTrue(-2 == 0 - 2) def test_no_overflow(self): nines = "9" * 32 - self.assertTrue(eval("+" + nines) == eval("+" + nines + "L")) - self.assertTrue(eval("-" + nines) == eval("-" + nines + "L")) - self.assertTrue(eval("~" + nines) == eval("~" + nines + "L")) + self.assertTrue(eval("+" + nines) == 10**32-1) + self.assertTrue(eval("-" + nines) == -(10**32-1)) + self.assertTrue(eval("~" + nines) == ~(10**32-1)) def test_negation_of_exponentiation(self): # Make sure '**' does the right thing; these form a @@ -43,9 +43,8 @@ class UnaryOpTestCase(unittest.TestCase): def test_bad_types(self): for op in '+', '-', '~': + self.assertRaises(TypeError, eval, op + "b'a'") self.assertRaises(TypeError, eval, op + "'a'") - if have_unicode: - self.assertRaises(TypeError, eval, op + "u'a'") self.assertRaises(TypeError, eval, "~2j") self.assertRaises(TypeError, eval, "~2.0") |