diff options
| -rw-r--r-- | tests/test_api.py | 12 | ||||
| -rw-r--r-- | tests/test_context.py | 13 | ||||
| -rw-r--r-- | tests/test_plugins.py | 24 |
3 files changed, 29 insertions, 20 deletions
diff --git a/tests/test_api.py b/tests/test_api.py index 107617ea..eb13896d 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -556,8 +556,10 @@ class ApiTest(CoverageTest): filenames = self.get_measured_filenames(data) suite_filename = filenames['testsuite.py'] - self.assertEqual([2, 8], data.lines(suite_filename, context="multiply_six")) - self.assertEqual([2, 5], data.lines(suite_filename, context="multiply_zero")) + self.assertEqual( + [2, 8], data.lines(suite_filename, contexts=["multiply_six"])) + self.assertEqual( + [2, 5], data.lines(suite_filename, contexts=["multiply_zero"])) def test_switch_context_with_static(self): # This test simulates a coverage-aware test runner, @@ -594,8 +596,10 @@ class ApiTest(CoverageTest): filenames = self.get_measured_filenames(data) suite_filename = filenames['testsuite.py'] - self.assertEqual([2, 8], data.lines(suite_filename, context="mysuite|multiply_six")) - self.assertEqual([2, 5], data.lines(suite_filename, context="mysuite|multiply_zero")) + self.assertEqual( + [2, 8], data.lines(suite_filename, contexts=["mysuite|multiply_six"])) + self.assertEqual( + [2, 5], data.lines(suite_filename, contexts=["mysuite|multiply_zero"])) def test_switch_context_unstarted(self): # Coverage must be started to switch context diff --git a/tests/test_context.py b/tests/test_context.py index 0baa51e9..24e17069 100644 --- a/tests/test_context.py +++ b/tests/test_context.py @@ -172,10 +172,15 @@ class DynamicContextTest(CoverageTest): full_names = {os.path.basename(f): f for f in data.measured_files()} fname = full_names["two_tests.py"] - self.assertCountEqual(data.measured_contexts(), ["stat", "stat|test_one", "stat|test_two"]) - self.assertCountEqual(data.lines(fname, "stat"), self.OUTER_LINES) - self.assertCountEqual(data.lines(fname, "stat|test_one"), self.TEST_ONE_LINES) - self.assertCountEqual(data.lines(fname, "stat|test_two"), self.TEST_TWO_LINES) + self.assertCountEqual( + data.measured_contexts(), + ["stat", "stat|two_tests.test_one", "stat|two_tests.test_two"]) + self.assertCountEqual( + data.lines(fname, ["stat"]), self.OUTER_LINES) + self.assertCountEqual( + data.lines(fname, ["stat|two_tests.test_one"]), self.TEST_ONE_LINES) + self.assertCountEqual( + data.lines(fname, ["stat|two_tests.test_two"]), self.TEST_TWO_LINES) class DynamicContextWithPythonTracerTest(CoverageTest): diff --git a/tests/test_plugins.py b/tests/test_plugins.py index d6f5ac46..a4c7a5ee 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -997,15 +997,15 @@ class DynamicContextPluginTest(CoverageTest): ) self.assertEqual( [2], - data.lines(filenames['rendering.py'], context="doctest:HTML_TAG"), + data.lines(filenames['rendering.py'], contexts=["doctest:HTML_TAG"]), ) self.assertEqual( [2], - data.lines(filenames['rendering.py'], context="test:HTML_TAG"), + data.lines(filenames['rendering.py'], contexts=["test:HTML_TAG"]), ) self.assertEqual( [2, 5, 8, 11], - data.lines(filenames['rendering.py'], context="test:RENDERERS"), + data.lines(filenames['rendering.py'], contexts=["test:RENDERERS"]), ) def test_static_context(self): @@ -1047,20 +1047,20 @@ class DynamicContextPluginTest(CoverageTest): data = cov.get_data() filenames = self.get_measured_filenames(data) self.assertEqual( - ['', 'doctest:HTML_TAG', 'test_html_tag', 'test_renderers'], + ['', 'doctest:HTML_TAG', 'testsuite.test_html_tag', 'testsuite.test_renderers'], sorted(data.measured_contexts()), ) self.assertEqual( [2], - data.lines(filenames['rendering.py'], context="doctest:HTML_TAG"), + data.lines(filenames['rendering.py'], contexts=["doctest:HTML_TAG"]), ) self.assertEqual( [2], - data.lines(filenames['rendering.py'], context="test_html_tag"), + data.lines(filenames['rendering.py'], contexts=["testsuite.test_html_tag"]), ) self.assertEqual( [2, 5, 8, 11], - data.lines(filenames['rendering.py'], context="test_renderers"), + data.lines(filenames['rendering.py'], contexts=["testsuite.test_renderers"]), ) def test_multiple_plugins(self): @@ -1094,23 +1094,23 @@ class DynamicContextPluginTest(CoverageTest): self.assertEqual(expected, sorted(data.measured_contexts())) self.assertEqual( [2], - data.lines(filenames['rendering.py'], context="test:HTML_TAG"), + data.lines(filenames['rendering.py'], contexts=["test:HTML_TAG"]), ) self.assertEqual( [2, 5, 8, 11], - data.lines(filenames['rendering.py'], context="test:RENDERERS"), + data.lines(filenames['rendering.py'], contexts=["test:RENDERERS"]), ) self.assertEqual( [2], - data.lines(filenames['rendering.py'], context="doctest:HTML_TAG"), + data.lines(filenames['rendering.py'], contexts=["doctest:HTML_TAG"]), ) self.assertEqual( [2, 5], - data.lines(filenames['rendering.py'], context="renderer:paragraph"), + data.lines(filenames['rendering.py'], contexts=["renderer:paragraph"]), ) self.assertEqual( [2, 8], - data.lines(filenames['rendering.py'], context="renderer:span"), + data.lines(filenames['rendering.py'], contexts=["renderer:span"]), ) |