[CalendarServer-changes] [2845] CalDAVTester/branches/users/cdaboo/implicit-2661
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 22 12:37:08 PDT 2008
Revision: 2845
http://trac.macosforge.org/projects/calendarserver/changeset/2845
Author: cdaboo at apple.com
Date: 2008-08-22 12:37:08 -0700 (Fri, 22 Aug 2008)
Log Message:
-----------
Fix ctag behavior for implicit scheduling.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/implicit-2661/Resource/ctag/2.ics
CalDAVTester/branches/users/cdaboo/implicit-2661/scripts/tests/ctag.xml
Modified: CalDAVTester/branches/users/cdaboo/implicit-2661/Resource/ctag/2.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/implicit-2661/Resource/ctag/2.ics 2008-08-22 18:02:14 UTC (rev 2844)
+++ CalDAVTester/branches/users/cdaboo/implicit-2661/Resource/ctag/2.ics 2008-08-22 19:37:08 UTC (rev 2845)
@@ -2,7 +2,6 @@
CALSCALE:GREGORIAN
PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
VERSION:2.0
-METHOD:REQUEST
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
TZID:US/Eastern
@@ -27,7 +26,7 @@
DTSTART;TZID=US/Eastern:20060101T100000
DURATION:PT1H
SUMMARY:event 1
-UID:54E181BC7CCC373042B28842 at ninevah.local
+UID:54E181BC7CCC373042B28842 at ninevah.local-1
ORGANIZER;CN=User 01:$cuaddr2:
ATTENDEE;CN=User 02:$cuaddr1:
END:VEVENT
Modified: CalDAVTester/branches/users/cdaboo/implicit-2661/scripts/tests/ctag.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/implicit-2661/scripts/tests/ctag.xml 2008-08-22 18:02:14 UTC (rev 2844)
+++ CalDAVTester/branches/users/cdaboo/implicit-2661/scripts/tests/ctag.xml 2008-08-22 19:37:08 UTC (rev 2845)
@@ -21,7 +21,7 @@
-->
<caldavtest>
- <description>Test the collection entity tag behavior on calwndar collections</description>
+ <description>Test the collection entity tag behavior on calendar collections</description>
<start>
<request end-delete="yes">
@@ -424,14 +424,14 @@
<test-suite name='Scheduling'>
<test name='1'>
- <description>Check for CTag</description>
+ <description>Check for CTag on calendar</description>
<request print-response='no'>
<method>PROPFIND</method>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix:/$inbox:/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -450,30 +450,54 @@
</request>
</test>
<test name='2'>
- <description>POST invite</description>
- <request user="$userid2:" pswd="$pswd2:" print-response='no'>
- <method>POST</method>
+ <description>Check for CTag on inbox</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
<header>
- <name>Originator</name>
- <value>$cuaddr2:</value>
+ <name>Depth</name>
+ <value>0</value>
</header>
- <header>
- <name>Recipient</name>
- <value>$cuaddr1:</value>
- </header>
- <ruri>$pathprefix2:/$outbox:/</ruri>
+ <ruri>$pathprefix:/$inbox:/</ruri>
<data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/ctag/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>http://calendarserver.org/ns/getctag</value>
+ </arg>
+ </verify>
+ <grabproperty>
+ <property>http://calendarserver.org/ns/getctag</property>
+ <variable>$getctag4:</variable>
+ </grabproperty>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PUT invite</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PUT</method>
+ <ruri>$calendarpath2:/2.ics</ruri>
+ <data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/ctag/2.ics</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
- <request>
+ </test>
+ <test name="4">
+ <description>Test calendar ctag change</description>
+ <request print-response='no'>
<method>PROPFIND</method>
<header>
<name>Depth</name>
<value>0</value>
</header>
- <ruri>$pathprefix:/$inbox:/</ruri>
+ <ruri>$calendarpath1:/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/ctag/1.xml</filepath>
@@ -485,12 +509,30 @@
<value>http://calendarserver.org/ns/getctag!$getctag3:</value>
</arg>
</verify>
- <grabproperty>
- <property>http://calendarserver.org/ns/getctag</property>
- <variable>$getctag3:</variable>
- </grabproperty>
</request>
</test>
+ <test name="5">
+ <description>Test inbox ctag change</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>$pathprefix:/$inbox:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/ctag/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>http://calendarserver.org/ns/getctag!$getctag4:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end>
@@ -498,6 +540,22 @@
<method>DELETE</method>
<ruri>$pathprefix:/movecopy/</ruri>
</request>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$pathprefix:/$inbox:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$pathprefix2:/$inbox:/</ruri>
+ </request>
</end>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080822/ecb6b292/attachment.html
More information about the calendarserver-changes
mailing list