[Checkins] SVN: z3c.pagelet/trunk/src/z3c/pagelet/ Test rendering with Chameleon as well as ZPT.

Mon Nov 24 05:15:25 EST 2008

Log message for revision 93295:
  Test rendering with Chameleon as well as ZPT.

Changed:
  U   z3c.pagelet/trunk/src/z3c/pagelet/README.txt
  U   z3c.pagelet/trunk/src/z3c/pagelet/tests.py

-=-
Modified: z3c.pagelet/trunk/src/z3c/pagelet/README.txt
===================================================================

--- z3c.pagelet/trunk/src/z3c/pagelet/README.txt	2008-11-24 10:13:11 UTC (rev 93294)
+++ z3c.pagelet/trunk/src/z3c/pagelet/README.txt	2008-11-24 10:15:25 UTC (rev 93295)
@@ -238,6 +238,8 @@
 
 Now render the form:
 
+  >>> from z3c.pt.compat.testing import render
+  
   >>> addForm = MyAddForm(root, request)
   >>> print addForm()
   <html>

Modified: z3c.pagelet/trunk/src/z3c/pagelet/tests.py
===================================================================
--- z3c.pagelet/trunk/src/z3c/pagelet/tests.py	2008-11-24 10:13:11 UTC (rev 93294)
+++ z3c.pagelet/trunk/src/z3c/pagelet/tests.py	2008-11-24 10:15:25 UTC (rev 93295)
@@ -17,6 +17,7 @@
 __docformat__ = "reStructuredText"
 
 import unittest
+import itertools
 
 import zope.component
 import zope.schema
@@ -31,7 +32,9 @@
 from zope.app.form.interfaces import IInputWidget
 from zope.app.testing import setup
 from zope.formlib import form
+from zope.configuration import xmlconfig
 
+import z3c.pt.compat.testing
 
 def setUp(test):
     root = setup.placefulSetUp(site=True)
@@ -42,11 +45,6 @@
         [None],
         )
 
-    # register provider TALES
-    from zope.app.pagetemplate import metaconfigure
-    from zope.contentprovider import tales
-    metaconfigure.registerType('provider', tales.TALESProviderExpression)
-
     # setup widgets
     zope.component.provideAdapter(zope.app.form.browser.TextWidget,
         [zope.schema.interfaces.ITextLine, IBrowserRequest],
@@ -68,20 +66,37 @@
         )
     zope.component.provideAdapter(form.render_submit_button, name='render')
 
+def setUpZPT(test):
+    z3c.pt.compat.config.disable()
+    setUp(test)
+
+    # register provider TALES
+    from zope.app.pagetemplate import metaconfigure
+    from zope.contentprovider import tales
+    metaconfigure.registerType('provider', tales.TALESProviderExpression)
+
+def setUpZ3CPT(suite):
+    z3c.pt.compat.config.enable()
+    setUp(suite)
+    xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
+
 def tearDown(test):
     setup.placefulTearDown()
 
-
 def test_suite():
-    return unittest.TestSuite((
+    checker = z3c.pt.compat.testing.OutputChecker()
+    
+    tests = ((
         DocFileSuite('README.txt',
             setUp=setUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+            checker=checker,
             ),
         DocFileSuite('zcml.txt', setUp=setUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
-        ))
+        ) for setUp in (setUpZPT, setUpZ3CPT, ))
 
+    return unittest.TestSuite(itertools.chain(*tests))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

