- Configured test runner to run functional tests.

- Removed ZPKG and ZCML slugs. - Now requires `zope.app.pagetemplate` >= 3.6.0 as `zope.formlib.namedtemplate` has been moved there an there is no longer a BBB import `zope.formlib` >= 4.0 - Fixed tests to run with `zope.app.authentication` >= 3.7.0. - Fixed tests to run with `zope.publisher` >= 3.12.0. - Using python's `doctest` module instead of deprecated `zope.testing.doctestunit`.
zopefoundation · Jun 25, 2010 · d6d0b58 · d6d0b58
1 parent d47e28c
commit d6d0b58
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 81 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,19 +6,34 @@ CHANGES
 0.2.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Configured test runner to run functional tests.
+
+- Removed ZPKG and ZCML slugs.
+
+- Now requires `zope.app.pagetemplate` >= 3.6.0 as
+  `zope.formlib.namedtemplate` has been moved there an there is no
+  longer a BBB import  `zope.formlib` >= 4.0
+
+- Fixed tests to run with `zope.app.authentication` >= 3.7.0.
+
+- Fixed tests to run with `zope.publisher` >= 3.12.0.
+
+- Using python's `doctest` module instead of deprecated
+  `zope.testing.doctestunit`.
 
 
 0.2.0 (2010-06-25)
 ------------------
 
 - adjust zope.app.session to zope.session in ftesting.zcml
 
-- adjust zope.app.securitypolicy to zope.securitpolicy in ftesting.zcml
+- Adjusted `zope.app.securitypolicy` to `zope.securitpolicy` in ftesting.zcml.
+
+- Fixed tests after zope packages refactoring. Updated imports and
+  dependencies.
 
-- fix test after zope packages refactoring. Update imports and dependencies.
 
 0.1.0 (2008-02-14)
 ------------------
 
-- Initial Release
+- Initial release.
diff --git a/buildout.cfg b/buildout.cfg
@@ -1,10 +1,12 @@
 [buildout]
 develop = .
-parts = test
+parts = test coverage
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3c.sampledata [test]
+defaults = ['--tests-pattern', '^f?tests$']
 
-
-
+[coverage]
+recipe = zc.recipe.egg
+eggs = tha.coverage
diff --git a/setup.py b/setup.py
@@ -57,6 +57,8 @@ def read(*rnames):
     extras_require = dict(
         test = [
             'zope.app.testing',
+            'zope.app.security',
+            'zope.app.zcmlfiles',
             ],
         ),
     install_requires = [
@@ -68,6 +70,9 @@ def read(*rnames):
         'zope.intid',
         'zope.schema',
         'zope.site',
+        'zope.viewlet',
+        'zope.app.pagetemplate>=3.6.0',
+        'zope.app.authentication>=3.7.0',
         ],
     zip_safe = False,
 )
diff --git a/src/z3c/sampledata/SETUP.cfg b/src/z3c/sampledata/SETUP.cfg
diff --git a/src/z3c/sampledata/browser/views.py b/src/z3c/sampledata/browser/views.py
@@ -1,14 +1,12 @@
+from z3c.sampledata import _
+from z3c.sampledata.interfaces import ISampleDataPlugin, ISampleManager
 from zope import component
 from zope import interface
 from zope import schema
-
-from zope import formlib
-from zope.formlib import form
 from zope.app.pagetemplate import ViewPageTemplateFile
-
-from z3c.sampledata.interfaces import ISampleDataPlugin, ISampleManager
-
-from z3c.sampledata import _
+import zope.formlib.form
+import zope.app.pagetemplate.namedtemplate
+import zope.formlib.interfaces
 
 
 class Managers(object):
@@ -42,10 +40,10 @@ class IGenerateSchema(interface.Interface):
             )
 
 
-class Generate(form.EditForm):
+class Generate(zope.formlib.form.EditForm):
     """Edit all generator parameters for a given manager"""
 
-    base_template = form.EditForm.template
+    base_template = zope.formlib.form.EditForm.template
     template = ViewPageTemplateFile('generate.pt')
 
     workDone = False
@@ -54,13 +52,13 @@ def setUpWidgets(self, ignore_request=False):
         managerName = self.request['manager']
         manager = component.getUtility(ISampleManager, name=managerName)
         plugins = manager.orderedPlugins()
-        self.form_fields = form.Fields()
+        self.form_fields = zope.formlib.form.Fields()
         self.subforms = []
         subform = Generator(context=self.context,
                             request=self.request,
                             schema=IGenerateSchema,
                             prefix='generator')
-        subform.form_fields = form.Fields(IGenerateSchema)
+        subform.form_fields = zope.formlib.form.Fields(IGenerateSchema)
         self.subforms.append(subform)
         for plugin in plugins:
             if plugin.generator.schema is None:
@@ -69,21 +67,21 @@ def setUpWidgets(self, ignore_request=False):
                                 request=self.request,
                                 plugin=plugin.generator,
                                 prefix=plugin.name)
-            subform.form_fields = form.Fields(plugin.generator.schema)
+            subform.form_fields = zope.formlib.form.Fields(
+                plugin.generator.schema)
             self.subforms.append(subform)
         super(Generate, self).setUpWidgets(ignore_request=ignore_request)
 
