[CalendarServer-changes] [10972] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 2 11:56:24 PDT 2013


Revision: 10972
          http://trac.calendarserver.org//changeset/10972
Author:   cdaboo at apple.com
Date:     2013-04-02 11:56:24 -0700 (Tue, 02 Apr 2013)
Log Message:
-----------
Test that X- property is added for unscheduled events created on location or resource calendars.

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/tests/CalDAV/calendaruserproxy.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/put/12.ics

Added: CalDAVTester/trunk/Resource/CalDAV/put/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/put/12.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/put/12.ics	2013-04-02 18:56:24 UTC (rev 10972)
@@ -0,0 +1,12 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-1 at example.com
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+X-CALENDARSERVER-MODIFIED-BY;CN=User 01;EMAIL="mailto:user01 at example.com":urn:uuid:user01
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2013-04-02 14:35:45 UTC (rev 10971)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml	2013-04-02 18:56:24 UTC (rev 10972)
@@ -70,6 +70,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<feature>location-resource-tracking</feature>   <!-- Server tracks who makes unscheduled changes to locations and resources -->
 		<feature>managed-attachments</feature>			<!-- CalDAV Managed Attachments -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<feature>no-duplicate-uids</feature>			<!-- duplicate UIDs in same home not supported -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2013-04-02 14:35:45 UTC (rev 10971)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2013-04-02 18:56:24 UTC (rev 10972)
@@ -70,6 +70,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<feature>location-resource-tracking</feature>   <!-- Server tracks who makes unscheduled changes to locations and resources -->
 		<feature>managed-attachments</feature>			<!-- CalDAV Managed Attachments -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<feature>no-duplicate-uids</feature>			<!-- duplicate UIDs in same home not supported -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2013-04-02 14:35:45 UTC (rev 10971)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2013-04-02 18:56:24 UTC (rev 10972)
@@ -70,6 +70,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<feature>location-resource-tracking</feature>   <!-- Server tracks who makes unscheduled changes to locations and resources -->
 		<feature>managed-attachments</feature>			<!-- CalDAV Managed Attachments -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml	2013-04-02 14:35:45 UTC (rev 10971)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml	2013-04-02 18:56:24 UTC (rev 10972)
@@ -37,7 +37,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='OPTIONS header' ignore="no">
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag</description>
 			<request print-response="no">
@@ -58,7 +58,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Principal resources' ignore="no">
+	<test-suite name='Principal resources'>
 		<test name='1'>
 			<description>Look for proxy principals</description>
 			<request print-response="no">
@@ -133,7 +133,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Group membership' ignore="no">
+	<test-suite name='Group membership'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
 			<request print-response="no">
@@ -778,7 +778,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Principal report' ignore="no">
+	<test-suite name='Principal report'>
 		<test name='1'>
 			<description>Add user02 and user03 as read-write proxy for user01</description>
 			<request print-response="no">
@@ -825,7 +825,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Valid self report with DAV:prop</description>
 			<request user='$userid2:' pswd='$pswd2:' print-response='no'>
 				<method>REPORT</method>
@@ -868,7 +868,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Proxy For properties' ignore="no">
+	<test-suite name='Proxy For properties'>
 		<test name='1'>
 			<description>Default setup</description>
 			<request print-response="no">
@@ -1000,7 +1000,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Expand properties' ignore="no">
+	<test-suite name='Expand properties'>
 		<test name='1'>
 			<description>OK property query</description>
 			<request print-response="no">
@@ -1129,7 +1129,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Calendar Home cache invalidation' ignore="no">
+	<test-suite name='Calendar Home cache invalidation'>
 		<test name='1'>
 			<description>Cannot access user2 calendar home</description>
 			<request print-response="no">
@@ -1228,7 +1228,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Calendar Home properties' ignore="no">
+	<test-suite name='Calendar Home properties'>
 		<test name='1'>
 			<description>Cannot access user2 calendar home</description>
 			<request print-response="no">
@@ -1563,6 +1563,40 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='Location/Resource tracking'>
+		<require-feature>
+			<feature>location-resource-tracking</feature>
+		</require-feature>
+		<test name='1'>
+			<description>Store in resource collections</description>
+			<request end-delete="yes">
+				<method>PUT</method>
+				<ruri>$rcalendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/put/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Store in resource collections</description>
+			<request print-response="no">
+				<method>GET</method>
+				<ruri>$rcalendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/put/12.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request>
 			<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130402/1471b069/attachment-0001.html>


More information about the calendarserver-changes mailing list