[Checkins] SVN: z3c.unconfigure/trunk/src/z3c/unconfigure/test Move test fixtures over to testing.py

[Philipp von Weitershausen]

Log message for revision 89443:
  Move test fixtures over to testing.py
  

Changed:
  U   z3c.unconfigure/trunk/src/z3c/unconfigure/testing.py
  U   z3c.unconfigure/trunk/src/z3c/unconfigure/tests.py

-=-
Modified: z3c.unconfigure/trunk/src/z3c/unconfigure/testing.py
===================================================================
--- z3c.unconfigure/trunk/src/z3c/unconfigure/testing.py	2008-08-06 15:30:29 UTC (rev 89442)
+++ z3c.unconfigure/trunk/src/z3c/unconfigure/testing.py	2008-08-06 15:33:38 UTC (rev 89443)
@@ -13,8 +13,15 @@
 ##############################################################################
 """Test fixtures
 """
+import os
+import zope.testing.cleanup
 from zope.interface import Interface
 from zope.schema import Text, TextLine
+from zope.testing import doctest
+from zope.configuration import config
+from zope.configuration import xmlconfig
+from zope.configuration import zopeconfigure
+from z3c.unconfigure.config import Unconfigure
 
 class IPrint(Interface):
     msg = Text(title=u'Message')
@@ -40,3 +47,42 @@
         callable=do_print,
         args=(who + ' can has ' + canhas + '?',),
         )
+
+def tearDown(test):
+    zope.testing.cleanup.cleanUp()
+
+def zcml(source):
+    context = config.ConfigurationMachine()
+    xmlconfig.registerCommonDirectives(context)
+    config.defineGroupingDirective(context,
+                                   name='unconfigure',
+                                   namespace="*",
+                                   schema=zopeconfigure.IZopeConfigure,
+                                   handler=Unconfigure)
+
+    # Test directives
+    config.defineSimpleDirective(
+        context, "print", IPrint, print_, namespace="*")
+    config.defineSimpleDirective(
+        context, "lolcat", ILolCat, lolcat, namespace="*")
+
+    source = '''\
+<configure package="z3c.unconfigure.testfixtures">
+%s
+</configure>''' % source
+
+    xmlconfig.string(source, context)
+
+def cat(filename):
+    here = os.path.dirname(__file__)
+    filename = os.path.join(here, 'testfixtures', filename)
+    print open(filename).read()
+
+def DocFileSuite(filename):
+    return doctest.DocFileSuite(filename,
+                                package='z3c.unconfigure',
+                                globs={'zcml': zcml,
+                                       'cat': cat},
+                                tearDown=tearDown,
+                                optionflags=doctest.NORMALIZE_WHITESPACE,
+                                )

Modified: z3c.unconfigure/trunk/src/z3c/unconfigure/tests.py
===================================================================
--- z3c.unconfigure/trunk/src/z3c/unconfigure/tests.py	2008-08-06 15:30:29 UTC (rev 89442)
+++ z3c.unconfigure/trunk/src/z3c/unconfigure/tests.py	2008-08-06 15:33:38 UTC (rev 89443)
@@ -13,56 +13,9 @@
 ##############################################################################
 """Tests
 """
-import os
 import unittest
-import zope.testing.cleanup
-from zope.testing import doctest
-from zope.configuration import config
-from zope.configuration import xmlconfig
-from zope.configuration import zopeconfigure
-from z3c.unconfigure.config import Unconfigure
-from z3c.unconfigure import testing
+from z3c.unconfigure.testing import DocFileSuite    
 
-def tearDown(test):
-    zope.testing.cleanup.cleanUp()
-
-def zcml(source):
-    context = config.ConfigurationMachine()
-    xmlconfig.registerCommonDirectives(context)
-    config.defineGroupingDirective(context,
-                                   name='unconfigure',
-                                   namespace="*",
-                                   schema=zopeconfigure.IZopeConfigure,
-                                   handler=Unconfigure)
-
-    # Test directives
-    config.defineSimpleDirective(
-        context, "print", testing.IPrint, testing.print_, namespace="*")
-    config.defineSimpleDirective(
-        context, "lolcat", testing.ILolCat, testing.lolcat, namespace="*")
-
-    source = '''\
-<configure package="z3c.unconfigure.testfixtures">
-%s
-</configure>''' % source
-
-    xmlconfig.string(source, context)
-
-def cat(filename):
-    here = os.path.dirname(__file__)
-    filename = os.path.join(here, 'testfixtures', filename)
-    print open(filename).read()
-
-def DocFileSuite(filename):
-    return doctest.DocFileSuite(filename,
-                                package='z3c.unconfigure',
-                                globs={'zcml': zcml,
-                                       'cat': cat},
-                                tearDown=tearDown,
-                                optionflags=doctest.NORMALIZE_WHITESPACE,
-                                )
-    
-
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(DocFileSuite('README.txt'))