[CalendarServer-changes] [4943] CalDAVTester/branches/users/cdaboo/deployment/scripts

source_changes at macosforge.org source_changes at macosforge.org
Wed Jan 20 11:27:22 PST 2010


Revision: 4943
          http://trac.macosforge.org/projects/calendarserver/changeset/4943
Author:   cdaboo at apple.com
Date:     2010-01-20 11:27:20 -0800 (Wed, 20 Jan 2010)
Log Message:
-----------
Test to make sure COPY/MOVE Destination URIs can be either of http or https types.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml
    CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml
    CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/privateevents.xml

Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml	2010-01-19 20:23:58 UTC (rev 4942)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml	2010-01-20 19:27:20 UTC (rev 4943)
@@ -29,6 +29,10 @@
 			<key>$host:</key>
 			<value>http://localhost:8008</value>
 		</substitution>
+		<substitution>
+			<key>$hostalt:</key>
+			<value>https://localhost:8443</value> <!-- Should be the other scheme variant -->
+		</substitution>
 
 		<!-- relative path to principal collection-->
 		<substitution>

Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml	2010-01-19 20:23:58 UTC (rev 4942)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml	2010-01-20 19:27:20 UTC (rev 4943)
@@ -546,6 +546,53 @@
 		</test>
 	</test-suite>
 
+	<test-suite name='COPY/MOVE alternate host Destination URI' ignore='no'>
+		<test name='1'>
+			<description>COPY to different calendar, existing resource with overwrite</description>
+			<request>
+				<method>COPY</method>
+				<header>
+					<name>Destination</name>
+					<value>$hostalt:$pathprefix:/calendar2/copy2_1.ics</value>
+				</header>
+				<header>
+					<name>Overwrite</name>
+					<value>T</value>
+				</header>
+				<ruri>1.ics</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>204</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>MOVE to different calendar, existing resource with overwrite</description>
+			<request>
+				<method>MOVE</method>
+				<header>
+					<name>Destination</name>
+					<value>$hostalt:$pathprefix:/calendar2/copy2_1.ics</value>
+				</header>
+				<header>
+					<name>Overwrite</name>
+					<value>T</value>
+				</header>
+				<ruri>1.ics</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>2xx</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
 	<end>
 		<request>
 			<method>DELETE</method>

Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/privateevents.xml	2010-01-19 20:23:58 UTC (rev 4942)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/privateevents.xml	2010-01-20 19:27:20 UTC (rev 4943)
@@ -2903,7 +2903,7 @@
 				<method>COPY</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/copycalendar/1.ics</value>
+					<value>$host:$pathprefix:/copycalendar/1.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/1.ics</ruri>
 				<verify>
@@ -2917,7 +2917,7 @@
 				<method>COPY</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/copycalendar/2.ics</value>
+					<value>$host:$pathprefix:/copycalendar/2.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -2931,7 +2931,7 @@
 				<method>COPY</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/copycalendar/3.ics</value>
+					<value>$host:$pathprefix:/copycalendar/3.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -2945,7 +2945,7 @@
 				<method>COPY</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/copycalendar/4.ics</value>
+					<value>$host:$pathprefix:/copycalendar/4.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -2959,7 +2959,7 @@
 				<method>COPY</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/copycalendar/5.ics</value>
+					<value>$host:$pathprefix:/copycalendar/5.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -3285,7 +3285,7 @@
 				<method>MOVE</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/movecalendar/1.ics</value>
+					<value>$host:$pathprefix:/movecalendar/1.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/1.ics</ruri>
 				<verify>
@@ -3299,7 +3299,7 @@
 				<method>MOVE</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/movecalendar/2.ics</value>
+					<value>$host:$pathprefix:/movecalendar/2.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -3313,7 +3313,7 @@
 				<method>MOVE</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/movecalendar/3.ics</value>
+					<value>$host:$pathprefix:/movecalendar/3.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -3327,7 +3327,7 @@
 				<method>MOVE</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/movecalendar/4.ics</value>
+					<value>$host:$pathprefix:/movecalendar/4.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -3341,7 +3341,7 @@
 				<method>MOVE</method>
 				<header>
 					<name>Destination</name>
-					<value>$host:/$pathprefix:/movecalendar/5.ics</value>
+					<value>$host:$pathprefix:/movecalendar/5.ics</value>
 				</header>
 				<ruri>$pathprefix:/sharedcalendar/5.ics</ruri>
 				<verify>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100120/057740b1/attachment.html>


More information about the calendarserver-changes mailing list