[Checkins] SVN: z3c.formui/trunk/ Fix tests to work with latest z3c.form and zope.testing

[Gediminas Paulauskas]

Log message for revision 124002:
  Fix tests to work with latest z3c.form and zope.testing
  

Changed:
  U   z3c.formui/trunk/CHANGES.txt
  U   z3c.formui/trunk/setup.py
  U   z3c.formui/trunk/src/z3c/formui/README.txt
  U   z3c.formui/trunk/src/z3c/formui/tests.py

-=-
Modified: z3c.formui/trunk/CHANGES.txt
===================================================================
--- z3c.formui/trunk/CHANGES.txt	2012-01-09 13:41:35 UTC (rev 124001)
+++ z3c.formui/trunk/CHANGES.txt	2012-01-09 19:03:43 UTC (rev 124002)
@@ -5,7 +5,9 @@
 2.2.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- No longer using deprecated ``zope.testing.doctest`` but built-in
+  ``doctest`` instead.
+- Fixed tests so they do not break for `z3c.form` 2.5.0.
 
 
 2.2.0 (2009-12-28)

Modified: z3c.formui/trunk/setup.py
===================================================================
--- z3c.formui/trunk/setup.py	2012-01-09 13:41:35 UTC (rev 124001)
+++ z3c.formui/trunk/setup.py	2012-01-09 19:03:43 UTC (rev 124002)
@@ -54,7 +54,7 @@
     package_dir = {'':'src'},
     namespace_packages = ['z3c'],
     extras_require = dict(
-        test = ['zope.testing', 'z3c.form [test]'],
+        test = ['z3c.form [test]'],
         ),
     install_requires = [
         'setuptools',

Modified: z3c.formui/trunk/src/z3c/formui/README.txt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/README.txt	2012-01-09 13:41:35 UTC (rev 124001)
+++ z3c.formui/trunk/src/z3c/formui/README.txt	2012-01-09 19:03:43 UTC (rev 124002)
@@ -128,11 +128,13 @@
   >>> layout = zope.component.getMultiAdapter((addForm, divRequest),
   ...     ILayoutTemplate)
 
-  >>> from z3c import ptcompat
-  >>> isinstance(layout, ptcompat.ViewPageTemplateFile)
-  True
+  >>> layout.__class__.__name__
+  'ViewPageTemplateFile'
 
+  >>> os.path.basename(layout.filename)
+  'myLayout.pt'
 
+
 DIV-based Layout
 ----------------
 
@@ -335,7 +337,7 @@
   ...         return Person(**data)
 
 
-Let's now instantiate the adding component and isntantiate the add form:
+Let's now instantiate the adding component and the add form:
 
   >>> from zope.app.container.browser.adding import Adding
   >>> rootAdding = Adding(root, divRequest)
@@ -347,8 +349,8 @@
   >>> layout = zope.component.getMultiAdapter(
   ...     (addForm, divRequest), ILayoutTemplate)
 
-  >>> isinstance(layout, ptcompat.ViewPageTemplateFile)
-  True
+  >>> layout.__class__.__name__
+  'ViewPageTemplateFile'
 
 Okay, that worked. Let's now render the div-based addform:
 
@@ -410,8 +412,8 @@
   >>> layout = zope.component.getMultiAdapter((addForm, tableRequest),
   ...     ILayoutTemplate)
 
-  >>> isinstance(layout, ptcompat.ViewPageTemplateFile)
-  True
+  >>> layout.__class__.__name__
+  'ViewPageTemplateFile'
 
 Let's now render the form:
 

Modified: z3c.formui/trunk/src/z3c/formui/tests.py
===================================================================
--- z3c.formui/trunk/src/z3c/formui/tests.py	2012-01-09 13:41:35 UTC (rev 124001)
+++ z3c.formui/trunk/src/z3c/formui/tests.py	2012-01-09 19:03:43 UTC (rev 124002)
@@ -16,7 +16,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.testing import doctest
+import doctest
 import unittest
 import z3c.form.outputchecker
 import z3c.form.testing