Changeset 391 for python/trunk/Lib/test/test_sets.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_sets.py (modified) (10 diffs)

python/trunk/Lib/test/test_sets.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-import warnings
-warnings.filterwarnings("ignore", "the sets module is deprecated",
-                        DeprecationWarning, "test\.test_sets")
-
 import unittest, operator, copy, pickle, random
+from test import test_support
+
+test_support.import_module("sets", deprecated=True)
 from sets import Set, ImmutableSet
-from test import test_support
 
 empty_set = Set()
@@ -77 +75 @@
     def test_iteration(self):
         for v in self.set:
-            self.assert_(v in self.values)
+            self.assertIn(v, self.values)
 
     def test_pickling(self):
@@ -108 +106 @@
 
     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)
 
 #------------------------------------------------------------------------------
@@ -125 +123 @@
 
     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)
 
 #------------------------------------------------------------------------------
@@ -407 +405 @@
         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):
@@ -639 +637 @@
         self.otherIsIterable = False
 
+    def test_ge_gt_le_lt(self):
+        with test_support.check_py3k_warnings():
+            super(TestOnlySetsOperator, self).test_ge_gt_le_lt()
+
 #------------------------------------------------------------------------------
 
@@ -680 +682 @@
     def test_copy(self):
         dup = self.set.copy()
-        dup_list = list(dup); dup_list.sort()
-        set_list = list(self.set); set_list.sort()
+        self.assertEqual(len(dup), len(self.set))
+        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.failUnless(dup_list[i] is set_list[i])
+        for i, el in enumerate(dup_list):
+            self.assertIs(el, set_list[i])
 
     def test_deep_copy(self):
         dup = copy.deepcopy(self.set)
-        ##print type(dup), repr(dup)
-        dup_list = list(dup); dup_list.sort()
-        set_list = list(self.set); set_list.sort()
-        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)
 
 #------------------------------------------------------------------------------
@@ -712 +710 @@
     def setUp(self):
         self.set = Set(["zero", 0, None])
+
+    def test_copy(self):
+        with test_support.check_py3k_warnings():
+            super(TestCopyingTriple, self).test_copy()
 
 #------------------------------------------------------------------------------
@@ -734 +736 @@
     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):
@@ -756 +758 @@
         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):