-    @form.action(_("Generate"))
+    @zope.formlib.form.action(_("Generate"))
     def handle_generate_action(self, action, data):
         managerName = self.request['manager']
         manager = component.getUtility(ISampleManager, name=managerName)
         generatorData = {}
         for subform in self.subforms:
             subform.update()
             formData = {}
-            errors = form.getWidgetsData(subform.widgets,
-                                         subform.prefix,
-                                         formData)
+            errors = zope.formlib.form.getWidgetsData(
+                subform.widgets, subform.prefix, formData)
             generatorData[subform.prefix] = formData
         gen = generatorData.get('generator', {})
         seed = gen.get('seed', None)
@@ -97,11 +95,11 @@ def manager(self):
         return self.request['manager']
 
 
-class Generator(form.AddForm):
+class Generator(zope.formlib.form.AddForm):
     """An editor for a single generator"""
-    interface.implements(formlib.interfaces.ISubPageForm)
+    interface.implements(zope.formlib.interfaces.ISubPageForm)
 
-    template = formlib.namedtemplate.NamedTemplate('default')
+    template = zope.app.pagetemplate.namedtemplate.NamedTemplate('default')
 
     actions = []
 

diff --git a/src/z3c/sampledata/ftesting.zcml b/src/z3c/sampledata/ftesting.zcml
@@ -2,25 +2,26 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="zope">
- 
-  <include package="zope.app" />
+
+  <include package="zope.app.zcmlfiles" />
 
   <include package="zope.viewlet" file="meta.zcml"/>
   <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="z3c.sampledata" file="meta.zcml" />
-
-  <include package="zope.app.server" />
-  <include package="zope.app.authentication" />
+
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-  <include package="zope.securitypolicy" />
-
+
   <include package="zope.session" />
   <include package="zope.contentprovider"/>
   <include package="zope.viewlet"/>
   <include package="zope.formlib"/>
   <include package="z3c.sampledata"/>
-
+
+  <include package="zope.login"/>
+  <include package="zope.password"/>
+
+
   <role
       id="zope.Anonymous" title="Everybody"
       description="All users have this role implicitly"

diff --git a/src/z3c/sampledata/ftests.py b/src/z3c/sampledata/ftests.py
@@ -23,7 +23,7 @@ def principalDataFactory(object):
              {'login':'srichter', 'password':'rethcirs'}]
 
 
-
+# XXX This setup seems to be not necessary as tests run fine without it.
 def setUp(test):
     site = functional.getRootFolder()
     sm = site.getSiteManager()
@@ -59,6 +59,3 @@ def test_suite():
         s.layer=TestLayer
         suite.addTest(s)
     return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
diff --git a/src/z3c/sampledata/generator/pau.txt b/src/z3c/sampledata/generator/pau.txt
@@ -32,11 +32,11 @@ Now that everything is set up we can generate the intids utility-
 
   >>> site = root['test']
   >>> generator.generate(site)
-  <zope.app.authentication.authentication.PluggableAuthentication object at ...>
+  <zope.pluggableauth.authentication.PluggableAuthentication object at ...>
   >>> 'pau' in site.getSiteManager()['default']
   True
   >>> from zope import component
   >>> from zope.app.security.interfaces import IAuthentication
   >>> component.getUtility(IAuthentication)
-  <zope.app.authentication.authentication.PluggableAuthentication object at ...>
+  <zope.pluggableauth.authentication.PluggableAuthentication object at ...>
 
diff --git a/src/z3c/sampledata/tests.py b/src/z3c/sampledata/tests.py
@@ -19,7 +19,6 @@
 
 import doctest
 import unittest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing.setup import placefulSetUp, placefulTearDown
 
 
@@ -34,28 +33,29 @@ def tearDown(test):
 
 def test_suite():
 
-    return unittest.TestSuite(
-        (
-        DocFileSuite('README.txt',
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        DocFileSuite('generator/site.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        DocFileSuite('generator/intids.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        DocFileSuite('generator/pau.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        DocFileSuite('generator/principals.txt',
-                     setUp=setUp, tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                     ),
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
+    return unittest.TestSuite((
+        doctest.DocFileSuite(
+                'README.txt',
+                optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+                ),
+        doctest.DocFileSuite(
+                'generator/site.txt',
+                setUp=setUp, tearDown=tearDown,
+                optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+                ),
+        doctest.DocFileSuite(
+                'generator/intids.txt',
+                setUp=setUp, tearDown=tearDown,
+                optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+                ),
+        doctest.DocFileSuite(
+                'generator/pau.txt',
+                setUp=setUp, tearDown=tearDown,
+                optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+                ),
+        doctest.DocFileSuite(
+                'generator/principals.txt',
+                setUp=setUp, tearDown=tearDown,
+                optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+                ),
+            ))
diff --git a/src/z3c/sampledata/z3c.sampledata-configure.zcml b/src/z3c/sampledata/z3c.sampledata-configure.zcml
diff --git a/src/z3c/sampledata/z3c.sampledata-meta.zcml b/src/z3c/sampledata/z3c.sampledata-meta.zcml