[CalendarServer-changes] [1305] CalDAVTester/trunk/scripts/tests
source_changes at macosforge.org
source_changes at macosforge.org
Sat Mar 3 19:04:37 PST 2007
Revision: 1305
http://trac.macosforge.org/projects/calendarserver/changeset/1305
Author: cdaboo at apple.com
Date: 2007-03-03 19:04:36 -0800 (Sat, 03 Mar 2007)
Log Message:
-----------
No longer store scheduling message in the Outbox.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/schedulepost.xml
CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
Modified: CalDAVTester/trunk/scripts/tests/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-03-02 19:23:02 UTC (rev 1304)
+++ CalDAVTester/trunk/scripts/tests/schedulepost.xml 2007-03-04 03:04:36 UTC (rev 1305)
@@ -93,7 +93,7 @@
<test-suite name='POST Errors' ignore='no'>
<test name='1' ignore='no'>
<description>POST on invalid outbox</description>
- <request print-response="yes">
+ <request print-response="no">
<method>POST</method>
<header>
<name>Organizer</name>
@@ -392,36 +392,31 @@
<verify>
<callback>statusCode</callback>
</verify>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>Location$^$pathprefix:/$outbox:/[^/]+\.ics$</value>
- </arg>
- </verify>
- <grablocation/>
</request>
</test>
<test name='2'>
- <description>Make sure resource exists and properties are set</description>
+ <description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
<header>
<name>Depth</name>
- <value>0</value>
+ <value>1</value>
</header>
- <ruri>$</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedule/11.xml</filepath>
</data>
<verify>
- <callback>propfindItems</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$cuaddr1:</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$cuaddr2:</href><href xmlns="DAV:">$cuaddr3:</href></value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -501,17 +496,9 @@
<verify>
<callback>statusCode</callback>
</verify>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>Location$^$pathprefix:/$outbox:/[^/]+\.ics$</value>
- </arg>
- </verify>
- <grablocation/>
</request>
</test>
- <test name='6' ignore="yes">
+ <test name='6' ignore="no">
<description>POST which should work (using absolute principal addressing)</description>
<request print-response='no'>
<method>POST</method>
@@ -531,14 +518,6 @@
<verify>
<callback>statusCode</callback>
</verify>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>Location$^$pathprefix:/$outbox:/[^/]+\.ics$</value>
- </arg>
- </verify>
- <grablocation/>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-03-02 19:23:02 UTC (rev 1304)
+++ CalDAVTester/trunk/scripts/tests/schedulepostauto.xml 2007-03-04 03:04:36 UTC (rev 1305)
@@ -82,16 +82,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/1.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -195,16 +207,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/4.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -334,16 +358,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/4.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -473,16 +509,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/7.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -590,16 +638,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/9.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -707,16 +767,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/11.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -820,16 +892,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/14.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -937,16 +1021,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/16.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -1054,16 +1150,28 @@
</request>
</test>
<test name='2' ignore='no'>
- <description>One item in user01 Outbox</description>
+ <description>No item in user01 Outbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
- <method>GETNEW</method>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
<ruri>$pathprefix:/$outbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/scheduleauto/6.xml</filepath>
+ </data>
<verify>
- <callback>dataMatch</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleauto/18.ics</value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
Modified: CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2007-03-02 19:23:02 UTC (rev 1304)
+++ CalDAVTester/trunk/scripts/tests/schedulepostnormal.xml 2007-03-04 03:04:36 UTC (rev 1305)
@@ -71,36 +71,31 @@
<verify>
<callback>statusCode</callback>
</verify>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>Location$^$pathprefix:/outbox/[^/]+\.ics$</value>
- </arg>
- </verify>
- <grablocation/>
</request>
</test>
<test name='2'>
- <description>Make sure resource exists and properties are set</description>
+ <description>Make sure no resource exists</description>
<request print-response='no'>
<method>PROPFIND</method>
<header>
<name>Depth</name>
- <value>0</value>
+ <value>1</value>
</header>
- <ruri>$</ruri>
+ <ruri>$pathprefix:/$outbox:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/schedulenormal/2.xml</filepath>
</data>
<verify>
- <callback>propfindItems</callback>
+ <callback>multistatusItems</callback>
<arg>
- <name>okprops</name>
- <value>urn:ietf:params:xml:ns:caldavoriginator$<href xmlns="DAV:">$principal:</href></value>
- <value>urn:ietf:params:xml:ns:caldavrecipient$<href xmlns="DAV:">$principal2:</href><href xmlns="DAV:">$principal3:</href></value>
+ <name>prefix</name>
+ <value/>
</arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/$outbox:/</value>
+ </arg>
</verify>
</request>
</test>
@@ -180,14 +175,6 @@
<verify>
<callback>statusCode</callback>
</verify>
- <verify>
- <callback>header</callback>
- <arg>
- <name>header</name>
- <value>Location$^$pathprefix2:/outbox/[^/]+\.ics$</value>
- </arg>
- </verify>
- <grablocation/>
</request>
</test>
</test-suite>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070303/d9e31c95/attachment.html
More information about the calendarserver-changes
mailing list