Change how data is harvested from the collector to simplify api use.

2 files changed, 9 insertions, 3 deletions

diff --git a/test/coverage_coverage.py b/test/coverage_coverage.py
index 1f73bab1..0ab0e2ff 100644
--- a/test/coverage_coverage.py
+++ b/test/coverage_coverage.py
@@ -30,7 +30,6 @@ import nose
 nose.run(sys.argv[1:])
 
 cov.stop()
-cov.save()  # TODO: This is needed to get group_collected_data called.
 
 cov.clear_exclude()
 cov.exclude("#pragma: no cover")
diff --git a/test/test_api.py b/test/test_api.py
index e4c5970b..35278e92 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -1,6 +1,6 @@
 """Tests for Coverage's api."""
 
-import os, sys, textwrap
+import os, re, sys, textwrap
 from cStringIO import StringIO
 
 import coverage
@@ -47,7 +47,6 @@ class ApiTest(CoverageTest):
         coverage.start()
         self.importModule(modname)
         coverage.stop()
-        coverage.analysis(modname + ".py")
         
     def testReport(self):
         self.doReportWork("mycode2")
@@ -59,6 +58,7 @@ class ApiTest(CoverageTest):
             """))
         
     def testReportFile(self):
+        # The file= argument of coverage.report makes the report go there.
         self.doReportWork("mycode3")
         fout = StringIO()
         coverage.report(["mycode3.py"], file=fout)
@@ -69,6 +69,13 @@ class ApiTest(CoverageTest):
             mycode3       7      4    57%   4-6
             """))
 
+    def testReportDefault(self):
+        # Calling report() with no morfs will report on whatever was executed.
+        self.doReportWork("mycode4")
+        coverage.report()
+        rpt = re.sub(r"\s+", " ", self.stdout())
+        self.assert_("mycode4 7 4 57% 4-6" in rpt)
+
     def testUnexecutedFile(self):
         cov = coverage.coverage()