[Checkins] SVN: grok/branches/philikon-grokking-tests/src/grok/tests/test_grok.py Use the test grokking functionality. Lots of code gets removed, woohoo!

[Philipp von Weitershausen]

Log message for revision 73821:
  Use the test grokking functionality.  Lots of code gets removed, woohoo!
  

Changed:
  U   grok/branches/philikon-grokking-tests/src/grok/tests/test_grok.py

-=-
Modified: grok/branches/philikon-grokking-tests/src/grok/tests/test_grok.py
===================================================================
--- grok/branches/philikon-grokking-tests/src/grok/tests/test_grok.py	2007-03-28 08:16:23 UTC (rev 73820)
+++ grok/branches/philikon-grokking-tests/src/grok/tests/test_grok.py	2007-03-28 08:17:53 UTC (rev 73821)
@@ -1,7 +1,7 @@
 import unittest
-from pkg_resources import resource_listdir
-from zope.testing import doctest, cleanup
 import zope.component.eventtesting
+from zope.testing import doctest, cleanup
+from grok.testing import grok_tests
 
 def setUpZope(test):
     zope.component.eventtesting.setUp(test)
@@ -9,35 +9,14 @@
 def cleanUpZope(test):
     cleanup.cleanUp()
 
-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])
-        test = doctest.DocTestSuite(dottedname,
-                                    setUp=setUpZope,
-                                    tearDown=cleanUpZope,
-                                    optionflags=doctest.ELLIPSIS+
-                                    doctest.NORMALIZE_WHITESPACE)
-
-        suite.addTest(test)
-    return suite
-
 def test_suite():
-    suite = unittest.TestSuite()
-    for name in ['adapter', 'error', 'view', 'scan', 'event', 'security',
-                 'zcml', 'static', 'utility', 'xmlrpc', 'container',
-                 'traversal', 'form', 'site', 'grokker', 'directive', 'util',
-                 'baseclass', 'annotation', 'application']:
-        suite.addTest(suiteFromPackage(name))
-    return suite
+    tests = grok_tests('grok.tests',
+                       ignore=['.*_fixture$'],
+                       setUp=setUpZope,
+                       tearDown=cleanUpZope,
+                       optionflags=doctest.ELLIPSIS+
+                       doctest.NORMALIZE_WHITESPACE)
+    return unittest.TestSuite(tests)
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')