summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2009-10-15 09:31:57 -0400
committerNed Batchelder <ned@nedbatchelder.com>2009-10-15 09:31:57 -0400
commit612bd2f9573d5258da617dce6140d794868fb772 (patch)
tree2e0a37cf39e66f3d353733dfdba6e45fc1755840 /test
parentae58984b9177b286c3a20ff049ed35902b97da28 (diff)
downloadpython-coveragepy-612bd2f9573d5258da617dce6140d794868fb772.tar.gz
More refactoring of the use of analysis objects.
Diffstat (limited to 'test')
-rw-r--r--test/coveragetest.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/coveragetest.py b/test/coveragetest.py
index 638c10d..566819f 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -134,26 +134,26 @@ class CoverageTest(unittest.TestCase):
del sys.modules[modname]
# Get the analysis results, and check that they are right.
- _, clines, _, cmissing = cov.analysis(mod)
+ analysis = cov._analyze(mod)
if lines is not None:
if type(lines[0]) == type(1):
- self.assertEqual(clines, lines)
+ self.assertEqual(analysis.statements, lines)
else:
for line_list in lines:
- if clines == line_list:
+ if analysis.statements == line_list:
break
else:
self.fail("None of the lines choices matched %r" % clines)
if missing is not None:
if type(missing) == type(""):
- self.assertEqual(cmissing, missing)
+ self.assertEqual(analysis.missing_formatted(), missing)
else:
for missing_list in missing:
- if cmissing == missing_list:
+ if analysis.missing == missing_list:
break
else:
self.fail(
- "None of the missing choices matched %r" % cmissing
+ "None of the missing choices matched %r" % analysis.missing_formatted()
)
if report: