[CalendarServer-changes] [5466] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sat Apr 10 13:07:10 PDT 2010
Revision: 5466
http://trac.macosforge.org/projects/calendarserver/changeset/5466
Author: cdaboo at apple.com
Date: 2010-04-10 13:07:06 -0700 (Sat, 10 Apr 2010)
Log Message:
-----------
Tests for add-member extension.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CardDAV/add-member/
CalDAVTester/trunk/Resource/CardDAV/add-member/1.xml
CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
Added: CalDAVTester/trunk/Resource/CardDAV/add-member/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/add-member/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/add-member/1.xml 2010-04-10 20:07:06 UTC (rev 5466)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:add-member/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-04-09 20:53:24 UTC (rev 5465)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-04-10 20:07:06 UTC (rev 5466)
@@ -36,7 +36,7 @@
<feature>principal-property-search REPORT</feature> <!-- ACL principal-property-search REPORT -->
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
- <!-- <feature>add-member</feature> --> <!-- Add-member used to create resources -->
+ <feature>add-member</feature> <!-- Add-member used to create resources -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
<feature>directory listing</feature> <!-- GET on collection -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-04-09 20:53:24 UTC (rev 5465)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-04-10 20:07:06 UTC (rev 5466)
@@ -36,7 +36,7 @@
<feature>principal-property-search REPORT</feature> <!-- ACL principal-property-search REPORT -->
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
- <!-- <feature>add-member</feature> --> <!-- Add-member used to create resources -->
+ <feature>add-member</feature> <!-- Add-member used to create resources -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
<feature>directory listing</feature> <!-- GET on collection -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml 2010-04-09 20:53:24 UTC (rev 5465)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml 2010-04-10 20:07:06 UTC (rev 5466)
@@ -108,7 +108,7 @@
<method>GET</method>
<ruri>$posted:/</ruri>
<verify>
- <callback>dataMatch</callback>
+ <callback>calendarDataMatch</callback>
<arg>
<name>filepath</name>
<value>Resource/CalDAV/recurrenceput/1.txt</value>
Added: CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml 2010-04-10 20:07:06 UTC (rev 5466)
@@ -0,0 +1,128 @@
+<?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>
+ <description>Test PUT method in CardDAV</description>
+
+ <require-feature>
+ <feature>carddav</feature>
+ <feature>add-member</feature>
+ </require-feature>
+
+ <start/>
+
+ <test-suite name='DAV:add-member property'>
+ <test name='1'>
+ <description>PROPFIND on calendar</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$addressbookpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/add-member/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[DAV:add-member$<href>$addressbookpath1:/;add-member</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PROPFIND on address book home</description>
+ <request>
+ <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/add-member/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>DAV:add-member</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='POST VCARD' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>POST simple vCard</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$addressbookpath1:/;add-member</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/vcardput/1.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>status</arg>
+ <value>201</value>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Location</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Location</name>
+ <variable>$posted:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <request>
+ <method>GET</method>
+ <ruri>$posted:/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/vcardput/1.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$addressbookpath1:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100410/32c9b440/attachment.html>
More information about the calendarserver-changes
mailing list