1 files changed, 22 insertions, 22 deletions
diff --git a/test/test_data.py b/test/test_data.py
index 640f4f07..83a5b8ae 100644
--- a/test/test_data.py
+++ b/test/test_data.py
@@ -29,11 +29,11 @@ class DataTest(CoverageTest):
     def assert_summary(self, covdata, summary):
         """Check that the summary of `covdata` is `summary`."""
         self.assertEqual(covdata.summary(), summary)
-        
+
     def assert_executed_files(self, covdata, execed):
         """Check that `covdata`'s executed files are `execed`."""
-        self.assert_equal_sets(covdata.executed_files(), execed)
-    
+        self.assertSameElements(covdata.executed_files(), execed)
+
     def test_reading_empty(self):
         covdata = CoverageData()
         covdata.read()
@@ -44,25 +44,25 @@ class DataTest(CoverageTest):
         covdata.add_line_data(DATA_1)
         self.assert_summary(covdata, SUMMARY_1)
         self.assert_executed_files(covdata, EXECED_FILES_1)
-        
+
     def test_writing_and_reading(self):
         covdata1 = CoverageData()
         covdata1.add_line_data(DATA_1)
         covdata1.write()
-        
+
         covdata2 = CoverageData()
         covdata2.read()
         self.assert_summary(covdata2, SUMMARY_1)
 
     def test_combining(self):
-        covdata1 = CoverageData(suffix='1')
+        covdata1 = CoverageData()
         covdata1.add_line_data(DATA_1)
-        covdata1.write()
-        
-        covdata2 = CoverageData(suffix='2')
+        covdata1.write(suffix='1')
+
+        covdata2 = CoverageData()
         covdata2.add_line_data(DATA_2)
-        covdata2.write()
-        
+        covdata2.write(suffix='2')
+
         covdata3 = CoverageData()
         covdata3.combine_parallel_data()
         self.assert_summary(covdata3, SUMMARY_1_2)
@@ -74,7 +74,7 @@ class DataTest(CoverageTest):
         covdata1.write()
         covdata1.erase()
         self.assert_summary(covdata1, {})
-        
+
         covdata2 = CoverageData()
         covdata2.read()
         self.assert_summary(covdata2, {})
@@ -84,17 +84,17 @@ class DataTest(CoverageTest):
         covdata = CoverageData()
         covdata.add_line_data(DATA_1)
         covdata.write()
-        
+
         fdata = open(".coverage", 'rb')
         try:
             data = pickle.load(fdata)
         finally:
             fdata.close()
-        
+
         lines = data['lines']
-        self.assert_equal_sets(lines.keys(), EXECED_FILES_1)
-        self.assert_equal_sets(lines['a.py'], A_PY_LINES_1)
-        self.assert_equal_sets(lines['b.py'], B_PY_LINES_1)
+        self.assertSameElements(lines.keys(), EXECED_FILES_1)
+        self.assertSameElements(lines['a.py'], A_PY_LINES_1)
+        self.assertSameElements(lines['b.py'], B_PY_LINES_1)
         # If not measuring branches, there's no arcs entry.
         self.assertEqual(data.get('arcs', 'not there'), 'not there')
 
@@ -103,14 +103,14 @@ class DataTest(CoverageTest):
         covdata = CoverageData()
         covdata.add_arc_data(ARC_DATA_3)
         covdata.write()
-        
+
         fdata = open(".coverage", 'rb')
         try:
             data = pickle.load(fdata)
         finally:
             fdata.close()
-        
-        self.assert_equal_sets(data['lines'].keys(), [])
+
+        self.assertSameElements(data['lines'].keys(), [])
         arcs = data['arcs']
-        self.assert_equal_sets(arcs['x.py'], X_PY_ARCS_3)
-        self.assert_equal_sets(arcs['y.py'], Y_PY_ARCS_3)
+        self.assertSameElements(arcs['x.py'], X_PY_ARCS_3)
+        self.assertSameElements(arcs['y.py'], Y_PY_ARCS_3)