[Checkins] SVN: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/ Support all-in-one registering.

[Uli Fouquet]

Log message for revision 83446:
  Support all-in-one registering.

Changed:
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/__init__.py
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py

-=-
Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/__init__.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/__init__.py	2008-02-03 08:40:14 UTC (rev 83445)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/__init__.py	2008-02-03 09:09:02 UTC (rev 83446)
@@ -1,5 +1,16 @@
 from z3c.testsetup.base import BasicTestSetup
 from z3c.testsetup.doctesting import (UnitDocTestSetup, FunctionalDocTestSetup,
-                                      register_doctests)
-from z3c.testsetup.testing import UnitTestSetup, register_pytests
+                                      register_doctests, collect_doctests)
+from z3c.testsetup.testing import (UnitTestSetup, register_pytests,
+                                   collect_pytests)
+from z3c.testsetup.util import get_package
+import unittest
 
+def register_all_tests(pkg_or_dotted_name):
+    pkg = get_package(pkg_or_dotted_name)
+    def tempfunc():
+        suite = unittest.TestSuite()
+        suite.addTest(collect_pytests(pkg))
+        suite.addTest(collect_doctests(pkg))
+        return suite
+    return tempfunc

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-02-03 08:40:14 UTC (rev 83445)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-02-03 09:09:02 UTC (rev 83446)
@@ -131,6 +131,14 @@
             suite.addTest(self.suiteFromFile(name))
         return suite
 
+def collect_doctests(package, *args, **kwargs):
+    suite = unittest.TestSuite()
+    test = UnitDocTestSetup(package).getTestSuite()
+    suite.addTests(
+        UnitDocTestSetup(package).getTestSuite())
+    suite.addTest(
+        FunctionalDocTestSetup(package).getTestSuite())
+    return suite
 
 def register_doctests(pkg_or_dotted_name):
     """Return a function that requires no argument and delivers a test
@@ -146,11 +154,6 @@
     """
     pkg = get_package(pkg_or_dotted_name)
     def tmpfunc():
-        suite = unittest.TestSuite()
-        suite.addTest(
-            UnitDocTestSetup(pkg).getTestSuite())
-        suite.addTest(
-            FunctionalDocTestSetup(pkg).getTestSuite())
-        return suite
+        return collect_doctests(pkg)
     return tmpfunc
     

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py	2008-02-03 08:40:14 UTC (rev 83445)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py	2008-02-03 09:09:02 UTC (rev 83446)
@@ -96,6 +96,13 @@
         return suite
 
 
+def collect_pytests(package, *args, **kwargs):
+    suite = unittest.TestSuite()
+    suite.addTest(
+        UnitTestSetup(package).getTestSuite())
+    return suite
+    
+
 def register_pytests(pkg_or_dotted_name):
     """Return a function that requires no argument and delivers a test
     suite.
@@ -110,9 +117,6 @@
     """
     pkg = get_package(pkg_or_dotted_name)
     def tmpfunc():
-        suite = unittest.TestSuite()
-        suite.addTest(
-            UnitTestSetup(pkg).getTestSuite())
-        return suite
+        return collect_pytests(pkg)
     return tmpfunc