[CalendarServer-changes] [13714] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 2 12:59:58 PDT 2014
Revision: 13714
http://trac.calendarserver.org//changeset/13714
Author: cdaboo at apple.com
Date: 2014-07-02 12:59:58 -0700 (Wed, 02 Jul 2014)
Log Message:
-----------
Clean-up and fix various cross-pod tests. Include a test for cross-pod freebusy by proxies.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/3.ics
CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml
CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml
CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml
CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml
CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml
CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/
CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/
CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics
CalDAVTester/trunk/Resource/CalDAV-pod/implicitschedule/
Removed Paths:
-------------
CalDAVTester/trunk/Resource/CalDAV/podding/
Modified: CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/podding/calendaruserproxy/3.ics 2014-06-30 14:57:51 UTC (rev 13706)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/calendaruserproxy/3.ics 2014-07-02 19:59:58 UTC (rev 13714)
@@ -8,6 +8,6 @@
DTSTART:$now.year.1:0101T100000Z
DURATION:PT1H
SUMMARY:event 2
-UID:$uid1:
+UID:$uid2:
END:VEVENT
END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/implicitproxy/16.ics 2014-07-02 19:59:58 UTC (rev 13714)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+METHOD:REQUEST
+BEGIN:VFREEBUSY
+UID:$uid1:
+DTSTART:$now.year.1:0208T000000Z
+DTEND:$now.year.1:0209T000000Z
+ATTENDEE;CN=$username2::$cuaddralt2:
+ATTENDEE;CN=$username3::$cuaddralt3:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username2::$cuaddralt2:
+END:VFREEBUSY
+END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationdecline2.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
- <invite-reply xmlns='http://calendarserver.org/ns/'>
+ <invite-reply shared-type="calendar" xmlns='http://calendarserver.org/ns/'>
<href xmlns='DAV:'>mailto:$pemail2:</href>
<invite-declined/>
<hosturl>
@@ -8,7 +8,5 @@
</hosturl>
<in-reply-to>$inviteuid2:</in-reply-to>
<common-name>$pusername2:</common-name>
- <first-name>$pfirstname2:</first-name>
- <last-name>$plastname2:</last-name>
</invite-reply>
</notification>
Modified: CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/Resource/CalDAV-pod/sharing/common/notificationreply2.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
<dtstamp></dtstamp>
- <invite-reply xmlns='http://calendarserver.org/ns/'>
+ <invite-reply shared-type="calendar" xmlns='http://calendarserver.org/ns/'>
<href xmlns='DAV:'>mailto:$pemail2:</href>
<invite-accepted/>
<hosturl>
@@ -9,7 +9,5 @@
<in-reply-to>$inviteuid2:</in-reply-to>
<summary>The Shared Calendar</summary>
<common-name>$pusername2:</common-name>
- <first-name>$pfirstname2:</first-name>
- <last-name>$plastname2:</last-name>
</invite-reply>
</notification>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -525,7 +525,7 @@
<!-- user guid -->
<substitution>
<key>$puserguid%d:</key>
- <value>puser%02d</value>
+ <value>60000000-0000-0000-0000-000000000%03d</value>
</substitution>
<!-- user name -->
<substitution>
Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -60,7 +60,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -83,7 +83,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -116,7 +116,7 @@
<ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -135,7 +135,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -158,7 +158,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -181,7 +181,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -214,7 +214,7 @@
<ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -232,7 +232,7 @@
<ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -251,7 +251,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -274,7 +274,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -297,7 +297,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -330,7 +330,7 @@
<ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -349,7 +349,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -372,7 +372,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -395,7 +395,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -428,7 +428,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/5.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -442,7 +442,7 @@
<ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -456,7 +456,7 @@
<ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -475,7 +475,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -498,7 +498,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -521,7 +521,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -561,7 +561,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -584,7 +584,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -617,7 +617,7 @@
<ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -636,7 +636,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -659,7 +659,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -682,7 +682,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -715,7 +715,7 @@
<ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -733,7 +733,7 @@
<ruri>$principal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -752,7 +752,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -775,7 +775,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -798,7 +798,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -831,7 +831,7 @@
<ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -850,7 +850,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -873,7 +873,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -896,7 +896,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -929,7 +929,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/5.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -943,7 +943,7 @@
<ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -957,7 +957,7 @@
<ruri>$principal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -976,7 +976,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -999,7 +999,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1022,7 +1022,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1062,7 +1062,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1085,7 +1085,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1118,7 +1118,7 @@
<ruri>$pprincipal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1137,7 +1137,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1160,7 +1160,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1183,7 +1183,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1216,7 +1216,7 @@
<ruri>$pcalendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1234,7 +1234,7 @@
<ruri>$pprincipal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1253,7 +1253,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1276,7 +1276,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1299,7 +1299,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1332,7 +1332,7 @@
<ruri>$pprincipal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1351,7 +1351,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1374,7 +1374,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1397,7 +1397,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1430,7 +1430,7 @@
<ruri>$pcalendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/5.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1444,7 +1444,7 @@
<ruri>$pcalendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1458,7 +1458,7 @@
<ruri>$pprincipal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1477,7 +1477,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1500,7 +1500,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1523,7 +1523,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1563,7 +1563,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1586,7 +1586,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1619,7 +1619,7 @@
<ruri>$pprincipal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1638,7 +1638,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1661,7 +1661,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1684,7 +1684,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1717,7 +1717,7 @@
<ruri>$pcalendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1735,7 +1735,7 @@
<ruri>$pprincipal1:calendar-proxy-read/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1754,7 +1754,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1777,7 +1777,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1800,7 +1800,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1833,7 +1833,7 @@
<ruri>$pprincipal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/6.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/6.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1852,7 +1852,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1875,7 +1875,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1898,7 +1898,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>xmlElementMatch</callback>
@@ -1931,7 +1931,7 @@
<ruri>$pcalendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/5.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/5.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1945,7 +1945,7 @@
<ruri>$pcalendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1959,7 +1959,7 @@
<ruri>$pprincipal1:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -1978,7 +1978,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -2001,7 +2001,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -2024,7 +2024,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/calendaruserproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/calendaruserproxy/1.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -45,7 +45,7 @@
<ruri>$principal2:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/1.xml</filepath>
</data>
</request>
<request user="$userid3:" pswd="$pswd3:">
@@ -53,11 +53,28 @@
<ruri>$principal3:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/1.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/1.xml</filepath>
</data>
</request>
</start>
+ <test-suite name='Proxy free busy as Organizer'>
+ <test name='1'>
+ <description>Proxy does freebusy request</description>
+ <request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
+ <method>POST</method>
+ <ruri>$outboxpath2:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/implicitproxy/16.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<test-suite name='Proxy as Organizer'>
<test name='1'>
<description>Proxy creates new event</description>
@@ -66,7 +83,7 @@
<ruri>$calendarpath2:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/3.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/3.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -84,7 +101,7 @@
</header>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/4.xml</filepath>
</data>
<verify>
<callback>multistatusItems</callback>
@@ -104,7 +121,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitproxy/5.ics</value>
+ <value>Resource/CalDAV-pod/implicitproxy/5.ics</value>
</arg>
</verify>
</request>
@@ -125,13 +142,45 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitproxy/6.ics</value>
+ <value>Resource/CalDAV-pod/implicitproxy/6.ics</value>
</arg>
</verify>
</request>
</test>
</test-suite>
+ <test-suite name='Proxy free busy as Organizer'>
+ <test name='1'>
+ <description>Proxy does freebusy request</description>
+ <request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
+ <method>POST</method>
+ <ruri>$outboxpath2:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/implicitproxy/16.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt2:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0208T200000Z/$now.year.1:0208T210000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt3:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<test-suite name='Proxy as Attendee'>
<test name='2'>
<description>Proxy updates event</description>
@@ -147,7 +196,7 @@
<ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/7.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/7.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -170,7 +219,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitproxy/8.ics</value>
+ <value>Resource/CalDAV-pod/implicitproxy/8.ics</value>
</arg>
</verify>
</request>
@@ -186,7 +235,7 @@
</header>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/4.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/4.xml</filepath>
</data>
<verify>
<callback>multistatusItems</callback>
@@ -206,13 +255,49 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitproxy/9.ics</value>
+ <value>Resource/CalDAV-pod/implicitproxy/9.ics</value>
</arg>
</verify>
</request>
</test>
</test-suite>
+ <test-suite name='Proxy free busy as Organizer'>
+ <test name='1'>
+ <description>Proxy does freebusy request</description>
+ <request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
+ <method>POST</method>
+ <ruri>$outboxpath2:/</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV-pod/implicitproxy/16.ics</filepath>
+ </data>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt2:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0208T200000Z/$now.year.1:0208T210000Z</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>postFreeBusy</callback>
+ <arg>
+ <name>attendee</name>
+ <value>$cuaddralt3:</value>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>$now.year.1:0208T200000Z/$now.year.1:0208T210000Z</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<test-suite name="Undo proxy">
<test name='1'>
<description>Remove proxy</description>
@@ -221,7 +306,7 @@
<ruri>$principal2:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -232,7 +317,7 @@
<ruri>$principal3:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -288,7 +373,7 @@
<ruri>$principal2:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</data>
</request>
<request user="$userid3:" pswd="$pswd3:">
@@ -296,7 +381,7 @@
<ruri>$principal3:calendar-proxy-write/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/2.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/2.xml</filepath>
</data>
</request>
<request user="$userid2:" pswd="$pswd2:">
@@ -304,7 +389,7 @@
<ruri>$calendarpath2:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/11.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/11.xml</filepath>
</data>
</request>
<request user="$userid3:" pswd="$pswd3:">
@@ -312,7 +397,7 @@
<ruri>$calendarpath3:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitproxy/11.xml</filepath>
+ <filepath>Resource/CalDAV-pod/implicitproxy/11.xml</filepath>
</data>
</request>
</end>
Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -44,7 +44,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/1.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/1.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -60,7 +60,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/2.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/2.ics</value>
</arg>
</verify>
</request>
@@ -85,7 +85,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</arg>
</verify>
</request>
@@ -96,7 +96,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</arg>
</verify>
</request>
@@ -115,7 +115,7 @@
<ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/4.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/4.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -138,7 +138,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/5.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/5.ics</value>
</arg>
</verify>
</request>
@@ -174,7 +174,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/6.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/6.ics</value>
</arg>
</verify>
</request>
@@ -193,7 +193,7 @@
<ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/7.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/7.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -216,7 +216,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/8.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/8.ics</value>
</arg>
</verify>
</request>
@@ -252,22 +252,31 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/9.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/9.ics</value>
</arg>
</verify>
</request>
</test>
- <test name='18'>
+ <test name='-1'>
<description>Clean-up</description>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
- <ruri>$pcalendarpath1:/</ruri>
+ </request>
+ <request user="$puserid1:" pswd="$ppswd1:">
+ <method>WAITDELETEALL 1</method>
<ruri>$pinboxpath1:/</ruri>
</request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$pcalendarpath1:/</ruri>
+ </request>
</test>
</test-suite>
@@ -279,7 +288,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/1.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/1.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -295,7 +304,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/2.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/2.ics</value>
</arg>
</verify>
</request>
@@ -320,7 +329,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</arg>
</verify>
</request>
@@ -331,7 +340,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/3.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/3.ics</value>
</arg>
</verify>
</request>
@@ -350,7 +359,7 @@
<ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/4.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/4.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -373,7 +382,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/5.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/5.ics</value>
</arg>
</verify>
</request>
@@ -409,7 +418,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/6.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/6.ics</value>
</arg>
</verify>
</request>
@@ -428,7 +437,7 @@
<ruri>$</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/podding/implicitschedule/suite1/7.ics</filepath>
+ <filepath>Resource/CalDAV-pod/implicitschedule/suite1/7.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -451,7 +460,7 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/8.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/8.ics</value>
</arg>
</verify>
</request>
@@ -487,35 +496,34 @@
<callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/CalDAV/podding/implicitschedule/suite1/9.ics</value>
+ <value>Resource/CalDAV-pod/implicitschedule/suite1/9.ics</value>
</arg>
</verify>
</request>
</test>
- <test name='18'>
+ <test name='-1'>
<description>Clean-up</description>
<request host2='yes' user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request host2='yes' user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
<ruri>$inboxpath2:/</ruri>
- <ruri>$pcalendarpath1:/</ruri>
+ </request>
+ <request host2='yes' user="$puserid1:" pswd="$ppswd1:">
+ <method>WAITDELETEALL 1</method>
<ruri>$pinboxpath1:/</ruri>
</request>
+ <request host2='yes' user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$pcalendarpath1:/</ruri>
+ </request>
</test>
</test-suite>
- <end>
- <request user="$useradmin:" pswd="$pswdadmin:">
- <method>DELETEALL</method>
- <ruri>$calendarpath1:/</ruri>
- <ruri>$inboxpath1:/</ruri>
- <ruri>$calendarpath2:/</ruri>
- <ruri>$inboxpath2:/</ruri>
- <ruri>$pcalendarpath1:/</ruri>
- <ruri>$pinboxpath1:/</ruri>
- </request>
- </end>
+ <end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml 2014-07-02 00:58:58 UTC (rev 13713)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml 2014-07-02 19:59:58 UTC (rev 13714)
@@ -65,7 +65,7 @@
<callback>dataString</callback>
<arg>
<name>notcontains</name>
- <value>user02</value>
+ <value>$puserguid2:</value>
</arg>
</verify>
</request>
@@ -101,7 +101,7 @@
<callback>dataString</callback>
<arg>
<name>contains</name>
- <value>puser02</value>
+ <value>$puserguid2:</value>
</arg>
</verify>
</request>
@@ -137,7 +137,7 @@
<callback>dataString</callback>
<arg>
<name>notcontains</name>
- <value>puser02</value>
+ <value>$puserguid2:</value>
</arg>
</verify>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140702/cc2366d2/attachment-0001.html>
More information about the calendarserver-changes
mailing list