[CalendarServer-changes] [7211] CalDAVTester/trunk/scripts/tests
source_changes at macosforge.org
source_changes at macosforge.org
Thu Mar 17 19:51:33 PDT 2011
Revision: 7211
http://trac.macosforge.org/projects/calendarserver/changeset/7211
Author: cdaboo at apple.com
Date: 2011-03-17 19:51:33 -0700 (Thu, 17 Mar 2011)
Log Message:
-----------
XML schema fixes.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml
CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml 2011-03-18 02:31:43 UTC (rev 7210)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml 2011-03-18 02:51:33 UTC (rev 7211)
@@ -87,8 +87,10 @@
</data>
<verify>
<callback>statusCode</callback>
- <arg>status</arg>
- <value>201</value>
+ <arg>
+ <name>status</name>
+ <value>201</value>
+ </arg>
</verify>
<verify>
<callback>header</callback>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml 2011-03-18 02:31:43 UTC (rev 7210)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml 2011-03-18 02:51:33 UTC (rev 7211)
@@ -33,11 +33,11 @@
<description>PROPFIND of user on node #1 as user on node #1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$principal1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -51,11 +51,11 @@
<description>PROPFIND of user on node #2 as user on node #1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$otherprincipal1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$otherprincipal1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -69,11 +69,11 @@
<description>PROPFIND of user on node #1 as user on node #2</description>
<request user='$otherid1:' pswd='$otherpswd1:'>
<method>PROPFIND</method>
+ <ruri>$principal1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$principal1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -87,11 +87,11 @@
<description>PROPFIND of user on node #2 as user on node #2</description>
<request user='$otherid1:' pswd='$otherpswd1:'>
<method>PROPFIND</method>
+ <ruri>$otherprincipal1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$otherprincipal1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -108,11 +108,11 @@
<description>PROPFIND of user on node #1 as user on node #1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -126,11 +126,11 @@
<description>PROPFIND of user on node #2 as user on node #1</description>
<request>
<method>PROPFIND</method>
+ <ruri>$otherpathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$otherpathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -148,11 +148,11 @@
<description>PROPFIND of user on node #1 as user on node #2</description>
<request user='$otherid1:' pswd='$otherpswd1:'>
<method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
@@ -170,11 +170,11 @@
<description>PROPFIND of user on node #2 as user on node #2</description>
<request user='$otherid1:' pswd='$otherpswd1:'>
<method>PROPFIND</method>
+ <ruri>$otherpathprefix1:/</ruri>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$otherpathprefix1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CalDAV/partitioning/simple/1.xml</filepath>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml 2011-03-18 02:31:43 UTC (rev 7210)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml 2011-03-18 02:51:33 UTC (rev 7211)
@@ -569,10 +569,10 @@
</request>
</test>
<test name='4' ignore='no'>
- <description>MKCOL</description>
<require-feature>
<feature>regular-collection</feature>
</require-feature>
+ <description>MKCOL</description>
<request end-delete="yes">
<method>MKCOL</method>
<ruri>$pathprefix1:/collection/</ruri>
@@ -582,10 +582,10 @@
</request>
</test>
<test name='5' ignore='no'>
- <description>PUT</description>
<require-feature>
<feature>regular-collection</feature>
</require-feature>
+ <description>PUT</description>
<request>
<method>PUT</method>
<ruri>$pathprefix1:/collection/1234</ruri>
@@ -599,10 +599,10 @@
</request>
</test>
<test name='6' ignore='no'>
- <description>GET</description>
<require-feature>
<feature>regular-collection</feature>
</require-feature>
+ <description>GET</description>
<request>
<method>GET</method>
<ruri>$pathprefix1:/collection/1234</ruri>
@@ -616,10 +616,10 @@
</request>
</test>
<test name='7' ignore='no'>
- <description>PROPFIND</description>
<require-feature>
<feature>regular-collection</feature>
</require-feature>
+ <description>PROPFIND</description>
<request>
<method>PROPFIND</method>
<ruri>$pathprefix1:/collection/1234</ruri>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml 2011-03-18 02:31:43 UTC (rev 7210)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml 2011-03-18 02:51:33 UTC (rev 7211)
@@ -167,7 +167,7 @@
<arg>
<name>error</name>
<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
-s </arg>
+ </arg>
</verify>
</request>
</test>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml 2011-03-18 02:31:43 UTC (rev 7210)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml 2011-03-18 02:51:33 UTC (rev 7211)
@@ -1126,7 +1126,6 @@
</verify>
</request>
</test>
- -->
</test-suite>
<end/>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml 2011-03-18 02:31:43 UTC (rev 7210)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml 2011-03-18 02:51:33 UTC (rev 7211)
@@ -28,7 +28,7 @@
<start/>
<test-suite name='non-ascii' ignore="no">
- <test name='1' end-delete="no" ignore="no">
+ <test name='1' ignore="no">
<description>MKCOL with high-ascii</description>
<request print-response="no">
<method>MKCOL</method>
@@ -60,7 +60,7 @@
</verify>
</request>
</test>
- <test name='3' end-delete="no" ignore="no">>
+ <test name='3' ignore="no">
<description>GET with non-ascii</description>
<request print-response="no">
<method>GET</method>
@@ -115,7 +115,7 @@
</verify>
</request>
</test>
- <test name='3' end-delete="no">
+ <test name='3'>
<description>GET with non-ascii</description>
<request print-response="no">
<method>GET</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110317/94aa5c8d/attachment-0001.html>
More information about the calendarserver-changes
mailing list