[CalendarServer-changes] [5572] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu May 6 18:44:55 PDT 2010
Revision: 5572
http://trac.macosforge.org/projects/calendarserver/changeset/5572
Author: cdaboo at apple.com
Date: 2010-05-06 18:44:51 -0700 (Thu, 06 May 2010)
Log Message:
-----------
Test for DAV:resource-id.
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/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/Common/PROPFIND/resourceid.xml
CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml
Added: CalDAVTester/trunk/Resource/Common/PROPFIND/resourceid.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/PROPFIND/resourceid.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/PROPFIND/resourceid.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resource-id/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-05-06 18:11:00 UTC (rev 5571)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -43,6 +43,7 @@
<feature>extended-principal-search</feature> <!-- Extended principal-property-search REPORT extension -->
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>well-known</feature> <!-- well-known feature -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-05-06 18:11:00 UTC (rev 5571)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -43,6 +43,7 @@
<feature>extended-principal-search</feature> <!-- Extended principal-property-search REPORT extension -->
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>well-known</feature> <!-- well-known feature -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-05-06 18:11:00 UTC (rev 5571)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -43,6 +43,7 @@
<feature>extended-principal-search</feature> <!-- Extended principal-property-search REPORT extension -->
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>well-known</feature> <!-- well-known feature -->
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-05-06 18:11:00 UTC (rev 5571)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -44,6 +44,7 @@
<feature>extended-principal-search</feature> <!-- Extended principal-property-search REPORT extension -->
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>resource-id</feature> <!-- WebDAV BIND DAV:resource-id property -->
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>well-known</feature> <!-- well-known feature -->
Added: CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -0,0 +1,110 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>resource-id</feature>
+ </require-feature>
+
+ <start/>
+
+ <test-suite name='Calendar with move'>
+ <test name='1'>
+ <description>Simple MKCALENDAR</description>
+ <request end-delete='yes'>
+ <method>MKCALENDAR</method>
+ <ruri>$pathprefix1:/caltest1/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>201</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Check property</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/caltest1/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:resource-id</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>MOVE to new calendar</description>
+ <request>
+ <method>MOVE</method>
+ <ruri>$pathprefix1:/caltest1/</ruri>
+ <header>
+ <name>Destination</name>
+ <value>$host:$pathprefix1:/caltest-moved/</value>
+ </header>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>2xx</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>Check property</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/caltest-moved/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:resource-id</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml 2010-05-06 18:11:00 UTC (rev 5571)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/global-addressbook.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -214,6 +214,60 @@
</test>
</test-suite>
+ <test-suite name='Resource-ID'>
+ <require-feature>
+ <feature>resource-id</feature>
+ </require-feature>
+ <test name='1' ignore='no'>
+ <description>Check property for user 1</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/$global_addressbook:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:resource-id</value>
+ </arg>
+ </verify>
+ <grabproperty>
+ <property>DAV:resource-id</property>
+ <variable>$resourceid:</variable>
+ </grabproperty>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Check property for user 2</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome2:/$global_addressbook:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:resource-id$$resourceid:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
Added: CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/resourceid.xml 2010-05-07 01:44:51 UTC (rev 5572)
@@ -0,0 +1,114 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<caldavtest>
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>resource-id</feature>
+ </require-feature>
+
+ <start/>
+
+ <test-suite name='Address book with move'>
+ <test name='1'>
+ <description>Simple MKCOL</description>
+ <request end-delete='yes'>
+ <method>MKCOL</method>
+ <ruri>$addressbookhome1:/adbktest1/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>201</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>Check property</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/adbktest1/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:resource-id</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>MOVE to new address book</description>
+ <request>
+ <method>MOVE</method>
+ <ruri>$addressbookhome1:/adbktest1/</ruri>
+ <header>
+ <name>Destination</name>
+ <value>$host:$addressbookhome1:/adbktest-moved/</value>
+ </header>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>2xx</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>Check property</description>
+ <request print-response='no'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/adbktest-moved/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/resourceid.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:resource-id</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/20100506/4388b954/attachment-0001.html>
More information about the calendarserver-changes
mailing list