[CalendarServer-changes] [8617] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 31 16:52:00 PST 2012
Revision: 8617
http://trac.macosforge.org/projects/calendarserver/changeset/8617
Author: cdaboo at apple.com
Date: 2012-01-31 16:51:58 -0800 (Tue, 31 Jan 2012)
Log Message:
-----------
Tests for the Brief header.
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/CalDAV/brief/
CalDAVTester/trunk/Resource/CalDAV/brief/1.xml
CalDAVTester/trunk/Resource/CalDAV/brief/2.xml
CalDAVTester/trunk/Resource/CalDAV/brief/3.xml
CalDAVTester/trunk/scripts/tests/CalDAV/brief.xml
Added: CalDAVTester/trunk/Resource/CalDAV/brief/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/brief/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/brief/1.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:resourcetype/>
+<D:bogus/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/CalDAV/brief/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/brief/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/brief/2.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:resourcetype/>
+<D:bogus/>
+</D:prop>
+<D:href>$calendarpath1:/1.ics</D:href>
+</C:calendar-multiget>
Added: CalDAVTester/trunk/Resource/CalDAV/brief/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/brief/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/brief/3.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<D:resourcetype/>
+<D:bogus/>
+</D:prop>
+<C:filter>
+<C:comp-filter name="VCALENDAR">
+<C:comp-filter name="VEVENT">
+<C:time-range start="20060101T000000Z" end="20060102T000000Z"/>
+</C:comp-filter>
+</C:comp-filter>
+</C:filter>
+</C:calendar-query>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2012-01-31 21:19:36 UTC (rev 8616)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -37,6 +37,7 @@
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
<feature>add-member</feature> <!-- Add-member used to create resources -->
+ <feature>brief</feature> <!-- Brief header for PROPFIND, REPORT -->
<feature>bulk-post</feature> <!-- Bulk POST requests -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-01-31 21:19:36 UTC (rev 8616)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -37,6 +37,7 @@
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
<feature>add-member</feature> <!-- Add-member used to create resources -->
+ <feature>brief</feature> <!-- Brief header for PROPFIND, REPORT -->
<feature>bulk-post</feature> <!-- Bulk POST requests -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-01-31 21:19:36 UTC (rev 8616)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -37,6 +37,7 @@
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
<feature>add-member</feature> <!-- Add-member used to create resources -->
+ <feature>brief</feature> <!-- Brief header for PROPFIND, REPORT -->
<feature>bulk-post</feature> <!-- Bulk POST requests -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2012-01-31 21:19:36 UTC (rev 8616)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -38,6 +38,7 @@
<feature>principal-search-property-set REPORT</feature> <!-- ACL principal-search-property-set REPORT -->
<feature>add-member</feature> <!-- Add-member used to create resources -->
+ <feature>brief</feature> <!-- Brief header for PROPFIND, REPORT -->
<feature>bulk-post</feature> <!-- Bulk POST requests -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
Added: CalDAVTester/trunk/scripts/tests/CalDAV/brief.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/brief.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/brief.xml 2012-02-01 00:51:58 UTC (rev 8617)
@@ -0,0 +1,353 @@
+<?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>brief</feature>
+ </require-feature>
+
+ <start>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ </data>
+ </request>
+ </start>
+
+ <test-suite name='regular prop finds'>
+ <test name='1'>
+ <description>PROPFIND depth=0 no brief</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PROPFIND depth=0 with brief=f</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <header>
+ <name>Brief</name>
+ <value>f</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PROPFIND depth=0 with brief=t</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <header>
+ <name>Brief</name>
+ <value>t</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PROPFIND depth=0 with bad brief</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <header>
+ <name>Brief</name>
+ <value>bad</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='multiget'>
+ <test name='1'>
+ <description>REPORT no brief</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>REPORT with brief=f</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Brief</name>
+ <value>f</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>REPORT with brief=t</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Brief</name>
+ <value>t</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>REPORT with bad brief</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Brief</name>
+ <value>bad</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='query'>
+ <test name='1'>
+ <description>REPORT no brief</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>REPORT with brief=f</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Brief</name>
+ <value>f</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>REPORT with brief=t</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Brief</name>
+ <value>t</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>REPORT with bad brief</description>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Brief</name>
+ <value>bad</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/brief/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>{DAV:}resourcetype</value>
+ </arg>
+ <arg>
+ <name>badprops</name>
+ <value>{DAV:}bogus</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/20120131/d6e62684/attachment-0001.html>
More information about the calendarserver-changes
mailing list