[CalendarServer-changes] [9259] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon May 21 09:00:12 PDT 2012
Revision: 9259
http://trac.macosforge.org/projects/calendarserver/changeset/9259
Author: cdaboo at apple.com
Date: 2012-05-21 09:00:11 -0700 (Mon, 21 May 2012)
Log Message:
-----------
Add missing verify to tests. Tweak tests to use proper cu-addresses.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt
CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt
CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt
CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt
CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt 2012-05-21 12:26:40 UTC (rev 9258)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_4.txt 2012-05-21 16:00:11 UTC (rev 9259)
@@ -21,16 +21,14 @@
END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
-ATTENDEE;CN=Cyrus;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus at example.
- com
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1
- @example.com
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
DTSTAMP:20051228T232517Z
DTSTART;TZID=US/Eastern:20060110T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031335Z
LOCATION:Seattle bis
-ORGANIZER;CN=Cyrus:mailto:cyrus at example.com
+ORGANIZER;CN=$username1::$cuaddr1:
SEQUENCE:4
SUMMARY:Meeting 1.1bis
UID:D78DF901C93F331110324ED7 at ninevah.local
Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt 2012-05-21 12:26:40 UTC (rev 9258)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_5.txt 2012-05-21 16:00:11 UTC (rev 9259)
@@ -21,16 +21,14 @@
END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
-ATTENDEE;CN=Cyrus;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus at example.
- com
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1
- @example.com
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
DTSTAMP:20051228T232517Z
DTSTART;TZID=US/Eastern:20060110T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031502Z
LOCATION:Seattle bis
-ORGANIZER;CN=Cyrus:mailto:cyrus at example.com
+ORGANIZER;CN=$username1::$cuaddr1:
SEQUENCE:5
SUMMARY:Meeting 1.1bis
UID:D78DF901C93F331110324ED7 at ninevah.local
Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt 2012-05-21 12:26:40 UTC (rev 9258)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_7.txt 2012-05-21 16:00:11 UTC (rev 9259)
@@ -21,15 +21,13 @@
END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
-ATTENDEE;CN=Cyrus;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus at example.
- com
-ATTENDEE;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1 at example.com
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2
- @example.com
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;PARTSTAT=DECLINED;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr3:
DTSTAMP:20051228T232640Z
DTSTART;TZID=US/Eastern:20060109T111500
DURATION:PT1H
-ORGANIZER;CN=Cyrus:mailto:cyrus at example.com
+ORGANIZER;CN=$username1::$cuaddr1:
SEQUENCE:1
SUMMARY:Meeting 1.3
UID:04625B9DFE753561D3D4D882 at ninevah.local
Modified: CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt 2012-05-21 12:26:40 UTC (rev 9258)
+++ CalDAVTester/trunk/Resource/CalDAV/caldaviop/2/2_9.txt 2012-05-21 16:00:11 UTC (rev 9259)
@@ -21,19 +21,17 @@
END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
-ATTENDEE;CN=Cyrus;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:cyrus at example.
- com
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1
- @example.com
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:20060110T150000
+DTSTART;TZID=US/Eastern:20060110T120000
DURATION:PT1H
-LAST-MODIFIED:20051229T031728Z
+LAST-MODIFIED:20051229T031502Z
LOCATION:Seattle bis
-ORGANIZER;CN=Cyrus:mailto:cyrus at example.com
-SEQUENCE:6
+ORGANIZER;CN=$username1::$cuaddr1:
+SEQUENCE:5
SUMMARY:Meeting 1.1bis
-UID:D78DF901C93F331110324ED729 at ninevah.local
+UID:D78DF901C93F331110324ED7 at ninevah.local
BEGIN:VALARM
ACTION:AUDIO
TRIGGER;RELATED=START:-PT15M
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml 2012-05-21 12:26:40 UTC (rev 9258)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavIOP.xml 2012-05-21 16:00:11 UTC (rev 9259)
@@ -95,6 +95,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_1.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.2'>
@@ -106,6 +109,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_2.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.3'>
@@ -117,6 +123,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_3.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.4'>
@@ -128,6 +137,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_4.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.5'>
@@ -139,6 +151,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_5.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.6'>
@@ -150,6 +165,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_6.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.7'>
@@ -161,6 +179,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_7.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.8'>
@@ -172,17 +193,23 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_8.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='2.9'>
<description>One client changes "Meeting 1.1bis" to a different time, second client 'refreshes' its display to see the modification.</description>
<request end-delete='yes'>
<method>PUT</method>
- <ruri>$calendarpath1:/2-2_9.ics</ruri>
+ <ruri>$calendarpath1:/1-1_1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/2/2_9.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
</test-suite>
@@ -197,10 +224,16 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_1.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>DELETE</method>
<ruri>$calendarpath1:/4-4_1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='4.2'>
@@ -212,10 +245,16 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_2.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>DELETE</method>
<ruri>$calendarpath1:/4-4_2.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='4.3'>
@@ -227,10 +266,16 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_3.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>DELETE</method>
<ruri>$calendarpath1:/4-4_3.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='4.4'>
@@ -242,6 +287,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_4a.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>PUT</method>
@@ -250,6 +298,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_4b.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
<test name='4.5'>
@@ -261,6 +312,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_5a.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>PUT</method>
@@ -269,6 +323,9 @@
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/caldaviop/4/4_5b.txt</filepath>
</data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
</test>
</test-suite>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120521/a510a94a/attachment-0001.html>
More information about the calendarserver-changes
mailing list