[CalendarServer-changes] [11337] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jun 13 13:19:11 PDT 2013
Revision: 11337
http://trac.calendarserver.org//changeset/11337
Author: cdaboo at apple.com
Date: 2013-06-13 13:19:11 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
Test that auto-accept does not happen during attendee refresh processing.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/10.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/11.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/12.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/9.ics
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/13.ics
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/10.ics 2013-06-13 18:41:59 UTC (rev 11336)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/10.ics 2013-06-13 20:19:11 UTC (rev 11337)
@@ -7,13 +7,13 @@
DURATION:PT30M
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$resourcename8:;PARTSTAT=ACCEPTED:$rcuaddrurn8:
+ATTENDEE;CN=$resourcename8:;RSVP=TRUE:$rcuaddrurn8:
CREATED:20060110T231240Z
DESCRIPTION:Call-in
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
STATUS:CONFIRMED
SUMMARY:Example
-TRANSP:OPAQUE
+TRANSP:TRANSPARENT
END:VEVENT
END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/11.ics 2013-06-13 18:41:59 UTC (rev 11336)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/11.ics 2013-06-13 20:19:11 UTC (rev 11337)
@@ -2,11 +2,12 @@
VERSION:2.0
PRODID:-//Example Inc.//Example Calendar//EN
BEGIN:VEVENT
-UID:event-1
-DTSTART:$now.8:T200000Z
-DURATION:PT1H
+UID:event-2
+DTSTART:$now.8:T203000Z
+DURATION:PT30M
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$resourcename8:;RSVP=TRUE;SCHEDULE-STATUS=1.2:$rcuaddrurn8:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename8:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn8:
CREATED:20060110T231240Z
DESCRIPTION:Call-in
DTSTAMP:20060309T185105Z
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/12.ics 2013-06-13 18:41:59 UTC (rev 11336)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/12.ics 2013-06-13 20:19:11 UTC (rev 11337)
@@ -2,17 +2,18 @@
VERSION:2.0
PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VEVENT
-UID:event-1
-DTSTART:$now.8:T200000Z
-DURATION:PT1H
+UID:event-2
+DTSTART:$now.8:T203000Z
+DURATION:PT30M
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
-ATTENDEE;CN=$resourcename8:;RSVP=TRUE:$rcuaddrurn8:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename8:;PARTSTAT=ACCEPTED:$rcuaddrurn8:
CREATED:20060110T231240Z
DESCRIPTION:Call-in
DTSTAMP:20060309T185105Z
-ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
STATUS:CONFIRMED
SUMMARY:Example
-TRANSP:TRANSPARENT
+TRANSP:OPAQUE
END:VEVENT
END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/13.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/13.ics 2013-06-13 20:19:11 UTC (rev 11337)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.8:T203000Z
+DURATION:PT30M
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
+ATTENDEE;CN=$resourcename8:;RSVP=TRUE;SCHEDULE-FORCE-SEND=REQUEST:$rcuaddrurn8:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/9.ics 2013-06-13 18:41:59 UTC (rev 11336)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto10/suite1/9.ics 2013-06-13 20:19:11 UTC (rev 11337)
@@ -7,7 +7,7 @@
DURATION:PT30M
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
ATTENDEE;CN=$username2:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0;EMAIL=$email2::$cuaddrurn2:
-ATTENDEE;CN=$resourcename8:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn8:
+ATTENDEE;CN=$resourcename8:;RSVP=TRUE;SCHEDULE-STATUS=1.2:$rcuaddrurn8:
CREATED:20060110T231240Z
DESCRIPTION:Call-in
DTSTAMP:20060309T185105Z
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml 2013-06-13 18:41:59 UTC (rev 11336)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml 2013-06-13 20:19:11 UTC (rev 11337)
@@ -348,16 +348,12 @@
</verify>
</request>
<request>
- <method>DELAY</method>
- <ruri>10</ruri>
- </request>
- <request>
- <method>WAITCOUNT 2</method>
+ <method>WAITCOUNT 1</method>
<ruri>$inboxpath1:/</ruri>
</request>
</test>
<test name='17' ignore='no'>
- <description>Two items in user01 Inbox - one is reply from resource</description>
+ <description>One item in user01 Inbox - no reply from resource</description>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
@@ -373,7 +369,7 @@
<callback>multistatusItems</callback>
<arg>
<name>count</name>
- <value>2</value>
+ <value>1</value>
</arg>
</verify>
</request>
@@ -412,21 +408,25 @@
</request>
</test>
<test name='20' ignore='no'>
- <description>Re-create new blocking event</description>
+ <description>Update event</description>
<request>
<method>PUT</method>
- <ruri>$calendarpath1:/1.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/implicit/auto10/suite1/1.ics</filepath>
+ <filepath>Resource/CalDAV/implicit/auto10/suite1/13.ics</filepath>
</data>
<verify>
<callback>statusCode</callback>
</verify>
</request>
+ <request>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
</test>
<test name='21' ignore='no'>
- <description>No item in user01 Inbox</description>
+ <description>One item in user01 Inbox</description>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$inboxpath1:/</ruri>
@@ -442,16 +442,20 @@
<callback>multistatusItems</callback>
<arg>
<name>count</name>
- <value>0</value>
+ <value>1</value>
</arg>
</verify>
</request>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
</test>
<test name='22' ignore='no'>
<description>One item in user01 Calendar</description>
<request print-response="no">
<method>GET</method>
- <ruri>$calendarpath1:/1.ics</ruri>
+ <ruri>$calendarpath1:/2.ics</ruri>
<verify>
<callback>calendarDataMatch</callback>
<arg>
@@ -462,7 +466,7 @@
</request>
</test>
<test name='23' ignore='no'>
- <description>One item in resource08 Inbox</description>
+ <description>No items in resource08 Inbox</description>
<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
<method>PROPFIND</method>
<ruri>$rinboxpath8:/</ruri>
@@ -478,14 +482,10 @@
<callback>multistatusItems</callback>
<arg>
<name>count</name>
- <value>1</value>
+ <value>0</value>
</arg>
</verify>
</request>
- <request>
- <method>DELETEALL</method>
- <ruri>$rinboxpath8:/</ruri>
- </request>
</test>
<test name='24' ignore='no'>
<description>One item in resource08 Calendar</description>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130613/b9314a50/attachment-0001.html>
More information about the calendarserver-changes
mailing list