[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests - templateclass.py:1.1.2.1 test_directives.py:1.1.2.3 test_globalbrowsermenuservicedirectives.py:1.1.2.3 test_icondirective.py:1.1.2.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/publisher/browser/tests
In directory cvs.zope.org:/tmp/cvs-serv14607/src/zope/app/publisher/browser/tests

Modified Files:
      Tag: NameGeddon-branch
	test_directives.py test_globalbrowsermenuservicedirectives.py 
	test_icondirective.py 
Added Files:
      Tag: NameGeddon-branch
	templateclass.py 
Log Message:
Got zope.app.publisher passing

=== Added File Zope3/src/zope/app/publisher/browser/tests/templateclass.py ===
class templateclass:
    def data(self): return 42


=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.1.2.2	Tue Dec 24 07:51:12 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py	Tue Dec 24 12:37:57 2002
@@ -18,7 +18,7 @@
 
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.configuration.exceptions import ConfigurationError
-from zope.component.tests.test_views import IC, V1, VZMI, R1, RZMI
+from zope.component.tests.views import IC, V1, VZMI, R1, RZMI
 from zope.component import getView, queryView, queryResource
 from zope.component import getDefaultViewName, getResource
 from zope.app.tests.placelesssetup import PlacelessSetup
@@ -334,7 +334,7 @@
             """
             <browser:view
                   name="test"
-                  factory="zope.app.publisher.browser.tests.testdirectives.VT"
+                  factory="zope.app.publisher.browser.tests.test_directives.VT"
                   for="zope.component.tests.views.IC">
 
                 <browser:page name="index.html" attribute="index" /> 


=== Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservicedirectives.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservicedirectives.py:1.1.2.2	Tue Dec 24 07:51:12 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservicedirectives.py	Tue Dec 24 12:37:57 2002
@@ -50,7 +50,7 @@
             """
             <browser:menu id="test_id" title="test menu" />
 
-            <browser:menuItems menu="test_id" for="Interface.Interface">
+            <browser:menuItems menu="test_id" for="zope.interface.Interface">
               <browser:menuItem action="a1" title="t1" />
             </browser:menuItems>
 


=== Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py:1.1.2.2	Tue Dec 24 07:51:12 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py	Tue Dec 24 12:37:57 2002
@@ -25,7 +25,7 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.component.tests.request import Request
-from zope.component.tests.test_views import IC
+from zope.component.tests.views import IC
 from zope.publisher.interfaces.browser import IBrowserPresentation
 from zope.component import queryView, getView, getResource
 from zope.security.proxy import ProxyFactory
@@ -80,7 +80,7 @@
             )))
 
         view = getView(ob, 'zmi_icon', request)
-        rname = 'Zope-ComponentArchitecture-tests-TestViews-IC-zmi_icon.gif'
+        rname = 'zope-component-tests-views-IC-zmi_icon.gif'
         self.assertEqual(
             view(),
             '<img src="/@@/%s" alt="IC" width="16" height="16" border="0" />'