[CalendarServer-changes] [7412] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 4 13:10:51 PDT 2011
Revision: 7412
http://trac.macosforge.org/projects/calendarserver/changeset/7412
Author: cdaboo at apple.com
Date: 2011-05-04 13:10:51 -0700 (Wed, 04 May 2011)
Log Message:
-----------
Tests for default addressbook behavior.
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
Added Paths:
-----------
CalDAVTester/trunk/Resource/CardDAV/default-addressbook/
CalDAVTester/trunk/Resource/CardDAV/default-addressbook/1.xml
CalDAVTester/trunk/Resource/CardDAV/default-addressbook/2.xml
CalDAVTester/trunk/Resource/CardDAV/default-addressbook/3.xml
CalDAVTester/trunk/Resource/CardDAV/default-addressbook/4.xml
CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml
Added: CalDAVTester/trunk/Resource/CardDAV/default-addressbook/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/default-addressbook/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/default-addressbook/1.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+<D:prop>
+<C:default-addressbook-URL/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/CardDAV/default-addressbook/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/default-addressbook/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/default-addressbook/2.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+<D:set>
+<D:prop>
+<C:default-addressbook-URL><D:href>$addressbookhome1:/bogus/</D:href></C:default-addressbook-URL>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CardDAV/default-addressbook/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/default-addressbook/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/default-addressbook/3.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+<D:set>
+<D:prop>
+<C:default-addressbook-URL><D:href>$addressbookhome1:/adbktest1/</D:href></C:default-addressbook-URL>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Added: CalDAVTester/trunk/Resource/CardDAV/default-addressbook/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/default-addressbook/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/default-addressbook/4.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+<D:set>
+<D:prop>
+<C:default-addressbook-URL><D:href>$addressbookpath1:/</D:href></C:default-addressbook-URL>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2011-05-04 03:10:27 UTC (rev 7411)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -45,7 +45,7 @@
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>limits</feature> <!-- max-collections and max-resources limits -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
- <feature>quota-on-resources</feature> <!-- WebDAV QUOTA on calendar and address book object resources -->
+ <!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
<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 -->
@@ -60,7 +60,7 @@
<feature>EMAIL parameter</feature> <!-- Server normalizes cuaddress and adds EMAIL parameter -->
<feature>implicit-scheduling</feature> <!-- CalDAV scheduling - implicit -->
<feature>maskuid</feature> <!-- maskuid extension -->
- <feature>partitioning</feature> <!-- Partitioned server -->
+ <feature>partitioning</feature> <!-- Partitioned server -->
<feature>private-comments</feature> <!-- private-comments extension -->
<feature>private-events</feature> <!-- private-events extension -->
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
@@ -73,7 +73,10 @@
<!-- CardDAV specific extension -->
<feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
+ <feature>default-addressbook</feature> <!-- Default address book behavior -->
<feature>global-addressbook</feature> <!-- Global address book for each user -->
+ <feature>shared-addressbooks</feature> <!-- Shared address books extension -->
+ <!-- <feature>directory-gateway</feature> --> <!-- Directory gateway extension -->
</features>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2011-05-04 03:10:27 UTC (rev 7411)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -73,6 +73,7 @@
<!-- CardDAV specific extension -->
<feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
+ <feature>default-addressbook</feature> <!-- Default address book behavior -->
<feature>global-addressbook</feature> <!-- Global address book for each user -->
<feature>shared-addressbooks</feature> <!-- Shared address books extension -->
<!-- <feature>directory-gateway</feature> --> <!-- Directory gateway extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-05-04 03:10:27 UTC (rev 7411)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -73,6 +73,7 @@
<!-- CardDAV specific extension -->
<feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
+ <feature>default-addressbook</feature> <!-- Default address book behavior -->
<feature>global-addressbook</feature> <!-- Global address book for each user -->
<feature>shared-addressbooks</feature> <!-- Shared address books extension -->
<!-- <feature>directory-gateway</feature> --> <!-- Directory gateway extension -->
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2011-05-04 03:10:27 UTC (rev 7411)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -46,7 +46,7 @@
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>limits</feature> <!-- max-collections and max-resources limits -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
- <feature>quota-on-resources</feature> <!-- WebDAV QUOTA on calendar and address book object resources -->
+ <!-- <feature>quota-on-resources</feature> --> <!-- WebDAV QUOTA on calendar and address book object resources -->
<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 -->
@@ -74,7 +74,10 @@
<!-- CardDAV specific extension -->
<feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
+ <feature>default-addressbook</feature> <!-- Default address book behavior -->
<feature>global-addressbook</feature> <!-- Global address book for each user -->
+ <feature>shared-addressbooks</feature> <!-- Shared address books extension -->
+ <!-- <feature>directory-gateway</feature> --> <!-- Directory gateway extension -->
</features>
Added: CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml 2011-05-04 20:10:51 UTC (rev 7412)
@@ -0,0 +1,241 @@
+<?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>carddav</feature>
+ <feature>default-addressbook</feature>
+ </require-feature>
+
+ <start/>
+
+ <test-suite name='Existing property'>
+ <test name='1'>
+ <description>PROPFIND on home</description>
+ <request end-delete='yes'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookpath1:</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Change property'>
+ <test name='1'>
+ <description>MKCOL with correct request body</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'>
+ <description>Set invalid property on home</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Set property on home</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PROPFIND on home</description>
+ <request end-delete='yes'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookhome1:/adbktest1</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Move delete'>
+ <test name='1'>
+ <description>MOVE</description>
+ <request end-delete='yes'>
+ <method>MOVE</method>
+ <ruri>$addressbookhome1:/adbktest1/</ruri>
+ <header>
+ <name>Destination</name>
+ <value>$host:$addressbookhome1:/adbktest2/</value>
+ </header>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PROPFIND on home</description>
+ <request end-delete='yes'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookhome1:/adbktest2</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='No default delete'>
+ <test name='1'>
+ <description>DELETE</description>
+ <request end-delete='yes'>
+ <method>DELETE</method>
+ <ruri>$addressbookhome1:/adbktest2/</ruri>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{urn:ietf:params:xml:ns:carddav}default-addressbook-delete-allowed</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Set property on home</description>
+ <request print-response='no'>
+ <method>PROPPATCH</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>DELETE</description>
+ <request end-delete='yes'>
+ <method>DELETE</method>
+ <ruri>$addressbookhome1:/adbktest2/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PROPFIND on home</description>
+ <request end-delete='yes'>
+ <method>PROPFIND</method>
+ <ruri>$addressbookhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookpath1:</href>]]></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/20110504/f421a68b/attachment-0001.html>
More information about the calendarserver-changes
mailing list