[Zope3-checkins] CVS: Zope3/src/zope/app/dav/tests - test_propfind.py:1.9.6.2

Jim Fulton cvs-admin at zope.org
Mon Nov 10 15:39:54 EST 2003


Update of /cvs-repository/Zope3/src/zope/app/dav/tests
In directory cvs.zope.org:/tmp/cvs-serv23802

Modified Files:
      Tag: adaptergeddon-branch
	test_propfind.py 
Log Message:
Changed the expected output for two tests to match the current output,
because Sidnei says that the new output is right and the old output
was wrong. :)


=== Zope3/src/zope/app/dav/tests/test_propfind.py 1.9.6.1 => 1.9.6.2 ===
--- Zope3/src/zope/app/dav/tests/test_propfind.py:1.9.6.1	Sun Nov  9 11:08:17 2003
+++ Zope3/src/zope/app/dav/tests/test_propfind.py	Mon Nov 10 15:39:54 2003
@@ -478,20 +478,127 @@
         props = getFieldNamesInOrder(IDAVSchema)
         for p in props:
             props_xml += '<%s/>' % p
+
         expect = '''<?xml version="1.0" ?>
         <multistatus xmlns="DAV:">
         <response>
-        <href>%(resource_url)s</href>
+        <href>http://127.0.0.1/folder/</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/1</href>
         <propstat>
         <prop xmlns:a0="http://www.purl.org/dc/1.1">
-        %(props_xml)s
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
         </prop>
         <status>HTTP/1.1 200 OK</status>
         </propstat>
         </response>
-        </multistatus>
-        ''' % {'resource_url':resource_url,
-               'props_xml':props_xml}
+        <response>
+        <href>http://127.0.0.1/folder/2</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/sub1/</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        </multistatus>'''
+
 
         pfind = propfind.PROPFIND(folder, request)
 
@@ -525,20 +632,242 @@
         props = getFieldNamesInOrder(IDAVSchema)
         for p in props:
             props_xml += '<%s/>' % p
+
         expect = '''<?xml version="1.0" ?>
         <multistatus xmlns="DAV:">
         <response>
-        <href>%(resource_url)s</href>
+        <href>http://127.0.0.1/folder/</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/1</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/2</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/sub1/</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/sub1/1</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/sub1/2</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/sub1/sub1/</href>
+        <propstat>
+        <prop xmlns:a0="http://www.purl.org/dc/1.1">
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
+        </prop>
+        <status>HTTP/1.1 200 OK</status>
+        </propstat>
+        </response>
+        <response>
+        <href>http://127.0.0.1/folder/sub1/sub1/last</href>
         <propstat>
         <prop xmlns:a0="http://www.purl.org/dc/1.1">
-        %(props_xml)s
+        <title xmlns="a0"/>
+        <description xmlns="a0"/>
+        <created xmlns="a0"/>
+        <modified xmlns="a0"/>
+        <effective xmlns="a0"/>
+        <expires xmlns="a0"/>
+        <creators xmlns="a0"/>
+        <subjects xmlns="a0"/>
+        <publisher xmlns="a0"/>
+        <contributors xmlns="a0"/>
+        <creationdate/>
+        <displayname/>
+        <source/>
+        <getcontentlanguage/>
+        <getcontentlength/>
+        <getcontenttype/>
+        <getetag/>
+        <getlastmodified/>
+        <resourcetype/>
+        <lockdiscovery/>
+        <supportedlock/>
         </prop>
         <status>HTTP/1.1 200 OK</status>
         </propstat>
         </response>
-        </multistatus>
-        ''' % {'resource_url':resource_url,
-               'props_xml':props_xml}
+        </multistatus>'''
 
         pfind = propfind.PROPFIND(folder, request)
 




More information about the Zope3-Checkins mailing list