[CalendarServer-changes] [80] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Aug 30 07:41:04 PDT 2006


Revision: 80
Author:   cdaboo at apple.com
Date:     2006-08-30 07:41:01 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Use dataMatch verify on response body to do proper check without printing out the response.

Modified Paths:
--------------
    CalDAVTester/trunk/aclreports.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/aclreports/18.xml
    CalDAVTester/trunk/Resource/aclreports/19.xml
    CalDAVTester/trunk/Resource/aclreports/20.xml

Added: CalDAVTester/trunk/Resource/aclreports/18.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/18.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/aclreports/18.xml	2006-08-30 14:41:01 UTC (rev 80)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<principal-search-property-set xmlns='DAV:'>
+  <principal-search-property>
+    <prop>
+      <displayname/>
+    </prop>
+    <description xml:lang='en'>Display Name</description>
+  </principal-search-property>
+  <principal-search-property>
+    <prop>
+      <calendar-user-address-set xmlns='urn:ietf:params:xml:ns:caldav'/>
+    </prop>
+    <description xml:lang='en'>Calendar User Addresses</description>
+  </principal-search-property>
+</principal-search-property-set>

Added: CalDAVTester/trunk/Resource/aclreports/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/19.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/aclreports/19.xml	2006-08-30 14:41:01 UTC (rev 80)
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<multistatus xmlns='DAV:'>
+  <response>
+    <href>/calendars/users/user01/calendar/1.ics</href>
+    <propstat>
+      <prop>
+        <supported-report-set>
+          <supported-report>
+            <report>
+              <acl-principal-prop-set/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-match/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-property-search/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <calendar-multiget xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+        </supported-report-set>
+      </prop>
+      <status>HTTP/1.1 200 OK</status>
+    </propstat>
+  </response>
+</multistatus>

Added: CalDAVTester/trunk/Resource/aclreports/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/aclreports/20.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/aclreports/20.xml	2006-08-30 14:41:01 UTC (rev 80)
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<multistatus xmlns='DAV:'>
+  <response>
+    <href>/principals/users/</href>
+    <propstat>
+      <prop>
+        <supported-report-set>
+          <supported-report>
+            <report>
+              <acl-principal-prop-set/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-match/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-property-search/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <calendar-multiget xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <free-busy-query xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-search-property-set/>
+            </report>
+          </supported-report>
+        </supported-report-set>
+      </prop>
+      <status>HTTP/1.1 200 OK</status>
+    </propstat>
+  </response>
+  <response>
+    <href>/principals/users/user01</href>
+    <propstat>
+      <prop>
+        <supported-report-set>
+          <supported-report>
+            <report>
+              <acl-principal-prop-set/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-match/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <principal-property-search/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+          <supported-report>
+            <report>
+              <calendar-multiget xmlns='urn:ietf:params:xml:ns:caldav'/>
+            </report>
+          </supported-report>
+        </supported-report-set>
+      </prop>
+      <status>HTTP/1.1 200 OK</status>
+    </propstat>
+  </response>
+</multistatus>

Modified: CalDAVTester/trunk/aclreports.xml
===================================================================
--- CalDAVTester/trunk/aclreports.xml	2006-08-30 14:39:54 UTC (rev 79)
+++ CalDAVTester/trunk/aclreports.xml	2006-08-30 14:41:01 UTC (rev 80)
@@ -548,7 +548,7 @@
 		</test>
 		<test name='4' ignore='no'>
 			<description>Valid report</description>
-			<request print-response='yes'>
+			<request print-response='no'>
 				<method>REPORT</method>
 				<ruri>/principals/users/</ruri>
 				<data>
@@ -558,6 +558,13 @@
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/aclreports/18.xml</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>
@@ -565,7 +572,7 @@
 	<test-suite name='supported-report-set property' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>Regular resource</description>
-			<request print-response='yes'>
+			<request print-response='no'>
 				<method>PROPFIND</method>
 				<header>
 					<name>Depth</name>
@@ -583,11 +590,18 @@
 						<value>207</value>
 					</arg>
 				</verify>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/aclreports/19.xml</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 		<test name='2' ignore='no'>
 			<description>Regular resource</description>
-			<request print-response='yes'>
+			<request print-response='no'>
 				<method>PROPFIND</method>
 				<header>
 					<name>Depth</name>
@@ -605,6 +619,13 @@
 						<value>207</value>
 					</arg>
 				</verify>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/aclreports/20.xml</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060830/1a4e9d2e/attachment.html


More information about the calendarserver-changes mailing list