Merged revisions 81022 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81022 | michael.foord | 2010-05-09 11:58:25 +0200 (Sun, 09 May 2010) | 1 line

  Adding a test for unittest.BaseTestSuite.
........

diff --git a/Lib/unittest/test/test_suite.py b/Lib/unittest/test/test_suite.py
index ab2e16eb99a4bb3b82fcfd1fba13b3012f434ebf..47b57de3b74dcbae32ef8f4bc790ea555979d850 100644 (file)
--- a/Lib/unittest/test/test_suite.py
+++ b/Lib/unittest/test/test_suite.py
@@ -1,5 +1,6 @@
 import unittest
 
+import sys
 from .support import LoggingResult, TestEquality
 
 
@@ -300,5 +301,49 @@ class Test_TestSuite(unittest.TestCase, TestEquality):
         suite.run(unittest.TestResult())
 
 
+
+    def test_basetestsuite(self):
+        class Test(unittest.TestCase):
+            wasSetUp = False
+            wasTornDown = False
+            @classmethod
+            def setUpClass(cls):
+                cls.wasSetUp = True
+            @classmethod
+            def tearDownClass(cls):
+                cls.wasTornDown = True
+            def testPass(self):
+                pass
+            def testFail(self):
+                fail
+        class Module(object):
+            wasSetUp = False
+            wasTornDown = False
+            @staticmethod
+            def setUpModule():
+                Module.wasSetUp = True
+            @staticmethod
+            def tearDownModule():
+                Module.wasTornDown = True
+
+        Test.__module__ = 'Module'
+        sys.modules['Module'] = Module
+        self.addCleanup(sys.modules.pop, 'Module')
+
+        suite = unittest.BaseTestSuite()
+        suite.addTests([Test('testPass'), Test('testFail')])
+        self.assertEqual(suite.countTestCases(), 2)
+
+        result = unittest.TestResult()
+        suite.run(result)
+        self.assertFalse(Module.wasSetUp)
+        self.assertFalse(Module.wasTornDown)
+        self.assertFalse(Test.wasSetUp)
+        self.assertFalse(Test.wasTornDown)
+        self.assertEqual(len(result.errors), 1)
+        self.assertEqual(len(result.failures), 0)
+        self.assertEqual(result.testsRun, 2)
+
+
 if __name__ == '__main__':
     unittest.main()