[CalendarServer-changes] [8609] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 31 11:34:47 PST 2012
Revision: 8609
http://trac.macosforge.org/projects/calendarserver/changeset/8609
Author: cdaboo at apple.com
Date: 2012-01-31 11:34:47 -0800 (Tue, 31 Jan 2012)
Log Message:
-----------
Test that ACTION:NONE default alarm is not added to iCalendar data on PUT.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/default-alarms/cleanup/1.xml
CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/default-alarms/properties/9.xml
CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics
Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/cleanup/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/cleanup/1.xml 2012-01-31 18:39:03 UTC (rev 8608)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/cleanup/1.xml 2012-01-31 19:34:47 UTC (rev 8609)
@@ -3,9 +3,9 @@
<D:remove>
<D:prop>
<C:default-alarm-vevent-datetime/>
+<C:default-alarm-vevent-date/>
+<C:default-alarm-vtodo-datetime/>
<C:default-alarm-vtodo-date/>
-<C:default-alarm-vevent-datetime/>
-<C:default-alarm-vtodo-date/>
</D:prop>
</D:remove>
</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/default-alarms/properties/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/properties/9.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/properties/9.xml 2012-01-31 19:34:47 UTC (rev 8609)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+ <C:default-alarm-vevent-datetime><![CDATA[BEGIN:VALARM
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEA
+ACTION:NONE
+END:VALARM
+]]></C:default-alarm-vevent-datetime>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/9.ics 2012-01-31 19:34:47 UTC (rev 8609)
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-9 at example.com
+DTSTART:20110427T000000Z
+DURATION:P1DT
+DTSTAMP:20110427T000000Z
+SUMMARY:event 9
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml 2012-01-31 18:39:03 UTC (rev 8608)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml 2012-01-31 19:34:47 UTC (rev 8609)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2011 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2012 Apple Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
limitations under the License.
-->
-<caldavtest ignore-all='yes'>
+<caldavtest>
<description>Test default alarm behavior</description>
<require-feature>
@@ -842,6 +842,63 @@
</test>
</test-suite>
+ <test-suite name='PUT with ACTION:NONE' ignore='no'>
+ <test name='1'>
+ <description>Set ACTION:NONE on home</description>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/default-alarms/properties/9.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{urn:ietf:params:xml:ns:caldav}default-alarm-vevent-datetime</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>PUT non-recurring timed event - no alarm added from home</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/9.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/default-alarms/put/9.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>ETag</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/9.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/default-alarms/put/9.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end>
<request>
<method>PROPPATCH</method>
@@ -867,6 +924,18 @@
<filepath>Resource/CalDAV/default-alarms/cleanup/1.xml</filepath>
</data>
</request>
+ <request>
+ <method>PROPPATCH</method>
+ <ruri>$taskspath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/default-alarms/cleanup/1.xml</filepath>
+ </data>
+ </request>
<request user="$userid2:" pswd="$pswd2:">
<method>PROPPATCH</method>
<ruri>$calendarhome2:/</ruri>
@@ -884,8 +953,10 @@
<ruri>$notificationpath1:/</ruri>
<ruri>$notificationpath2:/</ruri>
<ruri>$calendarpath1:/</ruri>
+ <ruri>$taskspath1:/</ruri>
<ruri>$inboxpath1:/</ruri>
<ruri>$calendarpath2:/</ruri>
+ <ruri>$taskspath2:/</ruri>
<ruri>$inboxpath2:/</ruri>
</request>
</end>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120131/43ea5f02/attachment-0001.html>
More information about the calendarserver-changes
mailing list