[CalendarServer-changes] [5717] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Jun 10 12:26:28 PDT 2010


Revision: 5717
          http://trac.macosforge.org/projects/calendarserver/changeset/5717
Author:   cdaboo at apple.com
Date:     2010-06-10 12:26:24 -0700 (Thu, 10 Jun 2010)
Log Message:
-----------
Add additional client profile.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/
    CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/1.xml
    CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/2.xml
    CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/
    CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/1.xml
    CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/2.xml

Removed Paths:
-------------
    CalDAVTester/trunk/Resource/CalDAV/ical-client/1.xml
    CalDAVTester/trunk/Resource/CalDAV/ical-client/2.xml

Deleted: CalDAVTester/trunk/Resource/CalDAV/ical-client/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ical-client/1.xml	2010-06-10 16:42:26 UTC (rev 5716)
+++ CalDAVTester/trunk/Resource/CalDAV/ical-client/1.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<x0:propfind xmlns:x2="http://calendarserver.org/ns/" xmlns:x1="urn:ietf:params:xml:ns:caldav" xmlns:x0="DAV:">
- <x0:prop>
-  <x1:calendar-home-set/>
-  <x1:calendar-user-address-set/>
-  <x1:schedule-inbox-URL/>
-  <x1:schedule-outbox-URL/>
-  <x2:dropbox-home-URL/>
-  <x2:notifications-URL/>
-  <x0:displayname/>
- </x0:prop>
-</x0:propfind>

