Isolate old-style singleton api tests.

1 files changed, 28 insertions, 21 deletions

diff --git a/test/test_api.py b/test/test_api.py
index eeeccfd5..60d248e9 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -8,53 +8,56 @@ from coverage.backward import StringIO
 sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
 from coveragetest import CoverageTest
 
-# This file uses the singleton module interface.  Prevent it from writing
-# .coverage files at exit.
-coverage.use_cache(0)
 
-class ApiTest(CoverageTest):
-    """Api-oriented tests for Coverage."""
+class SingletonApiTest(CoverageTest):
+    """Tests of the old-fashioned singleton API."""
 
-    def testSimple(self):
+    def setUp(self):
+        super(SingletonApiTest, self).setUp()
+        # These tests use the singleton module interface.  Prevent it from
+        # writing .coverage files at exit.
+        coverage.use_cache(0)
+
+    def doReportWork(self, modname):
+        """Create a module named `modname`, then measure it."""
         coverage.erase()
 
-        self.make_file("mycode.py", """\
+        self.make_file(modname+".py", """\
             a = 1
             b = 2
             if b == 3:
                 c = 4
-            d = 5
+                d = 5
+                e = 6
+            f = 7
             """)
 
         # Import the python file, executing it.
         coverage.start()
-        self.import_module("mycode")            # pragma: recursive coverage
+        self.import_module(modname)             # pragma: recursive coverage
         coverage.stop()                         # pragma: recursive coverage
 
-        _, statements, missing, missingtext = coverage.analysis("mycode.py")
-        self.assertEqual(statements, [1,2,3,4,5])
-        self.assertEqual(missing, [4])
-        self.assertEqual(missingtext, "4")
-
-    def doReportWork(self, modname):
-        """Create a module named `modname`, then measure it."""
+    def testSimple(self):
         coverage.erase()
 
-        self.make_file(modname+".py", """\
+        self.make_file("mycode.py", """\
             a = 1
             b = 2
             if b == 3:
                 c = 4
-                d = 5
-                e = 6
-            f = 7
+            d = 5
             """)
 
         # Import the python file, executing it.
         coverage.start()
-        self.import_module(modname)             # pragma: recursive coverage
+        self.import_module("mycode")            # pragma: recursive coverage
         coverage.stop()                         # pragma: recursive coverage
 
+        _, statements, missing, missingtext = coverage.analysis("mycode.py")
+        self.assertEqual(statements, [1,2,3,4,5])
+        self.assertEqual(missing, [4])
+        self.assertEqual(missingtext, "4")
+
     def testReport(self):
         self.doReportWork("mycode2")
         coverage.report(["mycode2.py"])
@@ -83,6 +86,10 @@ class ApiTest(CoverageTest):
         rpt = re.sub(r"\s+", " ", self.stdout())
         self.assertTrue("mycode4 7 3 57% 4-6" in rpt)
 
+
+class ApiTest(CoverageTest):
+    """Api-oriented tests for Coverage."""
+
     def testUnexecutedFile(self):
         cov = coverage.coverage()