[CalendarServer-changes] [9760] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 31 11:55:58 PDT 2012
Revision: 9760
http://trac.macosforge.org/projects/calendarserver/changeset/9760
Author: cdaboo at apple.com
Date: 2012-08-31 11:55:58 -0700 (Fri, 31 Aug 2012)
Log Message:
-----------
Test duplicate alarm removal.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/put/10.ics
CalDAVTester/trunk/Resource/CalDAV/put/11.ics
CalDAVTester/trunk/Resource/CalDAV/put/8.ics
CalDAVTester/trunk/Resource/CalDAV/put/9.ics
Added: CalDAVTester/trunk/Resource/CalDAV/put/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/10.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/10.ics 2012-08-31 18:55:58 UTC (rev 9760)
@@ -0,0 +1,45 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-10 at example.com
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+RRULE:FREQ=DAILY
+SUMMARY:event 10
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:put-10 at example.com
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0428
+DTSTART;VALUE=DATE:$now.year.1:0428
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 10
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT20M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT20M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/put/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/11.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/11.ics 2012-08-31 18:55:58 UTC (rev 9760)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-10 at example.com
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+RRULE:FREQ=DAILY
+SUMMARY:event 10
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:put-10 at example.com
+RECURRENCE-ID;VALUE=DATE:$now.year.1:0428
+DTSTART;VALUE=DATE:$now.year.1:0428
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 10
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT20M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/put/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/8.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/8.ics 2012-08-31 18:55:58 UTC (rev 9760)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-8 at example.com
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 8
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/put/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/9.ics 2012-08-31 18:55:58 UTC (rev 9760)
@@ -0,0 +1,21 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-8 at example.com
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 8
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT5M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2012-08-31 17:08:56 UTC (rev 9759)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2012-08-31 18:55:58 UTC (rev 9760)
@@ -75,6 +75,7 @@
<feature>private-events</feature> <!-- private-events extension -->
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
+ <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
<feature>query-extended</feature> <!-- calendar-query-extended extension -->
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-08-31 17:08:56 UTC (rev 9759)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-08-31 18:55:58 UTC (rev 9760)
@@ -75,6 +75,7 @@
<feature>private-events</feature> <!-- private-events extension -->
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
+ <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
<feature>query-extended</feature> <!-- calendar-query-extended extension -->
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-08-31 17:08:56 UTC (rev 9759)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-08-31 18:55:58 UTC (rev 9760)
@@ -75,6 +75,7 @@
<feature>private-events</feature> <!-- private-events extension -->
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
+ <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
<feature>query-extended</feature> <!-- calendar-query-extended extension -->
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2012-08-31 17:08:56 UTC (rev 9759)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2012-08-31 18:55:58 UTC (rev 9760)
@@ -76,6 +76,7 @@
<feature>private-events</feature> <!-- private-events extension -->
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<!-- <feature>proxy-authz</feature> --> <!-- sudo user extension -->
+ <feature>remove-duplicate-alarms</feature> <!-- Server removes any duplicate alarms on PUT -->
<feature>query-extended</feature> <!-- calendar-query-extended extension -->
<feature>shared-calendars</feature> <!-- Shared calendars extension -->
<feature>schedule-changes</feature> <!-- schedule-changes property extension -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml 2012-08-31 17:08:56 UTC (rev 9759)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml 2012-08-31 18:55:58 UTC (rev 9760)
@@ -1000,6 +1000,62 @@
</test>
</test-suite>
+ <test-suite name='PUTs with duplicate alarms'>
+ <require-feature>
+ <feature>remove-duplicate-alarms</feature>
+ </require-feature>
+ <test name='1' ignore='no'>
+ <description>Roundtrip encoded CN=</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/107.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/put/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/107.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/put/9.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Roundtrip encoded CN=</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/108.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/put/10.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/108.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/put/11.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120831/045f4191/attachment-0001.html>
More information about the calendarserver-changes
mailing list