Clean up some style in #782, switch_context

2 files changed, 23 insertions, 28 deletions

diff --git a/tests/test_api.py b/tests/test_api.py
index a1c98f04..51e8c048 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -499,13 +499,14 @@ class ApiTest(CoverageTest):
         # There should be no exception. At one point, report() threw:
         # CoverageException: --include and --source are mutually exclusive
         cov.report()
-        self.assertEqual(self.stdout(), textwrap.dedent("""\
+        expected = textwrap.dedent("""\
             Name    Stmts   Miss  Cover
             ---------------------------
             b.py        1      0   100%
-            """))
+            """)
+        self.assertEqual(expected, self.stdout())
 
-    def make_testsuite(self):
+    def make_test_files(self):
         """Create a simple file representing a method with two tests.
 
         Returns absolute path to the file.
@@ -524,7 +525,7 @@ class ApiTest(CoverageTest):
     def test_switch_context_testrunner(self):
         # This test simulates a coverage-aware test runner,
         # measuring labeled coverage via public API
-        self.make_testsuite()
+        self.make_test_files()
 
         # Test runner starts
         cov = coverage.Coverage()
@@ -548,24 +549,21 @@ class ApiTest(CoverageTest):
         # Labeled data is collected
         data = cov.get_data()
         self.assertEqual(
-            sorted(data.measured_contexts()),
-            [u'', u'multiply_six', u'multiply_zero'])
+            [u'', u'multiply_six', u'multiply_zero'],
+            sorted(data.measured_contexts())
+        )
 
         filenames = self.get_measured_filenames(data)
         suite_filename = filenames['testsuite.py']
 
-        self.assertEqual(
-            data.lines(suite_filename, context="multiply_six"),
-            [2, 8])
-        self.assertEqual(
-            data.lines(suite_filename, context="multiply_zero"),
-            [2, 5])
+        self.assertEqual([2, 8], data.lines(suite_filename, context="multiply_six"))
+        self.assertEqual([2, 5], data.lines(suite_filename, context="multiply_zero"))
 
     def test_switch_context_with_static(self):
         # This test simulates a coverage-aware test runner,
         # measuring labeled coverage via public API,
         # with static label prefix.
-        self.make_testsuite()
+        self.make_test_files()
 
         # Test runner starts
         cov = coverage.Coverage(context="mysuite")
@@ -589,31 +587,28 @@ class ApiTest(CoverageTest):
         # Labeled data is collected
         data = cov.get_data()
         self.assertEqual(
+            [u'mysuite', u'mysuite|multiply_six', u'mysuite|multiply_zero'],
             sorted(data.measured_contexts()),
-            [u'mysuite', u'mysuite:multiply_six', u'mysuite:multiply_zero'])
+            )
 
         filenames = self.get_measured_filenames(data)
         suite_filename = filenames['testsuite.py']
 
-        self.assertEqual(
-            data.lines(suite_filename, context="mysuite:multiply_six"),
-            [2, 8])
-        self.assertEqual(
-            data.lines(suite_filename, context="mysuite:multiply_zero"),
-            [2, 5])
+        self.assertEqual([2, 8], data.lines(suite_filename, context="mysuite|multiply_six"))
+        self.assertEqual([2, 5], data.lines(suite_filename, context="mysuite|multiply_zero"))
 
     def test_switch_context_unstarted(self):
         # Coverage must be started to switch context
-
+        msg = "Cannot switch context, coverage is not started"
         cov = coverage.Coverage()
-        with self.assertRaises(CoverageException):
+        with self.assertRaisesRegex(CoverageException, msg):
             cov.switch_context("test1")
 
         cov.start()
         cov.switch_context("test2")
 
         cov.stop()
-        with self.assertRaises(CoverageException):
+        with self.assertRaisesRegex(CoverageException, msg):
             cov.switch_context("test3")
 
 
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 264e7aea..d6f5ac46 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -925,7 +925,7 @@ class DynamicContextPluginTest(CoverageTest):
                 reg.add_dynamic_context(Plugin())
             """)
 
-    def make_testsuite(self):
+    def make_test_files(self):
         """Make some files to use while testing dynamic context plugins."""
         self.make_file("rendering.py", """\
             def html_tag(tag, content):
@@ -979,7 +979,7 @@ class DynamicContextPluginTest(CoverageTest):
 
     def test_plugin_standalone(self):
         self.make_plugin_capitalized_testnames('plugin_tests.py')
-        self.make_testsuite()
+        self.make_test_files()
 
         # Enable dynamic context plugin
         cov = coverage.Coverage()
@@ -1010,7 +1010,7 @@ class DynamicContextPluginTest(CoverageTest):
 
     def test_static_context(self):
         self.make_plugin_capitalized_testnames('plugin_tests.py')
-        self.make_testsuite()
+        self.make_test_files()
 
         # Enable dynamic context plugin for coverage with named context
         cov = coverage.Coverage(context='mytests')
@@ -1031,7 +1031,7 @@ class DynamicContextPluginTest(CoverageTest):
 
     def test_plugin_with_test_function(self):
         self.make_plugin_capitalized_testnames('plugin_tests.py')
-        self.make_testsuite()
+        self.make_test_files()
 
         # Enable both a plugin and test_function dynamic context
         cov = coverage.Coverage()
@@ -1066,7 +1066,7 @@ class DynamicContextPluginTest(CoverageTest):
     def test_multiple_plugins(self):
         self.make_plugin_capitalized_testnames('plugin_tests.py')
         self.make_plugin_track_render('plugin_renderers.py')
-        self.make_testsuite()
+        self.make_test_files()
 
         # Enable two plugins
         cov = coverage.Coverage()