Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update tests to use updated APIs.
  • Loading branch information
strichter committed May 12, 2019
1 parent d9f82d7 commit 3069f50
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 20 deletions.
12 changes: 8 additions & 4 deletions tests/test_api.py
Expand Up @@ -556,8 +556,10 @@ def test_switch_context_testrunner(self):
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,
Expand Down Expand Up @@ -594,8 +596,10 @@ def test_switch_context_with_static(self):
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
Expand Down
13 changes: 9 additions & 4 deletions tests/test_context.py
Expand Up @@ -172,10 +172,15 @@ def test_static_and_dynamic(self):

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):
Expand Down
24 changes: 12 additions & 12 deletions tests/test_plugins.py
Expand Up @@ -997,15 +997,15 @@ def test_plugin_standalone(self):
)
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):
Expand Down Expand Up @@ -1047,20 +1047,20 @@ def test_plugin_with_test_function(self):
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):
Expand Down Expand Up @@ -1094,23 +1094,23 @@ def test_multiple_plugins(self):
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"]),
)


Expand Down

0 comments on commit 3069f50

Please sign in to comment.