diff options
Diffstat (limited to 'Lib/test/test_sets.py')
| -rw-r--r-- | Lib/test/test_sets.py | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/Lib/test/test_sets.py b/Lib/test/test_sets.py index 9905d1349c..0754ed74fc 100644 --- a/Lib/test/test_sets.py +++ b/Lib/test/test_sets.py @@ -74,7 +74,7 @@ class TestBasicOps(unittest.TestCase): def test_iteration(self): for v in self.set: - self.assert_(v in self.values) + self.assertIn(v, self.values) def test_pickling(self): p = pickle.dumps(self.set) @@ -105,10 +105,10 @@ class TestBasicOpsSingleton(TestBasicOps): self.repr = "Set([3])" def test_in(self): - self.failUnless(3 in self.set) + self.assertTrue(3 in self.set) def test_not_in(self): - self.failUnless(2 not in self.set) + self.assertTrue(2 not in self.set) #------------------------------------------------------------------------------ @@ -122,10 +122,10 @@ class TestBasicOpsTuple(TestBasicOps): self.repr = "Set([(0, 'zero')])" def test_in(self): - self.failUnless((0, "zero") in self.set) + self.assertTrue((0, "zero") in self.set) def test_not_in(self): - self.failUnless(9 not in self.set) + self.assertTrue(9 not in self.set) #------------------------------------------------------------------------------ @@ -404,7 +404,7 @@ class TestMutate(unittest.TestCase): popped[self.set.pop()] = None self.assertEqual(len(popped), len(self.values)) for v in self.values: - self.failUnless(v in popped) + self.assertIn(v, popped) def test_update_empty_tuple(self): self.set.union_update(()) @@ -637,7 +637,7 @@ class TestOnlySetsOperator(TestOnlySetsInBinaryOps): self.otherIsIterable = False def test_ge_gt_le_lt(self): - with test_support._check_py3k_warnings(): + with test_support.check_py3k_warnings(): super(TestOnlySetsOperator, self).test_ge_gt_le_lt() #------------------------------------------------------------------------------ @@ -686,18 +686,11 @@ class TestCopying(unittest.TestCase): set_list = sorted(self.set) self.assertEqual(len(dup_list), len(set_list)) for i, el in enumerate(dup_list): - self.assertTrue(el is set_list[i]) + self.assertIs(el, set_list[i]) def test_deep_copy(self): dup = copy.deepcopy(self.set) - ##print type(dup), repr(dup) - with test_support.check_warnings(): - dup_list = sorted(dup) - set_list = sorted(self.set) - self.assertEqual(len(dup_list), len(set_list)) - for i in range(len(dup_list)): - self.assertEqual(dup_list[i], set_list[i]) - + self.assertSetEqual(dup, self.set) #------------------------------------------------------------------------------ @@ -718,7 +711,7 @@ class TestCopyingTriple(TestCopying): self.set = Set(["zero", 0, None]) def test_copy(self): - with test_support._check_py3k_warnings(): + with test_support.check_py3k_warnings(): super(TestCopyingTriple, self).test_copy() #------------------------------------------------------------------------------ @@ -742,13 +735,13 @@ class TestIdentities(unittest.TestCase): def test_binopsVsSubsets(self): a, b = self.a, self.b - self.assert_(a - b <= a) - self.assert_(b - a <= b) - self.assert_(a & b <= a) - self.assert_(a & b <= b) - self.assert_(a | b >= a) - self.assert_(a | b >= b) - self.assert_(a ^ b <= a | b) + self.assertTrue(a - b <= a) + self.assertTrue(b - a <= b) + self.assertTrue(a & b <= a) + self.assertTrue(a & b <= b) + self.assertTrue(a | b >= a) + self.assertTrue(a | b >= b) + self.assertTrue(a ^ b <= a | b) def test_commutativity(self): a, b = self.a, self.b @@ -764,9 +757,9 @@ class TestIdentities(unittest.TestCase): self.assertEqual(a - a, zero) self.assertEqual(a | a, a) self.assertEqual(a & a, a) - self.assert_(a <= a) - self.assert_(a >= a) - self.assert_(a == a) + self.assertTrue(a <= a) + self.assertTrue(a >= a) + self.assertTrue(a == a) def test_summations(self): # check that sums of parts equal the whole |