[Zope-Checkins] CVS: Zope3/lib/python/Zope/Configuration/tests - testDirectivesXML.py:1.1.2.7.8.3 testMeta.py:1.1.2.10.8.1 testXML.py:1.1.2.12.8.2

Jim Fulton jim@zope.com
Mon, 3 Jun 2002 14:25:43 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/Configuration/tests
In directory cvs.zope.org:/tmp/cvs-serv14482/lib/python/Zope/Configuration/tests

Modified Files:
      Tag: Zope3InWonderland-branch
	testDirectivesXML.py testMeta.py testXML.py 
Log Message:
Changed list attribute syntax to be more XML standard.
In particular, list attributes now expect items to be separated by
whitespace, rather than commas.


=== Zope3/lib/python/Zope/Configuration/tests/testDirectivesXML.py 1.1.2.7.8.2 => 1.1.2.7.8.3 ===
             '''<test:protectClass name=".Contact">
                 <test:protect permission="edit" names='update' />
-                <test:protect permission="view" names='name, email' />
+                <test:protect permission="view" names='name email' />
               </test:protectClass>'''
             )))
 
         self.assertEquals(protections, [
             (".Contact", "edit", 'update'),
-            (".Contact", "view", 'name, email'),
+            (".Contact", "view", 'name email'),
             ])
       
     def testHandlerMethod(self):
@@ -92,13 +92,13 @@
                </directives>''' % ns,
             '''<test:protectClass name=".Contact">
                 <test:fish permission="edit" names='update' />
-                <test:fish permission="view" names='name, email' />
+                <test:fish permission="view" names='name email' />
               </test:protectClass>'''
             )))
 
         self.assertEquals(protections, [
             (".Contact", "edit", 'update'),
-            (".Contact", "view", 'name, email'),
+            (".Contact", "view", 'name email'),
             ])
         
         
@@ -118,7 +118,7 @@
 
             '''<test:protectClass name=".Contact">
               <test:protect permission="edit" names='update' />
-              <protect permission="view" names='name, email' />
+              <protect permission="view" names='name email' />
               </test:protectClass>'''
             )),
             testing=1)


=== Zope3/lib/python/Zope/Configuration/tests/testMeta.py 1.1.2.10 => 1.1.2.10.8.1 ===
 
         actions = end(sub(subs, (ns, 'protect'), name,
-                          permission='view', names='name, email'))
+                          permission='view', names='name email'))
         (des, callable, args, kw), = actions
-        self.assertEqual(des, ('.Contact', 'name, email'))
+        self.assertEqual(des, ('.Contact', 'name email'))
         callable(*args)
 
         self.assertEqual(tuple(end(subs)), ())
 
         self.assertEquals(protections, [
             (".Contact", "edit", 'update'),
-            (".Contact", "view", 'name, email'),
+            (".Contact", "view", 'name email'),
             ])
 
 def test_suite():


=== Zope3/lib/python/Zope/Configuration/tests/testXML.py 1.1.2.12.8.1 => 1.1.2.12.8.2 ===
             '''<test:protectClass name=".Contact">
               <test:protect permission="edit" names='update' />
-              <test:protect permission="view" names='name, email' />
+              <test:protect permission="view" names='name email' />
             </test:protectClass>'''
             )))
 
         self.assertEquals(protections, [
             (".Contact", "edit", 'update'),
-            (".Contact", "view", 'name, email'),
+            (".Contact", "view", 'name email'),
             ])
         
     def testBadNoPrefixComplexDirective(self):
@@ -91,7 +91,7 @@
 
             '''<test:protectClass name=".Contact">
               <test:protect permission="edit" names='update' />
-              <protect permission="view" names='name, email' />
+              <protect permission="view" names='name email' />
               </test:protectClass>'''
             )))