[Python-checkins] r67776 - sandbox/trunk/2to3/lib2to3/tests/test_fixers.py

Sun Dec 14 23:22:38 CET 2008

Author: benjamin.peterson
Date: Sun Dec 14 23:22:38 2008
New Revision: 67776
Log:
make a common mixin class for Test_imports and friends
Modified:
 sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
==============================================================================

--- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py	(original)
+++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py	Sun Dec 14 23:22:38 2008
@@ -1463,14 +1463,8 @@
 s = "foo(xreadlines)"
 self.unchanged(s)
 
-class Test_imports(FixerTestCase):
- fixer = "imports"
- from ..fixes.fix_imports import MAPPING as modules
 
- def test_several_on_a_line(self):
- b = """import urlparse, cStringIO"""
- a = """import urllib.parse, io"""
- self.check(b, a)
+class ImportsFixerTests:
 
 def test_import_module(self):
 for old, new in self.modules.items():
@@ -1568,18 +1562,25 @@
 self.check(b, a)
 
 
+class Test_imports(FixerTestCase, ImportsFixerTests):
+ fixer = "imports"
+ from ..fixes.fix_imports import MAPPING as modules
 
-class Test_imports2(Test_imports):
+ def test_several_on_a_line(self):
+ b = """import urlparse, cStringIO"""
+ a = """import urllib.parse, io"""
+ self.check(b, a)
+
+
+class Test_imports2(FixerTestCase, ImportsFixerTests):
 fixer = "imports2"
 from ..fixes.fix_imports2 import MAPPING as modules
 
 
-class Test_imports_fixer_order(Test_imports):
-
- fixer = None
+class Test_imports_fixer_order(FixerTestCase, ImportsFixerTests):
 
 def setUp(self):
- Test_imports.setUp(self, ['imports', 'imports2'])
+ super(Test_imports_fixer_order, self).setUp(['imports', 'imports2'])
 from ..fixes.fix_imports2 import MAPPING as mapping2
 self.modules = mapping2.copy()
 from ..fixes.fix_imports import MAPPING as mapping1
