[Checkins] SVN: grokui.base/trunk/s Tests now use the new zope.app.wsgi changes.
Souheil CHELFOUH
souheil at chelfouh.com
Fri Apr 30 08:59:03 EDT 2010
Log message for revision 111609:
Tests now use the new zope.app.wsgi changes.
Changed:
U grokui.base/trunk/setup.py
U grokui.base/trunk/src/grokui/base/README.txt
A grokui.base/trunk/src/grokui/base/ftesting.zcml
U grokui.base/trunk/src/grokui/base/tests/__init__.py
D grokui.base/trunk/src/grokui/base/tests/ftesting.zcml
U grokui.base/trunk/src/grokui/base/tests/test_layout.py
U grokui.base/trunk/src/grokui/base/tests/test_readme.py
-=-
Modified: grokui.base/trunk/setup.py
===================================================================
--- grokui.base/trunk/setup.py 2010-04-30 06:40:41 UTC (rev 111608)
+++ grokui.base/trunk/setup.py 2010-04-30 12:59:03 UTC (rev 111609)
@@ -3,19 +3,18 @@
tests_require = [
'zope.annotation',
+ 'zope.app.wsgi',
'zope.app.appsetup',
'zope.app.pagetemplate',
'zope.app.publication',
- 'zope.app.testing',
'zope.browserpage',
'zope.browserresource',
'zope.container',
'zope.contentprovider',
'zope.password',
'zope.principalregistry',
+ 'zope.security',
'zope.securitypolicy',
- 'zope.testbrowser',
- 'zope.testing',
]
def read(*rnames):
@@ -66,7 +65,6 @@
'zope.interface',
'zope.location',
'zope.publisher',
- 'zope.security',
'zope.site',
'zope.traversing',
],
Modified: grokui.base/trunk/src/grokui/base/README.txt
===================================================================
--- grokui.base/trunk/src/grokui/base/README.txt 2010-04-30 06:40:41 UTC (rev 111608)
+++ grokui.base/trunk/src/grokui/base/README.txt 2010-04-30 12:59:03 UTC (rev 111609)
@@ -5,9 +5,6 @@
Detailed Description
********************
-.. :doctest:
-.. :layer: grokui.base.tests.FunctionalLayer
-
``grokui.base`` provides tools to assemble a coherent environment.
@@ -56,10 +53,9 @@
Let's create a browser to lookup this view:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
- >>> browser.handleErrors = False
We can get this screen when we ask for the correct namespace:
@@ -73,7 +69,7 @@
>>> browser.open('http://localhost/@@helloadmin')
Traceback (most recent call last):
...
- NotFound: Object: <zope....Folder object at 0x...>, name: u'@@helloadmin'
+ HTTPError: HTTP Error 404: Not Found
GrokUI Pages
Copied: grokui.base/trunk/src/grokui/base/ftesting.zcml (from rev 111608, grokui.base/trunk/src/grokui/base/tests/ftesting.zcml)
===================================================================
--- grokui.base/trunk/src/grokui/base/ftesting.zcml (rev 0)
+++ grokui.base/trunk/src/grokui/base/ftesting.zcml 2010-04-30 12:59:03 UTC (rev 111609)
@@ -0,0 +1,60 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n_domain="grok"
+ package="grokui.base">
+
+ <include package="grokcore.message" file="ftesting.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
+ <include package="zope.principalregistry" file="meta.zcml" />
+ <include package="zope.publisher" file="meta.zcml" />
+ <include package="zope.browserpage" file="meta.zcml" />
+ <include package="zope.app.publication" file="meta.zcml" />
+ <include package="zope.app.pagetemplate" file="meta.zcml" />
+ <include package="grokcore.component" file="meta.zcml" />
+
+ <include package="zope.principalregistry" />
+ <include package="zope.annotation" />
+ <include package="zope.app.appsetup" />
+ <include package="zope.password" />
+ <include package="zope.container" />
+ <include package="zope.traversing" />
+ <include package="zope.contentprovider" />
+ <include package="zope.browserresource" />
+ <include package="zope.traversing.browser" />
+ <include package="zope.app.publication" />
+
+ <include package="grokcore.view" />
+ <include package="grokui.base" />
+
+ <grok:grok package="grokui.base.tests" />
+
+ <browser:defaultView name="index.html" />
+
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
+
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User"
+ />
+
+ <grant
+ permission="zope.View"
+ principal="zope.anybody"
+ />
+
+ <principal
+ id="zope.mgr"
+ title="Manager"
+ login="mgr"
+ password="mgrpw"
+ />
+
+ <role id="zope.Manager" title="Site Manager" />
+ <grantAll role="zope.Manager" />
+ <grant role="zope.Manager" principal="zope.mgr" />
+
+</configure>
Modified: grokui.base/trunk/src/grokui/base/tests/__init__.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/__init__.py 2010-04-30 06:40:41 UTC (rev 111608)
+++ grokui.base/trunk/src/grokui/base/tests/__init__.py 2010-04-30 12:59:03 UTC (rev 111609)
@@ -1,8 +1,2 @@
-import os.path
-from zope.app.testing import functional
+# -*- coding: utf-8 -*-
-ftesting_zcml = os.path.join(
- os.path.dirname(__file__), 'ftesting.zcml')
-
-FunctionalLayer = functional.ZCMLLayer(
- ftesting_zcml, __name__, 'GrokUIBaseFunctionalLayer', allow_teardown=True)
Deleted: grokui.base/trunk/src/grokui/base/tests/ftesting.zcml
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/ftesting.zcml 2010-04-30 06:40:41 UTC (rev 111608)
+++ grokui.base/trunk/src/grokui/base/tests/ftesting.zcml 2010-04-30 12:59:03 UTC (rev 111609)
@@ -1,59 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:grok="http://namespaces.zope.org/grok"
- xmlns:browser="http://namespaces.zope.org/browser"
- i18n_domain="grok"
- package="grokui.base">
-
- <include package="grokcore.message" file="ftesting.zcml" />
-
- <include package="zope.securitypolicy" file="meta.zcml" />
- <include package="zope.principalregistry" file="meta.zcml" />
- <include package="zope.publisher" file="meta.zcml" />
- <include package="zope.browserpage" file="meta.zcml" />
- <include package="zope.app.publication" file="meta.zcml" />
- <include package="zope.app.pagetemplate" file="meta.zcml" />
- <include package="grokcore.component" file="meta.zcml" />
-
- <include package="zope.principalregistry" />
- <include package="zope.annotation" />
- <include package="zope.app.appsetup" />
- <include package="zope.password" />
- <include package="zope.container" />
- <include package="zope.traversing" />
- <include package="zope.contentprovider" />
- <include package="zope.browserresource" />
- <include package="zope.traversing.browser" />
- <include package="zope.app.publication" />
-
- <include package="grokcore.view" />
- <include package="grokui.base" />
-
- <browser:defaultView name="index.html" />
-
- <securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
- />
-
- <unauthenticatedPrincipal
- id="zope.anybody"
- title="Unauthenticated User"
- />
-
- <grant
- permission="zope.View"
- principal="zope.anybody"
- />
-
- <principal
- id="zope.mgr"
- title="Manager"
- login="mgr"
- password="mgrpw"
- />
-
- <role id="zope.Manager" title="Site Manager" />
- <grantAll role="zope.Manager" />
- <grant role="zope.Manager" principal="zope.mgr" />
-
-</configure>
Modified: grokui.base/trunk/src/grokui/base/tests/test_layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_layout.py 2010-04-30 06:40:41 UTC (rev 111608)
+++ grokui.base/trunk/src/grokui/base/tests/test_layout.py 2010-04-30 12:59:03 UTC (rev 111609)
@@ -2,15 +2,9 @@
Building panels using `GrokUIView`
===================================
-:doctest:
-:layer: grokui.base.tests.FunctionalLayer
-
- >>> from grokcore.component import testing
- >>> testing.grok(__file__)
-
We create a browser to watch our views:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
>>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
>>> browser.handleErrors = False
@@ -53,12 +47,12 @@
</html>
"""
-import grokcore.component as grok
+import grokui.base
import unittest
+import doctest
+import grokcore.component as grok
from grokui.base import GrokUIView
-from grokui.base.tests import FunctionalLayer
-from zope.testing import doctest
-from zope.app.testing import functional
+from zope.app.wsgi.testlayer import BrowserLayer
class CaveAdminView(GrokUIView):
@@ -76,8 +70,8 @@
def test_suite():
suite = unittest.TestSuite()
- test = functional.FunctionalDocFileSuite(
+ test = doctest.DocTestSuite(
optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
- test.layer = FunctionalLayer
+ test.layer = BrowserLayer(grokui.base)
suite.addTest(test)
return suite
Modified: grokui.base/trunk/src/grokui/base/tests/test_readme.py
===================================================================
--- grokui.base/trunk/src/grokui/base/tests/test_readme.py 2010-04-30 06:40:41 UTC (rev 111608)
+++ grokui.base/trunk/src/grokui/base/tests/test_readme.py 2010-04-30 12:59:03 UTC (rev 111609)
@@ -1,14 +1,17 @@
# -*- coding: utf-8 -*-
-import unittest
-from zope.app.testing import functional
-from grokui.base.tests import FunctionalLayer
+import unittest, doctest
+import grokui.base
+from zope.app.wsgi.testlayer import BrowserLayer
def test_suite():
suite = unittest.TestSuite()
- readme = functional.FunctionalDocFileSuite('../README.txt')
- readme.layer = FunctionalLayer
+ readme = doctest.DocFileSuite(
+ '../README.txt',
+ optionflags=(doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE|
+ doctest.REPORT_NDIFF))
+ readme.layer = BrowserLayer(grokui.base)
suite.addTest(readme)
return suite
More information about the checkins
mailing list