diff options
| -rw-r--r-- | test/backunittest.py | 18 | ||||
| -rw-r--r-- | test/test_api.py | 2 | ||||
| -rw-r--r-- | test/test_config.py | 6 | ||||
| -rw-r--r-- | test/test_coverage.py | 20 | ||||
| -rw-r--r-- | test/test_oddball.py | 2 | ||||
| -rw-r--r-- | test/test_summary.py | 28 |
6 files changed, 41 insertions, 35 deletions
diff --git a/test/backunittest.py b/test/backunittest.py index 28978c78..51f5df36 100644 --- a/test/backunittest.py +++ b/test/backunittest.py @@ -17,11 +17,17 @@ class TestCase(unittest.TestCase): the builtin `unittest` doesn't have them. """ + if _need('assertTrue'): + def assertTrue(self, exp, msg=None): + """Assert that `exp` is true.""" + if not exp: + self.fail(msg) + if _need('assertFalse'): - def assertFalse(self, exp): + def assertFalse(self, exp, msg=None): """Assert that `exp` is false.""" if exp: - self.fail() + self.fail(msg) if _need('assertRaisesRegexp'): def assertRaisesRegexp(self, excClass, regexp, callobj, *args, **kw): @@ -74,10 +80,10 @@ class TestCase(unittest.TestCase): """ # Adapted from Py3.1 unittest. - self.assert_(isinstance(first, str), ( - 'First argument is not a string')) - self.assert_(isinstance(second, str), ( - 'Second argument is not a string')) + self.assertTrue(isinstance(first, str), + 'First argument is not a string') + self.assertTrue(isinstance(second, str), + 'Second argument is not a string') if first != second: msg = ''.join(difflib.ndiff(first.splitlines(True), diff --git a/test/test_api.py b/test/test_api.py index 0df2df4a..85b90e4e 100644 --- a/test/test_api.py +++ b/test/test_api.py @@ -81,7 +81,7 @@ class ApiTest(CoverageTest): self.doReportWork("mycode4") coverage.report() rpt = re.sub(r"\s+", " ", self.stdout()) - self.assert_("mycode4 7 4 57% 4-6" in rpt) + self.assertTrue("mycode4 7 4 57% 4-6" in rpt) def testUnexecutedFile(self): cov = coverage.coverage() diff --git a/test/test_config.py b/test/test_config.py index a1abf51b..4272e8aa 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -20,7 +20,7 @@ class ConfigTest(CoverageTest): def test_arguments(self): # Arguments to the constructor are applied to the configuation. cov = coverage.coverage(timid=True, data_file="fooey.dat") - self.assert_(cov.config.timid) + self.assertTrue(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, "fooey.dat") @@ -33,7 +33,7 @@ class ConfigTest(CoverageTest): data_file = .hello_kitty.data """) cov = coverage.coverage() - self.assert_(cov.config.timid) + self.assertTrue(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, ".hello_kitty.data") @@ -46,7 +46,7 @@ class ConfigTest(CoverageTest): data_file = delete.me """) cov = coverage.coverage(config_file="my_cov.ini") - self.assert_(cov.config.timid) + self.assertTrue(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, "delete.me") diff --git a/test/test_coverage.py b/test/test_coverage.py index c1a72480..9303c063 100644 --- a/test/test_coverage.py +++ b/test/test_coverage.py @@ -1594,9 +1594,9 @@ class ProcessTest(CoverageTest): w = "world" """) - self.assert_(not os.path.exists(".coverage")) + self.assertFalse(os.path.exists(".coverage")) self.run_command("coverage -x mycode.py") - self.assert_(os.path.exists(".coverage")) + self.assertTrue(os.path.exists(".coverage")) def testEnvironment(self): # Checks that we can import modules from the test directory at all! @@ -1607,9 +1607,9 @@ class ProcessTest(CoverageTest): print ('done') """) - self.assert_(not os.path.exists(".coverage")) + self.assertFalse(os.path.exists(".coverage")) out = self.run_command("coverage -x mycode.py") - self.assert_(os.path.exists(".coverage")) + self.assertTrue(os.path.exists(".coverage")) self.assertEqual(out, 'done\n') def testCombineParallelData(self): @@ -1626,11 +1626,11 @@ class ProcessTest(CoverageTest): out = self.run_command("coverage -x -p b_or_c.py b") self.assertEqual(out, 'done\n') - self.assert_(not os.path.exists(".coverage")) + self.assertFalse(os.path.exists(".coverage")) out = self.run_command("coverage -x -p b_or_c.py c") self.assertEqual(out, 'done\n') - self.assert_(not os.path.exists(".coverage")) + self.assertFalse(os.path.exists(".coverage")) # After two -p runs, there should be two .coverage.machine.123 files. self.assertEqual( @@ -1639,7 +1639,7 @@ class ProcessTest(CoverageTest): # Combine the parallel coverage data files into .coverage . self.run_command("coverage -c") - self.assert_(os.path.exists(".coverage")) + self.assertTrue(os.path.exists(".coverage")) # Read the coverage file and see that b_or_c.py has all 7 lines # executed. @@ -1657,7 +1657,7 @@ class ProcessTest(CoverageTest): os.remove("fleeting.py") out = self.run_command("coverage html -d htmlcov") self.assertRegexpMatches(out, "No source for code: '.*fleeting.py'") - self.assert_("Traceback" not in out) + self.assertFalse("Traceback" in out) # It happens that the code paths are different for *.py and other # files, so try again with no extension. @@ -1669,12 +1669,12 @@ class ProcessTest(CoverageTest): os.remove("fleeting") out = self.run_command("coverage html -d htmlcov") self.assertRegexpMatches(out, "No source for code: '.*fleeting'") - self.assert_("Traceback" not in out) + self.assertFalse("Traceback" in out) def test_running_missing_file(self): out = self.run_command("coverage run xyzzy.py") self.assertRegexpMatches(out, "No file to run: .*xyzzy.py") - self.assert_("Traceback" not in out) + self.assertFalse("Traceback" in out) def test_no_data_to_report_on_annotate(self): # Reporting with no data produces a nice message and no output dir. diff --git a/test/test_oddball.py b/test/test_oddball.py index 05252ef8..b102019b 100644 --- a/test/test_oddball.py +++ b/test/test_oddball.py @@ -92,7 +92,7 @@ class MemoryLeakTest(CoverageTest): self.check_coverage(code.replace("ITERS", "10000"), lines, "") ram_2 = osinfo.process_ram() ram_growth = (ram_2 - ram_1) - (ram_1 - ram_0) - self.assert_(ram_growth < 100000, "RAM grew by %d" % (ram_growth)) + self.assertTrue(ram_growth < 100000, "RAM grew by %d" % (ram_growth)) class PyexpatTest(CoverageTest): diff --git a/test/test_summary.py b/test/test_summary.py index 0eec58ca..d2f40aeb 100644 --- a/test/test_summary.py +++ b/test/test_summary.py @@ -20,7 +20,7 @@ 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): @@ -46,10 +46,10 @@ class SummaryTest(CoverageTest): # --------------------------------------------------------------------- # TOTAL 8 8 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.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 8 100%") def test_report_just_one(self): @@ -62,10 +62,10 @@ class SummaryTest(CoverageTest): # mycode 4 4 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.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 4 100%") def test_report_omitting(self): @@ -79,10 +79,10 @@ class SummaryTest(CoverageTest): # mycode 4 4 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.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 4 100%") def test_report_branches(self): @@ -102,6 +102,6 @@ class SummaryTest(CoverageTest): # mybranch 5 5 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%") |