Deleted: CalDAVTester/trunk/Resource/CalDAV/ical-client/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ical-client/2.xml	2010-06-10 16:42:26 UTC (rev 5716)
+++ CalDAVTester/trunk/Resource/CalDAV/ical-client/2.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<x0:propfind xmlns:x1="http://calendarserver.org/ns/" xmlns:x0="DAV:" xmlns:x3="http://apple.com/ns/ical/" xmlns:x2="urn:ietf:params:xml:ns:caldav">
- <x0:prop>
-  <x1:getctag/>
-  <x0:displayname/>
-  <x2:calendar-description/>
-  <x3:calendar-color/>
-  <x3:calendar-order/>
-  <x0:resourcetype/>
-  <x2:calendar-free-busy-set/>
- </x0:prop>
-</x0:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/1.xml (from rev 5638, CalDAVTester/trunk/Resource/CalDAV/ical-client/1.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/1.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<x0:propfind xmlns:x2="http://calendarserver.org/ns/" xmlns:x1="urn:ietf:params:xml:ns:caldav" xmlns:x0="DAV:">
+ <x0:prop>
+  <x1:calendar-home-set/>
+  <x1:calendar-user-address-set/>
+  <x1:schedule-inbox-URL/>
+  <x1:schedule-outbox-URL/>
+  <x2:dropbox-home-URL/>
+  <x2:notifications-URL/>
+  <x0:displayname/>
+ </x0:prop>
+</x0:propfind>

Copied: CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/2.xml (from rev 5638, CalDAVTester/trunk/Resource/CalDAV/ical-client/2.xml)
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/ical-client/client1/2.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<x0:propfind xmlns:x1="http://calendarserver.org/ns/" xmlns:x0="DAV:" xmlns:x3="http://apple.com/ns/ical/" xmlns:x2="urn:ietf:params:xml:ns:caldav">
+ <x0:prop>
+  <x1:getctag/>
+  <x0:displayname/>
+  <x2:calendar-description/>
+  <x3:calendar-color/>
+  <x3:calendar-order/>
+  <x0:resourcetype/>
+  <x2:calendar-free-busy-set/>
+ </x0:prop>
+</x0:propfind>

Added: CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/1.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/1.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<x0:propfind xmlns:x1="urn:ietf:params:xml:ns:caldav" xmlns:x0="DAV:" xmlns:x2="http://calendarserver.org/ns/">
+ <x0:prop>
+  <x0:principal-collection-set/>
+  <x1:calendar-home-set/>
+  <x1:calendar-user-address-set/>
+  <x1:schedule-inbox-URL/>
+  <x1:schedule-outbox-URL/>
+  <x2:dropbox-home-URL/>
+  <x2:notification-URL/>
+  <x0:displayname/>
+  <x0:principal-URL/>
+  <x0:supported-report-set/>
+ </x0:prop>
+</x0:propfind>

Added: CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/2.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/ical-client/client2/2.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<x0:propfind xmlns:x0="DAV:" xmlns:x3="http://apple.com/ns/ical/" xmlns:x1="http://calendarserver.org/ns/" xmlns:x2="urn:ietf:params:xml:ns:caldav">
+ <x0:prop>
+  <x1:xmpp-server/>
+  <x1:xmpp-uri/>
+  <x1:getctag/>
+  <x0:displayname/>
+  <x2:calendar-description/>
+  <x3:calendar-color/>
+  <x3:calendar-order/>
+  <x2:supported-calendar-component-set/>
+  <x0:resourcetype/>
+  <x0:owner/>
+  <x2:calendar-free-busy-set/>
+  <x2:schedule-calendar-transp/>
+  <x2:schedule-default-calendar-URL/>
+  <x0:quota-available-bytes/>
+  <x0:quota-used-bytes/>
+  <x2:calendar-timezone/>
+  <x0:current-user-privilege-set/>
+  <x1:source/>
+  <x1:subscribed-strip-alarms/>
+  <x1:subscribed-strip-attachments/>
+  <x1:subscribed-strip-todos/>
+  <x3:refreshrate/>
+  <x1:push-transports/>
+  <x1:pushkey/>
+  <x1:publish-url/>
+  <x1:allowed-sharing-modes/>
+ </x0:prop>
+</x0:propfind>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml	2010-06-10 16:42:26 UTC (rev 5716)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml	2010-06-10 19:26:24 UTC (rev 5717)
@@ -27,7 +27,7 @@
 
 	<start/>
 	
-	<test-suite name='Account setup'>
+	<test-suite name='Account setup - client 1' ignore='no'>
 		<test name='1'>
 			<description>PROPFIND principal - no authentication</description>
 			<request auth="no">
@@ -39,7 +39,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ical-client/1.xml</filepath>
+					<filepath>Resource/CalDAV/ical-client/client1/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -61,7 +61,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ical-client/1.xml</filepath>
+					<filepath>Resource/CalDAV/ical-client/client1/1.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -74,7 +74,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Polling'>
+	<test-suite name='Polling - client 1' ignore='no'>
 		<test name='1'>
 			<description>PROPFIND calendar home</description>
 			<request print-response="no">
@@ -86,7 +86,7 @@
 				</header>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/ical-client/2.xml</filepath>
+					<filepath>Resource/CalDAV/ical-client/client1/2.xml</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -99,6 +99,78 @@
 		</test>
 	</test-suite>
 	
+	<test-suite name='Account setup - client 2' ignore='no'>
+		<test name='1'>
+			<description>PROPFIND principal - no authentication</description>
+			<request auth="no">
+				<method>PROPFIND</method>
+				<ruri>$principal1:</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/ical-client/client2/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>401</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>PROPFIND principal - with authentication</description>
+			<request>
+				<method>PROPFIND</method>
+				<ruri>$principal1:</ruri>
+				<header>
+					<name>Depth</name>
+					<value>0</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/ical-client/client2/1.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>207</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+	
+	<test-suite name='Polling - client 2' ignore='no'>
+		<test name='1'>
+			<description>PROPFIND calendar home</description>
+			<request print-response="no">
+				<method>PROPFIND</method>
+				<ruri>$pathprefix1:/</ruri>
+				<header>
+					<name>Depth</name>
+					<value>1</value>
+				</header>
+				<data>
+					<content-type>text/xml; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/ical-client/client2/2.xml</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>207</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/20100610/cc3704c1/attachment-0001.html>


More information about the calendarserver-changes mailing list