refactor: a more convenient assert for measured files

Author: nedbat

tests/plugin_test.py

@@ -176,9 +176,15 @@ def get_analysis(self, name=None):
         _, executable, _, missing, _ = analysis
         return executable, missing
 
-    def measured_files(self):
-        """Get the list of measured files, in relative form."""
-        return [os.path.relpath(f) for f in self.cov.get_data().measured_files()]
+    def assert_measured_files(self, *template_files):
+        """Assert that the measured files are `template_files`.
+
+        The names in `template_files` are the base names of files
+        in the templates directory.
+        """
+        measured = {os.path.relpath(f) for f in self.cov.get_data().measured_files()}
+        expected = {os.path.join("templates", f) for f in template_files}
+        self.assertEqual(measured, expected)
 
     def assert_analysis(self, executable, missing=None, name=None):
         """Assert that the analysis for `name` is right."""

tests/test_extends.py

@@ -3,8 +3,6 @@
 
 """Tests of template inheritance for django_coverage_plugin."""
 
-import os.path
-
 from .plugin_test import DjangoPluginTestCase, django_stop_before
 
 
@@ -170,13 +168,7 @@ def test_ssi_unparsed(self):
         text = self.run_django_coverage(name="outer.html", context={'a': 17})
         self.assertEqual(text, "First\nInside {{ a }}\nJob\n\nLast\n")
         self.assert_analysis([1, 2, 3], name="outer.html")
-        self.assertEqual(
-            set(self.measured_files()),
-            set([
-                os.path.join("templates", "outer.html"),
-                os.path.join("templates", "nested.html"),
-            ])
-        )
+        self.assert_measured_files("outer.html", "nested.html")
 
     def test_ssi_parsed(self):
         nested = self.make_template(name="nested.html", text="""\
@@ -193,10 +185,4 @@ def test_ssi_parsed(self):
         text = self.run_django_coverage(name="outer.html", context={'a': 17})
         self.assertEqual(text, "First\nInside 17\nJob\n\nLast\n")
         self.assert_analysis([1, 2, 3], name="outer.html")
-        self.assertEqual(
-            set(self.measured_files()),
-            set([
-                os.path.join("templates", "outer.html"),
-                os.path.join("templates", "nested.html"),
-            ])
-        )
+        self.assert_measured_files("outer.html", "nested.html")