diff options
Diffstat (limited to 'Lib/test/test_operator.py')
| -rw-r--r-- | Lib/test/test_operator.py | 272 | 
1 files changed, 136 insertions, 136 deletions
diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py index bf38298a45..aa3219f499 100644 --- a/Lib/test/test_operator.py +++ b/Lib/test/test_operator.py @@ -34,237 +34,237 @@ class Seq2(object):  class OperatorTestCase(unittest.TestCase):      def test_lt(self): -        self.failUnlessRaises(TypeError, operator.lt) -        self.failUnlessRaises(TypeError, operator.lt, 1j, 2j) -        self.failIf(operator.lt(1, 0)) -        self.failIf(operator.lt(1, 0.0)) -        self.failIf(operator.lt(1, 1)) -        self.failIf(operator.lt(1, 1.0)) -        self.failUnless(operator.lt(1, 2)) -        self.failUnless(operator.lt(1, 2.0)) +        self.assertRaises(TypeError, operator.lt) +        self.assertRaises(TypeError, operator.lt, 1j, 2j) +        self.assertFalse(operator.lt(1, 0)) +        self.assertFalse(operator.lt(1, 0.0)) +        self.assertFalse(operator.lt(1, 1)) +        self.assertFalse(operator.lt(1, 1.0)) +        self.assertTrue(operator.lt(1, 2)) +        self.assertTrue(operator.lt(1, 2.0))      def test_le(self): -        self.failUnlessRaises(TypeError, operator.le) -        self.failUnlessRaises(TypeError, operator.le, 1j, 2j) -        self.failIf(operator.le(1, 0)) -        self.failIf(operator.le(1, 0.0)) -        self.failUnless(operator.le(1, 1)) -        self.failUnless(operator.le(1, 1.0)) -        self.failUnless(operator.le(1, 2)) -        self.failUnless(operator.le(1, 2.0)) +        self.assertRaises(TypeError, operator.le) +        self.assertRaises(TypeError, operator.le, 1j, 2j) +        self.assertFalse(operator.le(1, 0)) +        self.assertFalse(operator.le(1, 0.0)) +        self.assertTrue(operator.le(1, 1)) +        self.assertTrue(operator.le(1, 1.0)) +        self.assertTrue(operator.le(1, 2)) +        self.assertTrue(operator.le(1, 2.0))      def test_eq(self):          class C(object):              def __eq__(self, other):                  raise SyntaxError -        self.failUnlessRaises(TypeError, operator.eq) -        self.failUnlessRaises(SyntaxError, operator.eq, C(), C()) -        self.failIf(operator.eq(1, 0)) -        self.failIf(operator.eq(1, 0.0)) -        self.failUnless(operator.eq(1, 1)) -        self.failUnless(operator.eq(1, 1.0)) -        self.failIf(operator.eq(1, 2)) -        self.failIf(operator.eq(1, 2.0)) +        self.assertRaises(TypeError, operator.eq) +        self.assertRaises(SyntaxError, operator.eq, C(), C()) +        self.assertFalse(operator.eq(1, 0)) +        self.assertFalse(operator.eq(1, 0.0)) +        self.assertTrue(operator.eq(1, 1)) +        self.assertTrue(operator.eq(1, 1.0)) +        self.assertFalse(operator.eq(1, 2)) +        self.assertFalse(operator.eq(1, 2.0))      def test_ne(self):          class C(object):              def __ne__(self, other):                  raise SyntaxError -        self.failUnlessRaises(TypeError, operator.ne) -        self.failUnlessRaises(SyntaxError, operator.ne, C(), C()) -        self.failUnless(operator.ne(1, 0)) -        self.failUnless(operator.ne(1, 0.0)) -        self.failIf(operator.ne(1, 1)) -        self.failIf(operator.ne(1, 1.0)) -        self.failUnless(operator.ne(1, 2)) -        self.failUnless(operator.ne(1, 2.0)) +        self.assertRaises(TypeError, operator.ne) +        self.assertRaises(SyntaxError, operator.ne, C(), C()) +        self.assertTrue(operator.ne(1, 0)) +        self.assertTrue(operator.ne(1, 0.0)) +        self.assertFalse(operator.ne(1, 1)) +        self.assertFalse(operator.ne(1, 1.0)) +        self.assertTrue(operator.ne(1, 2)) +        self.assertTrue(operator.ne(1, 2.0))      def test_ge(self): -        self.failUnlessRaises(TypeError, operator.ge) -        self.failUnlessRaises(TypeError, operator.ge, 1j, 2j) -        self.failUnless(operator.ge(1, 0)) -        self.failUnless(operator.ge(1, 0.0)) -        self.failUnless(operator.ge(1, 1)) -        self.failUnless(operator.ge(1, 1.0)) -        self.failIf(operator.ge(1, 2)) -        self.failIf(operator.ge(1, 2.0)) +        self.assertRaises(TypeError, operator.ge) +        self.assertRaises(TypeError, operator.ge, 1j, 2j) +        self.assertTrue(operator.ge(1, 0)) +        self.assertTrue(operator.ge(1, 0.0)) +        self.assertTrue(operator.ge(1, 1)) +        self.assertTrue(operator.ge(1, 1.0)) +        self.assertFalse(operator.ge(1, 2)) +        self.assertFalse(operator.ge(1, 2.0))      def test_gt(self): -        self.failUnlessRaises(TypeError, operator.gt) -        self.failUnlessRaises(TypeError, operator.gt, 1j, 2j) -        self.failUnless(operator.gt(1, 0)) -        self.failUnless(operator.gt(1, 0.0)) -        self.failIf(operator.gt(1, 1)) -        self.failIf(operator.gt(1, 1.0)) -        self.failIf(operator.gt(1, 2)) -        self.failIf(operator.gt(1, 2.0)) +        self.assertRaises(TypeError, operator.gt) +        self.assertRaises(TypeError, operator.gt, 1j, 2j) +        self.assertTrue(operator.gt(1, 0)) +        self.assertTrue(operator.gt(1, 0.0)) +        self.assertFalse(operator.gt(1, 1)) +        self.assertFalse(operator.gt(1, 1.0)) +        self.assertFalse(operator.gt(1, 2)) +        self.assertFalse(operator.gt(1, 2.0))      def test_abs(self): -        self.failUnlessRaises(TypeError, operator.abs) -        self.failUnlessRaises(TypeError, operator.abs, None) +        self.assertRaises(TypeError, operator.abs) +        self.assertRaises(TypeError, operator.abs, None)          self.assertEqual(operator.abs(-1), 1)          self.assertEqual(operator.abs(1), 1)      def test_add(self): -        self.failUnlessRaises(TypeError, operator.add) -        self.failUnlessRaises(TypeError, operator.add, None, None) -        self.failUnless(operator.add(3, 4) == 7) +        self.assertRaises(TypeError, operator.add) +        self.assertRaises(TypeError, operator.add, None, None) +        self.assertTrue(operator.add(3, 4) == 7)      def test_bitwise_and(self): -        self.failUnlessRaises(TypeError, operator.and_) -        self.failUnlessRaises(TypeError, operator.and_, None, None) -        self.failUnless(operator.and_(0xf, 0xa) == 0xa) +        self.assertRaises(TypeError, operator.and_) +        self.assertRaises(TypeError, operator.and_, None, None) +        self.assertTrue(operator.and_(0xf, 0xa) == 0xa)      def test_concat(self): -        self.failUnlessRaises(TypeError, operator.concat) -        self.failUnlessRaises(TypeError, operator.concat, None, None) -        self.failUnless(operator.concat('py', 'thon') == 'python') -        self.failUnless(operator.concat([1, 2], [3, 4]) == [1, 2, 3, 4]) -        self.failUnless(operator.concat(Seq1([5, 6]), Seq1([7])) == [5, 6, 7]) -        self.failUnless(operator.concat(Seq2([5, 6]), Seq2([7])) == [5, 6, 7]) -        self.failUnlessRaises(TypeError, operator.concat, 13, 29) +        self.assertRaises(TypeError, operator.concat) +        self.assertRaises(TypeError, operator.concat, None, None) +        self.assertTrue(operator.concat('py', 'thon') == 'python') +        self.assertTrue(operator.concat([1, 2], [3, 4]) == [1, 2, 3, 4]) +        self.assertTrue(operator.concat(Seq1([5, 6]), Seq1([7])) == [5, 6, 7]) +        self.assertTrue(operator.concat(Seq2([5, 6]), Seq2([7])) == [5, 6, 7]) +        self.assertRaises(TypeError, operator.concat, 13, 29)      def test_countOf(self): -        self.failUnlessRaises(TypeError, operator.countOf) -        self.failUnlessRaises(TypeError, operator.countOf, None, None) -        self.failUnless(operator.countOf([1, 2, 1, 3, 1, 4], 3) == 1) -        self.failUnless(operator.countOf([1, 2, 1, 3, 1, 4], 5) == 0) +        self.assertRaises(TypeError, operator.countOf) +        self.assertRaises(TypeError, operator.countOf, None, None) +        self.assertTrue(operator.countOf([1, 2, 1, 3, 1, 4], 3) == 1) +        self.assertTrue(operator.countOf([1, 2, 1, 3, 1, 4], 5) == 0)      def test_delitem(self):          a = [4, 3, 2, 1] -        self.failUnlessRaises(TypeError, operator.delitem, a) -        self.failUnlessRaises(TypeError, operator.delitem, a, None) -        self.failUnless(operator.delitem(a, 1) is None) -        self.assert_(a == [4, 2, 1]) +        self.assertRaises(TypeError, operator.delitem, a) +        self.assertRaises(TypeError, operator.delitem, a, None) +        self.assertTrue(operator.delitem(a, 1) is None) +        self.assertTrue(a == [4, 2, 1])      def test_floordiv(self): -        self.failUnlessRaises(TypeError, operator.floordiv, 5) -        self.failUnlessRaises(TypeError, operator.floordiv, None, None) -        self.failUnless(operator.floordiv(5, 2) == 2) +        self.assertRaises(TypeError, operator.floordiv, 5) +        self.assertRaises(TypeError, operator.floordiv, None, None) +        self.assertTrue(operator.floordiv(5, 2) == 2)      def test_truediv(self): -        self.failUnlessRaises(TypeError, operator.truediv, 5) -        self.failUnlessRaises(TypeError, operator.truediv, None, None) -        self.failUnless(operator.truediv(5, 2) == 2.5) +        self.assertRaises(TypeError, operator.truediv, 5) +        self.assertRaises(TypeError, operator.truediv, None, None) +        self.assertTrue(operator.truediv(5, 2) == 2.5)      def test_getitem(self):          a = range(10) -        self.failUnlessRaises(TypeError, operator.getitem) -        self.failUnlessRaises(TypeError, operator.getitem, a, None) -        self.failUnless(operator.getitem(a, 2) == 2) +        self.assertRaises(TypeError, operator.getitem) +        self.assertRaises(TypeError, operator.getitem, a, None) +        self.assertTrue(operator.getitem(a, 2) == 2)      def test_indexOf(self): -        self.failUnlessRaises(TypeError, operator.indexOf) -        self.failUnlessRaises(TypeError, operator.indexOf, None, None) -        self.failUnless(operator.indexOf([4, 3, 2, 1], 3) == 1) +        self.assertRaises(TypeError, operator.indexOf) +        self.assertRaises(TypeError, operator.indexOf, None, None) +        self.assertTrue(operator.indexOf([4, 3, 2, 1], 3) == 1)          self.assertRaises(ValueError, operator.indexOf, [4, 3, 2, 1], 0)      def test_invert(self): -        self.failUnlessRaises(TypeError, operator.invert) -        self.failUnlessRaises(TypeError, operator.invert, None) +        self.assertRaises(TypeError, operator.invert) +        self.assertRaises(TypeError, operator.invert, None)          self.assertEqual(operator.inv(4), -5)      def test_lshift(self): -        self.failUnlessRaises(TypeError, operator.lshift) -        self.failUnlessRaises(TypeError, operator.lshift, None, 42) -        self.failUnless(operator.lshift(5, 1) == 10) -        self.failUnless(operator.lshift(5, 0) == 5) +        self.assertRaises(TypeError, operator.lshift) +        self.assertRaises(TypeError, operator.lshift, None, 42) +        self.assertTrue(operator.lshift(5, 1) == 10) +        self.assertTrue(operator.lshift(5, 0) == 5)          self.assertRaises(ValueError, operator.lshift, 2, -1)      def test_mod(self): -        self.failUnlessRaises(TypeError, operator.mod) -        self.failUnlessRaises(TypeError, operator.mod, None, 42) -        self.failUnless(operator.mod(5, 2) == 1) +        self.assertRaises(TypeError, operator.mod) +        self.assertRaises(TypeError, operator.mod, None, 42) +        self.assertTrue(operator.mod(5, 2) == 1)      def test_mul(self): -        self.failUnlessRaises(TypeError, operator.mul) -        self.failUnlessRaises(TypeError, operator.mul, None, None) -        self.failUnless(operator.mul(5, 2) == 10) +        self.assertRaises(TypeError, operator.mul) +        self.assertRaises(TypeError, operator.mul, None, None) +        self.assertTrue(operator.mul(5, 2) == 10)      def test_neg(self): -        self.failUnlessRaises(TypeError, operator.neg) -        self.failUnlessRaises(TypeError, operator.neg, None) +        self.assertRaises(TypeError, operator.neg) +        self.assertRaises(TypeError, operator.neg, None)          self.assertEqual(operator.neg(5), -5)          self.assertEqual(operator.neg(-5), 5)          self.assertEqual(operator.neg(0), 0)          self.assertEqual(operator.neg(-0), 0)      def test_bitwise_or(self): -        self.failUnlessRaises(TypeError, operator.or_) -        self.failUnlessRaises(TypeError, operator.or_, None, None) -        self.failUnless(operator.or_(0xa, 0x5) == 0xf) +        self.assertRaises(TypeError, operator.or_) +        self.assertRaises(TypeError, operator.or_, None, None) +        self.assertTrue(operator.or_(0xa, 0x5) == 0xf)      def test_pos(self): -        self.failUnlessRaises(TypeError, operator.pos) -        self.failUnlessRaises(TypeError, operator.pos, None) +        self.assertRaises(TypeError, operator.pos) +        self.assertRaises(TypeError, operator.pos, None)          self.assertEqual(operator.pos(5), 5)          self.assertEqual(operator.pos(-5), -5)          self.assertEqual(operator.pos(0), 0)          self.assertEqual(operator.pos(-0), 0)      def test_pow(self): -        self.failUnlessRaises(TypeError, operator.pow) -        self.failUnlessRaises(TypeError, operator.pow, None, None) +        self.assertRaises(TypeError, operator.pow) +        self.assertRaises(TypeError, operator.pow, None, None)          self.assertEqual(operator.pow(3,5), 3**5)          self.assertEqual(operator.__pow__(3,5), 3**5)          self.assertRaises(TypeError, operator.pow, 1)          self.assertRaises(TypeError, operator.pow, 1, 2, 3)      def test_rshift(self): -        self.failUnlessRaises(TypeError, operator.rshift) -        self.failUnlessRaises(TypeError, operator.rshift, None, 42) -        self.failUnless(operator.rshift(5, 1) == 2) -        self.failUnless(operator.rshift(5, 0) == 5) +        self.assertRaises(TypeError, operator.rshift) +        self.assertRaises(TypeError, operator.rshift, None, 42) +        self.assertTrue(operator.rshift(5, 1) == 2) +        self.assertTrue(operator.rshift(5, 0) == 5)          self.assertRaises(ValueError, operator.rshift, 2, -1)      def test_contains(self): -        self.failUnlessRaises(TypeError, operator.contains) -        self.failUnlessRaises(TypeError, operator.contains, None, None) -        self.failUnless(operator.contains(range(4), 2)) -        self.failIf(operator.contains(range(4), 5)) +        self.assertRaises(TypeError, operator.contains) +        self.assertRaises(TypeError, operator.contains, None, None) +        self.assertTrue(operator.contains(range(4), 2)) +        self.assertFalse(operator.contains(range(4), 5))      def test_setitem(self):          a = list(range(3)) -        self.failUnlessRaises(TypeError, operator.setitem, a) -        self.failUnlessRaises(TypeError, operator.setitem, a, None, None) -        self.failUnless(operator.setitem(a, 0, 2) is None) -        self.assert_(a == [2, 1, 2]) +        self.assertRaises(TypeError, operator.setitem, a) +        self.assertRaises(TypeError, operator.setitem, a, None, None) +        self.assertTrue(operator.setitem(a, 0, 2) is None) +        self.assertTrue(a == [2, 1, 2])          self.assertRaises(IndexError, operator.setitem, a, 4, 2)      def test_sub(self): -        self.failUnlessRaises(TypeError, operator.sub) -        self.failUnlessRaises(TypeError, operator.sub, None, None) -        self.failUnless(operator.sub(5, 2) == 3) +        self.assertRaises(TypeError, operator.sub) +        self.assertRaises(TypeError, operator.sub, None, None) +        self.assertTrue(operator.sub(5, 2) == 3)      def test_truth(self):          class C(object):              def __bool__(self):                  raise SyntaxError -        self.failUnlessRaises(TypeError, operator.truth) -        self.failUnlessRaises(SyntaxError, operator.truth, C()) -        self.failUnless(operator.truth(5)) -        self.failUnless(operator.truth([0])) -        self.failIf(operator.truth(0)) -        self.failIf(operator.truth([])) +        self.assertRaises(TypeError, operator.truth) +        self.assertRaises(SyntaxError, operator.truth, C()) +        self.assertTrue(operator.truth(5)) +        self.assertTrue(operator.truth([0])) +        self.assertFalse(operator.truth(0)) +        self.assertFalse(operator.truth([]))      def test_bitwise_xor(self): -        self.failUnlessRaises(TypeError, operator.xor) -        self.failUnlessRaises(TypeError, operator.xor, None, None) -        self.failUnless(operator.xor(0xb, 0xc) == 0x7) +        self.assertRaises(TypeError, operator.xor) +        self.assertRaises(TypeError, operator.xor, None, None) +        self.assertTrue(operator.xor(0xb, 0xc) == 0x7)      def test_is(self):          a = b = 'xyzpdq'          c = a[:3] + b[3:] -        self.failUnlessRaises(TypeError, operator.is_) -        self.failUnless(operator.is_(a, b)) -        self.failIf(operator.is_(a,c)) +        self.assertRaises(TypeError, operator.is_) +        self.assertTrue(operator.is_(a, b)) +        self.assertFalse(operator.is_(a,c))      def test_is_not(self):          a = b = 'xyzpdq'          c = a[:3] + b[3:] -        self.failUnlessRaises(TypeError, operator.is_not) -        self.failIf(operator.is_not(a, b)) -        self.failUnless(operator.is_not(a,c)) +        self.assertRaises(TypeError, operator.is_not) +        self.assertFalse(operator.is_not(a, b)) +        self.assertTrue(operator.is_not(a,c))      def test_attrgetter(self):          class A: @@ -290,7 +290,7 @@ class OperatorTestCase(unittest.TestCase):          class C(object):              def __getattr__(self, name):                  raise SyntaxError -        self.failUnlessRaises(SyntaxError, operator.attrgetter('foo'), C()) +        self.assertRaises(SyntaxError, operator.attrgetter('foo'), C())          # recursive gets          a = A() @@ -322,7 +322,7 @@ class OperatorTestCase(unittest.TestCase):          class C(object):              def __getitem__(self, name):                  raise SyntaxError -        self.failUnlessRaises(SyntaxError, operator.itemgetter(42), C()) +        self.assertRaises(SyntaxError, operator.itemgetter(42), C())          f = operator.itemgetter('name')          self.assertRaises(TypeError, f, a)  | 
