[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ContentDirective/tests - testDirectives.py:1.5 testFactory.py:1.5

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ContentDirective/tests
In directory cvs.zope.org:/tmp/cvs-serv19918/lib/python/Zope/App/ContentDirective/tests

Modified Files:
	testDirectives.py testFactory.py 
Log Message:

Gary and Jim implemented most of:
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/AddMenuProposalAndEndOfZmiNamespace

A lot of clean up is needed, including:

- Implementation additional add menus, for example for services.

- Ripping out old unused implementation.





=== Zope3/lib/python/Zope/App/ContentDirective/tests/testDirectives.py 1.4 => 1.5 ===
 def configfile(s):
     return StringIO("""<zopeConfigure
-      xmlns='http://namespaces.zope.org/zope'
-      xmlns:zmi='http://namespaces.zope.org/zmi'>
+      xmlns='http://namespaces.zope.org/zope'>
       %s
       </zopeConfigure>
       """ % s)
@@ -111,14 +110,12 @@
 <permission id="Zope.Foo" title="Zope Foo Permission" />
 
 <content class="Zope.App.ContentDirective.tests.ExampleClass.">
-    <zmi:factory 
+    <factory 
       id="Example" 
       permission="Zope.Foo"
       title="Example content"
       description="Example description"
-      for_container="Zope.App.ContentDirective.tests.ExampleClass."
-      creation_markers="Zope.App.ContentDirective.tests.ExampleClass.IExample"
-       />
+    />
 </content>
                        """)
         xmlconfig(f)


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testFactory.py 1.4 => 1.5 ===
 def configfile(s):
     return StringIO("""<zopeConfigure
-      xmlns='http://namespaces.zope.org/zope'
-      xmlns:zmi='http://namespaces.zope.org/zmi'>
+      xmlns='http://namespaces.zope.org/zope'>
       %s
       </zopeConfigure>
       """ % s)
@@ -54,13 +53,11 @@
         f = configfile("""
 <permission id="Zope.Foo" title="Zope Foo Permission" />
 <content class="Zope.App.ContentDirective.tests.ExampleClass.">
-    <zmi:factory 
+    <factory 
       id="Example" 
       permission="Zope.Foo"
       title="Example content"
       description="Example description"
-      for_container="Zope.App.ContentDirective.tests.ExampleClass.IExampleContainer"
-      creation_markers="Zope.App.ContentDirective.tests.ExampleClass.IExample"
        />
 </content>
                        """)
@@ -75,12 +72,10 @@
         f = configfile("""
 <permission id="Zope.Foo" title="Zope Foo Permission" />
 <content class="Zope.App.ContentDirective.tests.ExampleClass.">
-    <zmi:factory 
+    <factory 
       permission="Zope.Foo"
       title="Example content"
       description="Example description"
-      for_container="Zope.App.ContentDirective.tests.ExampleClass.IExampleContainer"
-      creation_markers="Zope.App.ContentDirective.tests.ExampleClass.IExample"
        />
 </content>
                        """)