diff options
Diffstat (limited to 'test/test_summary.py')
| -rw-r--r-- | test/test_summary.py | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/test/test_summary.py b/test/test_summary.py index 36db9969..b41a3e7d 100644 --- a/test/test_summary.py +++ b/test/test_summary.py @@ -20,9 +20,9 @@ class SummaryTest(CoverageTest): def report_from_command(self, cmd): """Return the report from the `cmd`, with some convenience added.""" report = self.run_command(cmd).replace('\\', '/') - self.assert_("error" not in report.lower()) + self.assertFalse("error" in report.lower()) return report - + def line_count(self, report): """How many lines are in `report`?""" self.assertEqual(report.split('\n')[-1], "") @@ -38,52 +38,52 @@ class SummaryTest(CoverageTest): self.assertEqual(out, 'done\n') report = self.report_from_command("coverage -r") - # Name Stmts Exec Cover + # Name Stmts Miss Cover # --------------------------------------------------------------------- - # c:/ned/coverage/trunk/test/modules/covmod1 2 2 100% - # c:/ned/coverage/trunk/test/zipmods.zip/covmodzip1 2 2 100% - # mycode 4 4 100% + # c:/ned/coverage/trunk/test/modules/covmod1 2 0 100% + # c:/ned/coverage/trunk/test/zipmods.zip/covmodzip1 2 0 100% + # mycode 4 0 100% # --------------------------------------------------------------------- - # TOTAL 8 8 100% + # TOTAL 8 0 100% - self.assert_("/coverage/__init__/" not in report) - self.assert_("/test/modules/covmod1 " in report) - self.assert_("/test/zipmods.zip/covmodzip1 " in report) - self.assert_("mycode " in report) - self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 8 100%") + self.assertFalse("/coverage/__init__/" in report) + self.assertTrue("/test/modules/covmod1 " in report) + self.assertTrue("/test/zipmods.zip/covmodzip1 " in report) + self.assertTrue("mycode " in report) + self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 0 100%") def test_report_just_one(self): # Try reporting just one module self.run_command("coverage -x mycode.py") report = self.report_from_command("coverage -r mycode.py") - # Name Stmts Exec Cover + # Name Stmts Miss Cover # ---------------------------- - # mycode 4 4 100% + # mycode 4 0 100% self.assertEqual(self.line_count(report), 3) - self.assert_("/coverage/" not in report) - self.assert_("/test/modules/covmod1 " not in report) - self.assert_("/test/zipmods.zip/covmodzip1 " not in report) - self.assert_("mycode " in report) - self.assertEqual(self.last_line_squeezed(report), "mycode 4 4 100%") + self.assertFalse("/coverage/" in report) + self.assertFalse("/test/modules/covmod1 " in report) + self.assertFalse("/test/zipmods.zip/covmodzip1 " in report) + self.assertTrue("mycode " in report) + self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%") def test_report_omitting(self): # Try reporting while omitting some modules prefix = os.path.split(__file__)[0] self.run_command("coverage -x mycode.py") report = self.report_from_command("coverage -r -o %s" % prefix) - - # Name Stmts Exec Cover + + # Name Stmts Miss Cover # ---------------------------- - # mycode 4 4 100% + # mycode 4 0 100% self.assertEqual(self.line_count(report), 3) - self.assert_("/coverage/" not in report) - self.assert_("/test/modules/covmod1 " not in report) - self.assert_("/test/zipmods.zip/covmodzip1 " not in report) - self.assert_("mycode " in report) - self.assertEqual(self.last_line_squeezed(report), "mycode 4 4 100%") + self.assertFalse("/coverage/" in report) + self.assertFalse("/test/modules/covmod1 " in report) + self.assertFalse("/test/zipmods.zip/covmodzip1 " in report) + self.assertTrue("mycode " in report) + self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%") def test_report_branches(self): self.make_file("mybranch.py", """\ @@ -97,11 +97,11 @@ class SummaryTest(CoverageTest): self.assertEqual(out, 'x\n') report = self.report_from_command("coverage report") - # Name Stmts Exec Branch BrExec Cover + # Name Stmts Miss Branch BrPart Cover # -------------------------------------------- - # mybranch 5 5 2 1 85% + # mybranch 5 0 2 1 85% self.assertEqual(self.line_count(report), 3) - self.assert_("mybranch " in report) + self.assertTrue("mybranch " in report) self.assertEqual(self.last_line_squeezed(report), - "mybranch 5 5 2 1 85%") + "mybranch 5 0 2 1 85%") |