[Checkins] SVN: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg Rename browser sample fixture package from 'mypkg' to 'mypkg3'
Uli Fouquet
uli at gnufix.de
Wed Mar 2 17:21:52 EST 2011
Log message for revision 120712:
Rename browser sample fixture package from 'mypkg' to 'mypkg3'
Changed:
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/__init__.py
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/browser.py
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/configure.zcml
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/interfaces.py
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/browser.py
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_browser.py
D zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py
A zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py
-=-
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py 2011-03-02 22:16:28 UTC (rev 120711)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,11 +0,0 @@
-from zope.interface import implements
-from mypkg3.interfaces import ISampleApp, IFoo
-
-class SampleApp(object):
- implements(ISampleApp)
-
-class FooUtility(object):
- implements(IFoo)
-
- def do_foo(self):
- return "Foo!"
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/browser.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/browser.py 2011-03-02 22:16:28 UTC (rev 120711)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/browser.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,7 +0,0 @@
-from zope.publisher.browser import BrowserPage
-
-class SampleAppView(BrowserPage):
-
- def __call__(self):
- self.request.response.setHeader('Content-Type', 'text/plain')
- return u'Hello from SampleAppView!'
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/configure.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/configure.zcml 2011-03-02 22:16:28 UTC (rev 120711)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/configure.zcml 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,34 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- >
-
- <!-- Basic configuration. -->
- <include package="zope.component" file="meta.zcml" />
- <include package="zope.component" />
-
- <!-- Those next ZCML includes are required by zope.app.appsetup. -->
- <include package="zope.security" file="meta.zcml" />
- <include package="zope.security" />
-
- <include package="zope.location" />
- <include package="zope.traversing" />
- <include package="zope.container" />
- <include package="zope.site" />
-
- <include package="zope.app.appsetup" />
-
- <utility
- component=".app.FooUtility"
- provides=".interfaces.IFoo"
- name="foo utility"
- />
-
- <browser:page
- for=".interfaces.ISampleApp"
- name="index.html"
- class=".browser.SampleAppView"
- permission="zope.View"
- />
-
-</configure>
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml 2011-03-02 22:16:28 UTC (rev 120711)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,45 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- package="mypkg3"
- >
-
- <!-- This file is the equivalent of site.zcml and it is -->
- <!-- used for functional testing setup -->
- <include package="zope.component" file="meta.zcml" />
- <include package="zope.security" 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.securitypolicy" file="meta.zcml" />
-
- <include package="zope.app.wsgi" />
- <include package="zope.app.zcmlfiles" />
-
- <include package="mypkg3" file="configure.zcml" />
-
- <securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
- <role id="zope.Manager" title="Site Manager" />
-
- <grantAll role="zope.Manager" />
-
- <!-- Principals -->
- <unauthenticatedPrincipal
- id="zope.anybody"
- title="Unauthenticated User" />
- <grant
- permission="zope.View"
- principal="zope.anybody" />
-
- <!-- Principal that tests generally run as -->
- <principal
- id="zope.mgr"
- title="Manager"
- login="mgr"
- password="mgrpw" />
-
- <grant role="zope.Manager" principal="zope.mgr" />
-
-</configure>
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/interfaces.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/interfaces.py 2011-03-02 22:16:28 UTC (rev 120711)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/interfaces.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,16 +0,0 @@
-import zope.interface
-
-class ISampleApp(zope.interface.Interface):
- """A sample application.
- """
- pass
-
-class IFoo(zope.interface.Interface):
- """A Foo.
-
- Foos can do foo.
- """
- def do_foo():
- """Do the foo.
- """
- pass
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py 2011-01-23 12:10:55 UTC (rev 119855)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,11 +0,0 @@
-from zope.interface import implements
-from mypkg.interfaces import ISampleApp, IFoo
-
-class SampleApp(object):
- implements(ISampleApp)
-
-class FooUtility(object):
- implements(IFoo)
-
- def do_foo(self):
- return "Foo!"
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py (from rev 120711, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/app.py)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/app.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,11 @@
+from zope.interface import implements
+from mypkg3.interfaces import ISampleApp, IFoo
+
+class SampleApp(object):
+ implements(ISampleApp)
+
+class FooUtility(object):
+ implements(IFoo)
+
+ def do_foo(self):
+ return "Foo!"
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/browser.py (from rev 119857, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/browser.py)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/browser.py (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/browser.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,7 @@
+from zope.publisher.browser import BrowserPage
+
+class SampleAppView(BrowserPage):
+
+ def __call__(self):
+ self.request.response.setHeader('Content-Type', 'text/plain')
+ return u'Hello from SampleAppView!'
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/configure.zcml 2011-01-23 12:10:55 UTC (rev 119855)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,10 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- >
-
- <include package="zope.component" file="meta.zcml" />
- <utility component=".app.FooUtility"
- provides=".interfaces.IFoo"
- name="foo utility" />
-
-</configure>
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml (from rev 119857, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/configure.zcml)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/configure.zcml 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,34 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ >
+
+ <!-- Basic configuration. -->
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.component" />
+
+ <!-- Those next ZCML includes are required by zope.app.appsetup. -->
+ <include package="zope.security" file="meta.zcml" />
+ <include package="zope.security" />
+
+ <include package="zope.location" />
+ <include package="zope.traversing" />
+ <include package="zope.container" />
+ <include package="zope.site" />
+
+ <include package="zope.app.appsetup" />
+
+ <utility
+ component=".app.FooUtility"
+ provides=".interfaces.IFoo"
+ name="foo utility"
+ />
+
+ <browser:page
+ for=".interfaces.ISampleApp"
+ name="index.html"
+ class=".browser.SampleAppView"
+ permission="zope.View"
+ />
+
+</configure>
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml 2011-01-23 12:10:55 UTC (rev 119855)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,8 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- package="mypkg"
- >
-
- <include package="mypkg" file="configure.zcml" />
-
-</configure>
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml (from rev 120711, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/ftesting.zcml)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/ftesting.zcml 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,45 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ package="mypkg3"
+ >
+
+ <!-- This file is the equivalent of site.zcml and it is -->
+ <!-- used for functional testing setup -->
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.security" 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.securitypolicy" file="meta.zcml" />
+
+ <include package="zope.app.wsgi" />
+ <include package="zope.app.zcmlfiles" />
+
+ <include package="mypkg3" file="configure.zcml" />
+
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
+ <role id="zope.Manager" title="Site Manager" />
+
+ <grantAll role="zope.Manager" />
+
+ <!-- Principals -->
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User" />
+ <grant
+ permission="zope.View"
+ principal="zope.anybody" />
+
+ <!-- Principal that tests generally run as -->
+ <principal
+ id="zope.mgr"
+ title="Manager"
+ login="mgr"
+ password="mgrpw" />
+
+ <grant role="zope.Manager" principal="zope.mgr" />
+
+</configure>
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_app.py 2011-01-23 12:10:55 UTC (rev 119855)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,16 +0,0 @@
-from zope.interface.verify import verifyClass, verifyObject
-from mypkg.app import SampleApp
-from mypkg.interfaces import ISampleApp
-
-def test_app_create():
- # Assure we can create instances of `SampleApp`
- app = SampleApp()
- assert app is not None
-
-def test_app_class_iface():
- # Assure the class implements the declared interface
- assert verifyClass(ISampleApp, SampleApp)
-
-def test_app_instance_iface():
- # Assure instances of the class provide the declared interface
- assert verifyObject(ISampleApp, SampleApp())
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py (from rev 120711, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_app.py)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_app.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,16 @@
+from zope.interface.verify import verifyClass, verifyObject
+from mypkg3.app import SampleApp
+from mypkg3.interfaces import ISampleApp
+
+def test_app_create():
+ # Assure we can create instances of `SampleApp`
+ app = SampleApp()
+ assert app is not None
+
+def test_app_class_iface():
+ # Assure the class implements the declared interface
+ assert verifyClass(ISampleApp, SampleApp)
+
+def test_app_instance_iface():
+ # Assure instances of the class provide the declared interface
+ assert verifyObject(ISampleApp, SampleApp())
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_browser.py (from rev 120711, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_browser.py)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_browser.py (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_browser.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,39 @@
+import pytest
+import mypkg3
+from webob import Request
+from zope.component import getMultiAdapter
+from zope.publisher.browser import TestRequest
+from zope.pytest import configure, create_app
+from mypkg3.app import SampleApp
+
+
+def pytest_funcarg__apps(request):
+ app = SampleApp()
+ return app, create_app(request, app)
+
+def pytest_funcarg__config(request):
+ return configure(request, mypkg3, 'ftesting.zcml')
+
+def test_view_sampleapp(config, apps):
+ zope_app, wsgi_app = apps
+ view = getMultiAdapter(
+ (zope_app, TestRequest()), name="index.html")
+ rendered_view = view()
+ assert view() == u'Hello from SampleAppView!'
+
+def test_browser(config, apps):
+ zope_app, wsgi_app = apps
+ http_request = Request.blank('http://localhost/test/index.html')
+ response = http_request.get_response(wsgi_app)
+ assert response.body == 'Hello from SampleAppView!'
+ assert response.status == "200 Ok"
+
+ at pytest.mark.xfail("sys.version_info < (2,6)")
+def test_infrae_browser(config, apps):
+ # Late import. This import will fail with Python < 2.6
+ from infrae.testbrowser.browser import Browser
+ zope_app, wsgi_app = apps
+ browser = Browser(wsgi_app)
+ browser.open('http://localhost/test/index.html')
+ assert browser.contents == 'Hello from SampleAppView!'
+ assert browser.status == '200 Ok'
Deleted: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_foo.py 2011-01-23 12:10:55 UTC (rev 119855)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -1,15 +0,0 @@
-import mypkg
-from zope.component import queryUtility
-from mypkg.interfaces import IFoo
-from zope.pytest import configure
-
-def pytest_funcarg__config(request):
- return configure(request, mypkg, 'ftesting.zcml')
-
-def test_get_utility(config):
- util = queryUtility(IFoo, name='foo utility', default=None)
- assert util is not None
-
-def test_dofoo_utility(config):
- util = queryUtility(IFoo, name='foo utility', default=None)
- assert util().do_foo() == 'Foo!'
Copied: zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py (from rev 120711, zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg/tests/test_foo.py)
===================================================================
--- zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py (rev 0)
+++ zope.pytest/trunk/src/zope/pytest/tests/sample_fixtures/browser/mypkg3/tests/test_foo.py 2011-03-02 22:21:51 UTC (rev 120712)
@@ -0,0 +1,15 @@
+import mypkg3
+from zope.component import queryUtility
+from mypkg3.interfaces import IFoo
+from zope.pytest import configure
+
+def pytest_funcarg__config(request):
+ return configure(request, mypkg3, 'ftesting.zcml')
+
+def test_get_utility(config):
+ util = queryUtility(IFoo, name='foo utility', default=None)
+ assert util is not None
+
+def test_dofoo_utility(config):
+ util = queryUtility(IFoo, name='foo utility', default=None)
+ assert util().do_foo() == 'Foo!'
More information about the checkins
mailing list