[CalendarServer-changes] [8425] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 8425
          http://trac.macosforge.org/projects/calendarserver/changeset/8425
Author:   cdaboo at apple.com
Date:     2011-12-12 10:28:54 -0800 (Mon, 12 Dec 2011)
Log Message:
-----------
Adjust tests now that per-user default alarm properties are not protected.

Modified Paths:
--------------
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/5.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/9.xml

Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/5.xml	2011-12-12 01:22:15 UTC (rev 8424)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/5.xml	2011-12-12 18:28:54 UTC (rev 8425)
@@ -2,7 +2,13 @@
 <D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
 <D:set>
 <D:prop>
-    <C:default-alarm-vevent-datetime/>
+    <C:default-alarm-vevent-datetime><![CDATA[BEGIN:VALARM
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+TRIGGER:-PT15M
+ACTION:DISPLAY
+END:VALARM
+]]></C:default-alarm-vevent-datetime>
 </D:prop>
 </D:set>
 </D:propertyupdate>

Added: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/9.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/9.xml	2011-12-12 18:28:54 UTC (rev 8425)
@@ -0,0 +1,8 @@
+<?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/>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml	2011-12-12 01:22:15 UTC (rev 8424)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml	2011-12-12 18:28:54 UTC (rev 8425)
@@ -19,7 +19,7 @@
  -->
 
 <caldavtest ignore-all='yes'>
-	<description>Test default alarml behavior</description>
+	<description>Test default alarm behavior</description>
 
 	<require-feature>
 		<feature>caldav</feature>
@@ -518,7 +518,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Shared calendars - no default' ignore='no'>
+	<test-suite name='Shared calendars - initially empty default' ignore='no'>
 		<test name='1'>
 			<description>Good property on home</description>
 			<request user="$userid2:" pswd="$pswd2:">
@@ -631,7 +631,7 @@
 			</request>
 		</test>
 		<test name='7'>
-			<description>Protected property on calendar</description>
+			<description>Not protected property on calendar</description>
 			<request>
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar:/</ruri>
@@ -646,7 +646,7 @@
 				<verify>
 					<callback>propfindItems</callback>
 					<arg>
-						<name>badprops</name>
+						<name>okprops</name>
 						<value>{urn:ietf:params:xml:ns:caldav}default-alarm-vevent-datetime</value>
 					</arg>
 				</verify>
@@ -738,6 +738,28 @@
 				</verify>
 			</request>
 		</test>
+		<test name='10'>
+			<description>Empty property on calendar</description>
+			<request>
+				<method>PROPPATCH</method>
+				<ruri>$sharedcalendar:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/default-alarms/sharing/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-suite>
 
 	<test-suite name='Scheduling' ignore='no'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111212/7cb7132c/attachment.html>