[Checkins] SVN: grok/trunk/src/grok/tests/test_ refactor test pickup so we can more easily add new packages that contain tests.

[Philipp von Weitershausen]

Log message for revision 70639:
  refactor test pickup so we can more easily add new packages that contain tests.
  

Changed:
  D   grok/trunk/src/grok/tests/test_adapter.py
  A   grok/trunk/src/grok/tests/test_grok.py

-=-
Deleted: grok/trunk/src/grok/tests/test_adapter.py
===================================================================
--- grok/trunk/src/grok/tests/test_adapter.py	2006-10-15 12:07:27 UTC (rev 70638)
+++ grok/trunk/src/grok/tests/test_adapter.py	2006-10-15 12:20:21 UTC (rev 70639)
@@ -1,27 +0,0 @@
-import unittest
-from pkg_resources import resource_listdir
-from zope.testing import doctest, cleanup
-
-def tearDown(test):
-    cleanup.cleanUp()
-
-def grokTestSuite(pkg):
-    return doctest.DocTestSuite(pkg, tearDown=tearDown,
-                                optionflags=doctest.ELLIPSIS)
-
-def test_suite():
-    adapterfiles = resource_listdir(__name__, 'adapter')
-    suite = unittest.TestSuite()
-    for filename in adapterfiles:
-        if not filename.endswith('.py'):
-            continue
-        if filename.endswith('_fixture.py'):
-            continue
-        if filename == '__init__.py':
-            continue
-        dottedname = 'grok.tests.adapter.' + filename[:-3]
-        suite.addTest(grokTestSuite(dottedname))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Copied: grok/trunk/src/grok/tests/test_grok.py (from rev 70638, grok/trunk/src/grok/tests/test_adapter.py)
===================================================================
--- grok/trunk/src/grok/tests/test_adapter.py	2006-10-15 12:07:27 UTC (rev 70638)
+++ grok/trunk/src/grok/tests/test_grok.py	2006-10-15 12:20:21 UTC (rev 70639)
@@ -0,0 +1,33 @@
+import unittest
+from pkg_resources import resource_listdir
+from zope.testing import doctest, cleanup
+
+def tearDown(test):
+    cleanup.cleanUp()
+
+def grokTestSuite(pkg):
+    return doctest.DocTestSuite(pkg, tearDown=tearDown,
+                                optionflags=doctest.ELLIPSIS)
+
+def suiteFromPackage(name):
+    files = resource_listdir(__name__, name)
+    suite = unittest.TestSuite()
+    for filename in files:
+        if not filename.endswith('.py'):
+            continue
+        if filename.endswith('_fixture.py'):
+            continue
+        if filename == '__init__.py':
+            continue
+        dottedname = 'grok.tests.%s.%s' % (name, filename[:-3])
+        suite.addTest(grokTestSuite(dottedname))
+    return suite
+
+def test_suite():
+    suite = unittest.TestSuite()
+    for name in ['adapter']:
+        suite.addTest(suiteFromPackage(name))
+    return suite
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')