Update tests to match plugin changes.

dugan · Aug 20, 2010 · 18ecc91 · 18ecc91
1 parent ec8e876
commit 18ecc91
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/tests/test_collectors/test_coverage.py b/tests/test_collectors/test_coverage.py
@@ -32,7 +32,7 @@ def test_coverage(self):
             # no support for gettrace
             return
         self.cover_program('tests.data.prog1')
-        collector = self.load_plugin('coverage_reporter.collectors.coverage_collector.CoveragePyCollector')
+        collector = self.load_plugin('coverage_collector')
         collector.coverage_file = '.test_coverage'
         data = collector.collect(['tests/data/prog1.py'])
         full_path = os.path.realpath('tests/data/prog1.py')

diff --git a/tests/test_collectors/test_figleaf.py b/tests/test_collectors/test_figleaf.py
@@ -4,7 +4,7 @@
 from tests.testcase import *
 
 import coverage_reporter
-from coverage_reporter.plugins import Filter
+from coverage_reporter.pluginmgr import Filter
 
 
 class FigLeafTest(CoverageReporterTestCase):
@@ -33,7 +33,7 @@ def test_figleaf(self):
             # no support for gettrace
             return
         self.cover_program('tests.data.prog1')
-        collector = self.load_plugin('coverage_reporter.collectors.figleaf_collector.FigleafCollector')
+        collector = self.load_plugin('figleaf_collector')
         collector.figleaf_file = '.figleaf_test'
         data = collector.collect(['tests/data/prog1.py'])
         full_path = os.path.realpath('tests/data/prog1.py')

diff --git a/tests/test_filters/test_exclude.py b/tests/test_filters/test_exclude.py
@@ -16,7 +16,7 @@ def test_exclude_filter(self):
                  'another_file' : True,
                  'whole_path' : True,
                  'whole_path2' : False}
-        filter = self.load_plugin('coverage_reporter.filters.exclude.ExcludeFilter')
+        filter = self.load_plugin('exclude')
         filter.exclude = excludes
         filter.initialize()
         for path, matched in paths.items():

diff --git a/tests/test_filters/test_minimum.py b/tests/test_filters/test_minimum.py
@@ -5,7 +5,7 @@ class MinimumTest(CoverageReporterTestCase):
     def test_minimum(self):
         data = self.create_coverage_data({'foo.py' : {'missing' : 20},
                                           'bar.py' : {'missing' : 10 }})
-        filter = self.load_plugin('coverage_reporter.filters.minimum.MinimumMissingFilter')
+        filter = self.load_plugin('minimum')
         filter.minimum_missing = 15
         assert(filter.report_path('foo.py', data))
         assert(not filter.report_path('bar.py', data))
diff --git a/tests/test_filters/test_patch.py b/tests/test_filters/test_patch.py
@@ -5,7 +5,7 @@ class PathTest(CoverageReporterTestCase):
     def test_patch_filter(self):
         data = self.create_exact_coverage_data({'tests/data/prog3.py' : {'lines'   : [1,2,3,4,5,6,8],
                                                                    'covered' : [1,2,3,6,8]}})
-        filter = self.load_plugin('coverage_reporter.filters.patch.FilterByPatch')
+        filter = self.load_plugin('patch')
         filter.patch = 'tests/data/prog3.patch'
         filter.patch_level = 0
         new_data = filter.filter(data)

diff --git a/tests/test_reports/test_annotate.py b/tests/test_reports/test_annotate.py
@@ -14,7 +14,7 @@ def test_annotate(self, tempdir):
             open(tempdir + '/bar', 'w').write('b\n' * 10)
             data = self.create_coverage_data({'foo' : {'missing' : 10, 'total' : 20},
                                               tempdir + '/bar' : {'missing' : 0, 'total' : 10}})
-            reporter = self.load_plugin('coverage_reporter.reports.annotate.AnnotateReporter')
+            reporter = self.load_plugin('annotate')
             annotate_dir = tempdir + '/annotate'
             reporter.annotate_dir = annotate_dir
             reporter.report(data, data.get_paths())

diff --git a/tests/test_reports/test_summarize.py b/tests/test_reports/test_summarize.py
@@ -9,7 +9,7 @@ def test_summarize(self):
         data = self.create_coverage_data({'foo' : {'missing' : 10, 'total' : 80},
                                         'bar' : {'missing' : 0, 'total' : 10},
                                         'long_name_foo_another_long_name' : {'missing' : 10, 'total' : 10}})
-        reporter = self.load_plugin('coverage_reporter.reports.summarize.SummarizeReporter')
+        reporter = self.load_plugin('summarize')
         orig_stdout = sys.stdout
         captured = StringIO()
         try:

diff --git a/tests/testcase.py b/tests/testcase.py
@@ -6,14 +6,13 @@
 
 from coverage_reporter.data import CoverageData
 from coverage_reporter.config import CoverageReporterConfig
-from coverage_reporter.plugins import PluginManager
+from coverage_reporter.pluginmgr import PluginList,load_plugins
 
 class CoverageReporterTestCase(unittest2.TestCase):
 
     def setUp(self):
         super(CoverageReporterTestCase, self).setUp()
         self.cfg = CoverageReporterConfig(read_defaults=False)
-        self.plugins = PluginManager()
 
     def run_program(self, program_name):
         if program_name in sys.modules:
@@ -27,7 +26,7 @@ def load_plugin(self, plugin_name):
         return self.load_plugins([plugin_name])[0]
 
     def load_plugins(self, plugin_list):
-        return self.plugins.load_plugins(self.cfg, plugin_list)
+        return load_plugins(self.cfg.plugin_dirs, plugin_list).plugins
 
     def create_exact_coverage_data(self, path_dict):
         data = CoverageData()