[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests -
test_directives.py:1.28 test_icondirective.py:1.16
Jim Fulton
jim at zope.com
Wed Dec 17 05:07:13 EST 2003
Update of /cvs-repository/Zope3/src/zope/app/publisher/browser/tests
In directory cvs.zope.org:/tmp/cvs-serv32387/src/zope/app/publisher/browser/tests
Modified Files:
test_directives.py test_icondirective.py
Log Message:
Moved the test views module from zope.component.tests, where it is no
longer used, to zope.app.components.tests.
=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.27 => 1.28 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.27 Sun Dec 7 05:04:53 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py Wed Dec 17 05:06:42 2003
@@ -20,7 +20,7 @@
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
from zope.configuration.exceptions import ConfigurationError
-from zope.component.tests.views import IC, V1, VZMI
+from zope.app.component.tests.views import IC, V1, VZMI
from zope.component import getView, queryView, queryResource
from zope.component import getDefaultViewName, getResource
from zope.app.services.servicenames import Permissions
@@ -115,8 +115,8 @@
xmlconfig(StringIO(template % (
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
attribute="index"
/>
@@ -136,8 +136,8 @@
"""
<browser:menu id="test_menu" title="Test menu" usage="objectview"/>
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
template="%s"
menu="test_menu"
@@ -162,8 +162,8 @@
xmlconfig(StringIO(template % (
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
template="%s"
usage="objectview"
@@ -184,8 +184,8 @@
"""
<browser:menu id="test_menu" title="Test menu" usage="overridden"/>
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
template="%s"
menu="test_menu"
@@ -212,7 +212,7 @@
"""
<browser:menu id="test_menu" title="Test menu" usage="objectview"/>
<browser:page name="test"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
template="%s"
menu="test_menu"
@@ -237,7 +237,7 @@
xmlconfig(StringIO(template % (
"""
<browser:page name="test"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
template="%s"
usage="objectview"
@@ -258,7 +258,7 @@
"""
<browser:menu id="test_menu" title="Test menu" usage="overridden"/>
<browser:page name="test"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
template="%s"
menu="test_menu"
@@ -284,7 +284,7 @@
xmlconfig(StringIO(template % (
"""
<browser:menu id="test_menu" title="Test menu" usage="objectview"/>
- <browser:pages for="zope.component.tests.views.IC"
+ <browser:pages for="zope.app.component.tests.views.IC"
permission="zope.Public">
<browser:page name="test"
template="%s"
@@ -311,8 +311,8 @@
xmlconfig(StringIO(template % (
"""
<browser:menu id="test_menu" title="Test menu" usage="objectview"/>
- <browser:pages for="zope.component.tests.views.IC"
- class="zope.component.tests.views.V1"
+ <browser:pages for="zope.app.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
permission="zope.Public">
<browser:page name="test"
template="%s"
@@ -337,7 +337,7 @@
xmlconfig(StringIO(template % (
"""
<browser:defaultView name="test"
- for="zope.component.tests.views.IC" />
+ for="zope.app.component.tests.views.IC" />
"""
)))
@@ -354,15 +354,15 @@
<browser:layer name="zmi" />
<browser:skin name="zmi" layers="zmi default" />
<browser:page name="test"
- class="zope.component.tests.views.VZMI"
+ class="zope.app.component.tests.views.VZMI"
layer="zmi"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
attribute="index"
/>
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
attribute="index"
/>
@@ -424,11 +424,11 @@
xmlconfig(StringIO(template %
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
+ class="zope.app.component.tests.views.V1"
attribute="index"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
- allowed_interface="zope.component.tests.views.IV"
+ allowed_interface="zope.app.component.tests.views.IV"
/>
"""
))
@@ -442,8 +442,8 @@
xmlconfig(StringIO(template %
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
attribute="action"
permission="zope.Public"
allowed_attributes="action"
@@ -460,12 +460,12 @@
xmlconfig(StringIO(template %
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
attribute="index"
allowed_attributes="action"
- allowed_interface="zope.component.tests.views.IV"
+ allowed_interface="zope.app.component.tests.views.IV"
/>
"""
))
@@ -478,12 +478,12 @@
xmlconfig(StringIO(template %
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
attribute="index"
permission="zope.Public"
allowed_attributes="action index"
- allowed_interface="zope.component.tests.views.IV"
+ allowed_interface="zope.app.component.tests.views.IV"
/>
"""
))
@@ -499,7 +499,7 @@
name="test"
class="
zope.app.publisher.browser.tests.test_directives.C_w_implements"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
attribute="index"
permission="zope.Public"
/>
@@ -517,8 +517,8 @@
StringIO(template %
"""
<browser:page name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
attribute="index"
allowed_attributes="action index"
/>
@@ -533,8 +533,8 @@
xmlconfig(StringIO(template %
"""
<browser:pages
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
>
@@ -560,7 +560,7 @@
<browser:view
name="test"
class="zope.app.publisher.browser.tests.test_directives.V1"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
>
@@ -591,7 +591,7 @@
<browser:view
name="test"
class="zope.app.publisher.browser.tests.test_directives.CV"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
/>
"""
@@ -609,7 +609,7 @@
<browser:view
name="test"
class="zope.app.publisher.browser.tests.test_directives.NCV"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
/>
"""
@@ -627,8 +627,8 @@
"""
<browser:view
name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
>
@@ -662,8 +662,8 @@
"""
<browser:view
name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
>
@@ -712,8 +712,8 @@
<permission id="zope.TestPermission" title="Test permission" />
<browser:pages
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.TestPermission"
>
@@ -747,8 +747,8 @@
<browser:view
name="test"
- class="zope.component.tests.views.V1"
- for="zope.component.tests.views.IC"
+ class="zope.app.component.tests.views.V1"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
>
@@ -778,7 +778,7 @@
<browser:skin name="skinny" layers="layer default" />
<browser:pages
for="*"
- class="zope.component.tests.views.V1"
+ class="zope.app.component.tests.views.V1"
permission="zope.Public"
>
@@ -786,7 +786,7 @@
</browser:pages>
<browser:pages
for="*"
- class="zope.component.tests.views.V1"
+ class="zope.app.component.tests.views.V1"
layer="layer"
permission="zope.Public"
>
@@ -862,7 +862,7 @@
name="index.html"
template="%s"
permission="zope.Public"
- for="zope.component.tests.views.IC" />
+ for="zope.app.component.tests.views.IC" />
""" % path
))
@@ -882,7 +882,7 @@
template="%s"
permission="zope.Public"
class="zope.app.publisher.browser.tests.templateclass.templateclass"
- for="zope.component.tests.views.IC" />
+ for="zope.app.component.tests.views.IC" />
""" % path
))
@@ -914,7 +914,7 @@
name="xxx.html"
template="%s"
permission="zope.TestPermission"
- for="zope.component.tests.views.IC" />
+ for="zope.app.component.tests.views.IC" />
""" % path
))
@@ -924,7 +924,7 @@
name="index.html"
template="%s"
permission="zope.Public"
- for="zope.component.tests.views.IC" />
+ for="zope.app.component.tests.views.IC" />
""" % path
))
@@ -951,7 +951,7 @@
"""
<browser:page
template="%s"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
/>
""" % path
))
@@ -966,7 +966,7 @@
<browser:view
name="index.html"
template="%s"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
permission="zope.Public"
>
<browser:page name="foo.html" attribute="index" />
=== Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py:1.15 Thu Nov 27 08:59:23 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py Wed Dec 17 05:06:42 2003
@@ -25,7 +25,7 @@
from zope.app.tests.placelesssetup import PlacelessSetup
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
from zope.publisher.browser import TestRequest
-from zope.component.tests.views import IC
+from zope.app.component.tests.views import IC
from zope.component import queryView, getView, getResource
from zope.configuration.exceptions import ConfigurationError
from zope.interface import implements
@@ -76,13 +76,13 @@
xmlconfig(StringIO(template % (
"""
<browser:icon name="zmi_icon"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
file="%s" />
""" % path
)))
view = getView(ob, 'zmi_icon', request)
- rname = 'zope-component-tests-views-IC-zmi_icon.gif'
+ rname = 'zope-app-component-tests-views-IC-zmi_icon.gif'
self.assertEqual(
view(),
'<img src="http://127.0.0.1/@@/%s" alt="IC" '
@@ -106,7 +106,7 @@
<browser:resource name="zmi_icon_res"
image="%s" />
<browser:icon name="zmi_icon"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
resource="zmi_icon_res" />
""" % path
)))
@@ -137,7 +137,7 @@
<browser:resource name="zmi_icon_res"
image="%s" />
<browser:icon name="zmi_icon"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
file="%s"
resource="zmi_icon_res" />
""" % (path, path)
@@ -147,7 +147,7 @@
config = StringIO(template % (
"""
<browser:icon name="zmi_icon"
- for="zope.component.tests.views.IC"
+ for="zope.app.component.tests.views.IC"
/>
"""
))
More information about the Zope3-Checkins
mailing list