More converstion to assertIn and assertNotIn.

3 files changed, 31 insertions, 31 deletions

diff --git a/test/test_api.py b/test/test_api.py
index bbea8e6..4042d0a 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -84,7 +84,7 @@ class SingletonApiTest(CoverageTest):
         self.do_report_work("mycode4")
         coverage.report()
         rpt = re.sub(r"\s+", " ", self.stdout())
-        self.assertTrue("mycode4 7 3 57% 4-6" in rpt)
+        self.assertIn("mycode4 7 3 57% 4-6", rpt)
 
 
 class ApiTest(CoverageTest):
diff --git a/test/test_process.py b/test/test_process.py
index 473dafb..d33dac5 100644
--- a/test/test_process.py
+++ b/test/test_process.py
@@ -190,7 +190,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.assertFalse("Traceback" in out)
+        self.assertNotIn("Traceback", out)
 
         # It happens that the code paths are different for *.py and other
         # files, so try again with no extension.
@@ -202,13 +202,13 @@ class ProcessTest(CoverageTest):
         os.remove("fleeting")
         status, out = self.run_command_status("coverage html -d htmlcov", 1)
         self.assertRegexpMatches(out, "No source for code: '.*fleeting'")
-        self.assertFalse("Traceback" in out)
+        self.assertNotIn("Traceback", out)
         self.assertEqual(status, 1)
 
     def test_running_missing_file(self):
         status, out = self.run_command_status("coverage run xyzzy.py", 1)
         self.assertRegexpMatches(out, "No file to run: .*xyzzy.py")
-        self.assertFalse("Traceback" in out)
+        self.assertNotIn("Traceback", out)
         self.assertEqual(status, 1)
 
     def test_code_throws(self):
@@ -233,9 +233,9 @@ class ProcessTest(CoverageTest):
         self.assertMultiLineEqual(out, out2)
 
         # But also make sure that the output is what we expect.
-        self.assertTrue('File "throw.py", line 5, in f2' in out)
-        self.assertTrue('raise Exception("hey!")' in out)
-        self.assertFalse('coverage' in out)
+        self.assertIn('File "throw.py", line 5, in f2', out)
+        self.assertIn('raise Exception("hey!")', out)
+        self.assertNotIn('coverage', out)
         self.assertEqual(status, 1)
 
     def test_code_exits(self):
@@ -346,25 +346,25 @@ class ProcessTest(CoverageTest):
             """)
         out = self.run_command("coverage run --source=sys,xyzzy,quux hello.py")
 
-        self.assertTrue("Hello\n" in out)
-        self.assertTrue(textwrap.dedent("""\
+        self.assertIn("Hello\n", out)
+        self.assertIn(textwrap.dedent("""\
             Coverage.py warning: Module sys has no Python source.
             Coverage.py warning: Module xyzzy was never imported.
             Coverage.py warning: Module quux was never imported.
             Coverage.py warning: No data was collected.
-            """) in out)
+            """), out)
 
     def test_warnings_if_never_run(self):
         out = self.run_command("coverage run i_dont_exist.py")
-        self.assertTrue("No file to run: 'i_dont_exist.py'" in out)
-        self.assertTrue("warning" not in out)
+        self.assertIn("No file to run: 'i_dont_exist.py'", out)
+        self.assertNotIn("warning", out)
 
         out = self.run_command("coverage run -m no_such_module")
         self.assertTrue(
             ("No module named no_such_module" in out) or
             ("No module named 'no_such_module'" in out)
             )
-        self.assertTrue("warning" not in out)
+        self.assertNotIn("warning", out)
 
     if sys.version_info >= (3, 0):   # This only works on 3.x for now.
         # It only works with the C tracer.
diff --git a/test/test_summary.py b/test/test_summary.py
index 4ca8265..ec8ca29 100644
--- a/test/test_summary.py
+++ b/test/test_summary.py
@@ -25,7 +25,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.assertFalse("error" in report.lower())
+        self.assertNotIn("error", report.lower())
         return report
 
     def line_count(self, report):
@@ -51,10 +51,10 @@ class SummaryTest(CoverageTest):
         # ---------------------------------------------------------------------
         # TOTAL                                                 8      0   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.assertNotIn("/coverage/__init__/", report)
+        self.assertIn("/test/modules/covmod1 ", report)
+        self.assertIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 0 100%")
 
     def test_report_just_one(self):
@@ -67,10 +67,10 @@ class SummaryTest(CoverageTest):
         # mycode       4      0   100%
 
         self.assertEqual(self.line_count(report), 3)
-        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.assertNotIn("/coverage/", report)
+        self.assertNotIn("/test/modules/covmod1 ", report)
+        self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
 
     def test_report_omitting(self):
@@ -84,10 +84,10 @@ class SummaryTest(CoverageTest):
         # mycode       4      0   100%
 
         self.assertEqual(self.line_count(report), 3)
-        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.assertNotIn("/coverage/", report)
+        self.assertNotIn("/test/modules/covmod1 ", report)
+        self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
 
     def test_report_including(self):
@@ -100,10 +100,10 @@ class SummaryTest(CoverageTest):
         # mycode       4      0   100%
 
         self.assertEqual(self.line_count(report), 3)
-        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.assertNotIn("/coverage/", report)
+        self.assertNotIn("/test/modules/covmod1 ", report)
+        self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report)
+        self.assertIn("mycode ", report)
         self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%")
 
     def test_report_branches(self):
@@ -123,7 +123,7 @@ class SummaryTest(CoverageTest):
         # mybranch       5      0      2      1    85%
 
         self.assertEqual(self.line_count(report), 3)
-        self.assertTrue("mybranch " in report)
+        self.assertIn("mybranch ", report)
         self.assertEqual(self.last_line_squeezed(report),
                                                         "mybranch 5 0 2 1 86%")