Revision: 6462 http://trac.macosforge.org/projects/calendarserver/changeset/6462 Author: cdaboo@apple.com Date: 2010-10-25 09:38:03 -0700 (Mon, 25 Oct 2010) Log Message: ----------- Tests for accuracy of results with new deferred DB implementation. Modified Paths: -------------- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml CalDAVTester/trunk/scripts/server/serverinfo-template.xml CalDAVTester/trunk/scripts/server/serverinfo.xml CalDAVTester/trunk/scripts/server/sslserverinfo.xml CalDAVTester/trunk/scripts/tests/CalDAV/get.xml CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-10-25 16:32:44 UTC (rev 6461) +++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-10-25 16:38:03 UTC (rev 6462) @@ -81,6 +81,10 @@ <value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value> </substitution> <substitution> + <key>$verify-bad-response:</key> + <value>/{DAV:}multistatus/{DAV:}response/{DAV:}status/</value> + </substitution> + <substitution> <key>$CALDAV:</key> <value>urn:ietf:params:xml:ns:caldav</value> </substitution> Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-10-25 16:32:44 UTC (rev 6461) +++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-10-25 16:38:03 UTC (rev 6462) @@ -83,6 +83,10 @@ <value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value> </substitution> <substitution> + <key>$verify-bad-response:</key> + <value>/{DAV:}multistatus/{DAV:}response/{DAV:}status/</value> + </substitution> + <substitution> <key>$CALDAV:</key> <value>urn:ietf:params:xml:ns:caldav</value> </substitution> Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml =================================================================== --- CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-10-25 16:32:44 UTC (rev 6461) +++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-10-25 16:38:03 UTC (rev 6462) @@ -83,6 +83,10 @@ <value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value> </substitution> <substitution> + <key>$verify-bad-response:</key> + <value>/{DAV:}multistatus/{DAV:}response/{DAV:}status/</value> + </substitution> + <substitution> <key>$CALDAV:</key> <value>urn:ietf:params:xml:ns:caldav</value> </substitution> Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml =================================================================== --- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-10-25 16:32:44 UTC (rev 6461) +++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-10-25 16:38:03 UTC (rev 6462) @@ -82,6 +82,10 @@ <value>/{DAV:}multistatus/{DAV:}response/{DAV:}propstat/{DAV:}prop</value> </substitution> <substitution> + <key>$verify-bad-response:</key> + <value>/{DAV:}multistatus/{DAV:}response/{DAV:}status/</value> + </substitution> + <substitution> <key>$CALDAV:</key> <value>urn:ietf:params:xml:ns:caldav</value> </substitution> Modified: CalDAVTester/trunk/scripts/tests/CalDAV/get.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/CalDAV/get.xml 2010-10-25 16:32:44 UTC (rev 6461) +++ CalDAVTester/trunk/scripts/tests/CalDAV/get.xml 2010-10-25 16:38:03 UTC (rev 6462) @@ -159,6 +159,30 @@ </verify> </request> </test> + <test name='4'> + <require-feature> + <feature>directory listing</feature> + </require-feature> + <description>GET on calendar collection with listing</description> + <request print-response="no"> + <method>GET</method> + <ruri>$calendarpath1:/</ruri> + <header> + <name>User-Agent</name> + <value>Mozilla/Gecko</value> + </header> + <verify> + <callback>statusCode</callback> + </verify> + <verify> + <callback>dataString</callback> + <arg> + <name>contains</name> + <value><![CDATA[<td>text/calendar</td>]]></value> + </arg> + </verify> + </request> + </test> </test-suite> <end/> Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2010-10-25 16:32:44 UTC (rev 6461) +++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml 2010-10-25 16:38:03 UTC (rev 6462) @@ -404,6 +404,13 @@ <value>bogus-resource.ics</value> </arg> </verify> + <verify> + <callback>xmlElementMatch</callback> + <arg> + <name>exists</name> + <value>$verify-bad-response:[*404]</value> + </arg> + </verify> </request> </test> </test-suite>