[CalendarServer-changes] [14854] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 29 07:27:27 PDT 2015
Revision: 14854
http://trac.calendarserver.org//changeset/14854
Author: cdaboo at apple.com
Date: 2015-05-29 07:27:26 -0700 (Fri, 29 May 2015)
Log Message:
-----------
Allow feature for tests that use the root resource. Fix some filename case sensitivity issues. Make sure serverinfo files are in sync.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml
CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml
CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml
CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml
CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/Common/MKCALENDAR/allcomponents.xml
Removed Paths:
-------------
CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml
Deleted: CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml
===================================================================
--- CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:supported-calendar-component-set>
-<C:comp name="VEVENT"/>
-<C:comp name="VTODO"/>
-<C:comp name="VFREEBUSY"/>
-</C:supported-calendar-component-set>
-</D:prop>
-</D:set>
-</C:mkcalendar>
Copied: CalDAVTester/trunk/Resource/Common/MKCALENDAR/allcomponents.xml (from rev 14853, CalDAVTester/trunk/Resource/Common/MKCALENDAR/AllComponents.xml)
===================================================================
--- CalDAVTester/trunk/Resource/Common/MKCALENDAR/allcomponents.xml (rev 0)
+++ CalDAVTester/trunk/Resource/Common/MKCALENDAR/allcomponents.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<C:mkcalendar xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:set>
+<D:prop>
+<C:supported-calendar-component-set>
+<C:comp name="VEVENT"/>
+<C:comp name="VTODO"/>
+<C:comp name="VFREEBUSY"/>
+</C:supported-calendar-component-set>
+</D:prop>
+</D:set>
+</C:mkcalendar>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -58,6 +58,7 @@
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>only-proxy-groups</feature> <!-- Group-membership only includes delegated-to groups -->
<feature>limits</feature> <!-- max-collections and max-resources limits -->
+ <feature>own-root</feature> <!-- / is owned by this service -->
<feature>prefer</feature> <!-- Prefer header overall support -->
<feature>prefer-minimal</feature> <!-- Prefer header return=minimal -->
<feature>prefer-representation</feature> <!-- Prefer header return=representation -->
@@ -68,6 +69,7 @@
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<!-- <feature>sync-report-limit</feature> --> <!-- WebDAV collection sync REPORT DAV:limit support -->
<feature>sync-report-home</feature> <!-- WebDAV collection sync REPORT on Homes -->
+ <feature>sync-report-config-token</feature> <!-- Sync REPORT token includes configuration component -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
@@ -75,6 +77,9 @@
<feature>json-data</feature> <!-- jCal and jCard support -->
+ <!-- CalendarServer specific extensions -->
+ <feature>control-api</feature> <!-- Control API support -->
+
<!-- CalDAV specific extension -->
<feature>caldav</feature> <!-- Basic CalDAV feature enabler -->
<feature>attachments-collection</feature> <!-- Server uses a collection in same WebDAV tree to store attachments -->
@@ -112,6 +117,7 @@
<feature>timezones-by-reference</feature> <!-- Timezones by reference enabled -->
<feature>timezone-service</feature> <!-- Timezone service extension for Wiki -->
<feature>timezone-std-service</feature> <!-- Timezone standard service extension -->
+ <feature>trash-collection</feature> <!-- Trash collection enabled -->
<feature>travel-time-busy</feature> <!-- Travel time appears as busy -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<!-- <feature>vpoll</feature> --> <!-- VPOLL support for store and scheduling -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -53,6 +53,7 @@
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>only-proxy-groups</feature> <!-- Group-membership only includes delegated-to groups -->
<feature>limits</feature> <!-- max-collections and max-resources limits -->
+ <!-- <feature>own-root</feature> --> <!-- / is owned by this service -->
<feature>prefer</feature> <!-- Prefer header overall support -->
<feature>prefer-minimal</feature> <!-- Prefer header return=minimal -->
<feature>prefer-representation</feature> <!-- Prefer header return=representation -->
@@ -63,6 +64,7 @@
<feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<!-- <feature>sync-report-limit</feature> --> <!-- WebDAV collection sync REPORT DAV:limit support -->
<feature>sync-report-home</feature> <!-- WebDAV collection sync REPORT on Homes -->
+ <feature>sync-report-config-token</feature> <!-- Sync REPORT token includes configuration component -->
<feature>well-known</feature> <!-- well-known feature -->
<!-- <feature>per-object-ACLs</feature> --> <!-- ACL for objects in calendar/address books -->
@@ -110,6 +112,7 @@
<feature>timezones-by-reference</feature> <!-- Timezones by reference enabled -->
<feature>timezone-service</feature> <!-- Timezone service extension for Wiki -->
<feature>timezone-std-service</feature> <!-- Timezone standard service extension -->
+ <!-- <feature>trash-collection</feature> --> <!-- Trash collection enabled -->
<feature>travel-time-busy</feature> <!-- Travel time appears as busy -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<!-- <feature>vpoll</feature> --> <!-- VPOLL support for store and scheduling -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -54,6 +54,7 @@
<feature>expand-property</feature> <!-- Expand property REPORT -->
<feature>only-proxy-groups</feature> <!-- Group-membership only includes delegated-to groups -->
<feature>limits</feature> <!-- max-collections and max-resources limits -->
+ <feature>own-root</feature> <!-- / is owned by this service -->
<feature>prefer</feature> <!-- Prefer header overall support -->
<feature>prefer-minimal</feature> <!-- Prefer header return=minimal -->
<feature>prefer-representation</feature> <!-- Prefer header return=representation -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -29,6 +29,9 @@
<start/>
<test-suite name='Check for the property on /'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<test name='1'>
<description>Check for authenticated property on /</description>
<request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/directory.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -30,6 +30,9 @@
<test-suite name='GET on collections'>
<test name='1'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<description>GET on root collection</description>
<request>
<method>GET</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -1618,6 +1618,9 @@
</test-suite>
<test-suite name='Root resource'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<test name='1'>
<description>DELETE /</description>
<request>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -200,6 +200,9 @@
<test-suite name='DAV:owner'>
<test name='1'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<description>Check for no DAV:owner on root</description>
<request>
<method>PROPFIND</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -1133,7 +1133,7 @@
</header>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/Count.xml</filepath>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
</data>
<verify>
<callback>multistatusItems</callback>
@@ -1222,7 +1222,7 @@
</header>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/Count.xml</filepath>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
</data>
<verify>
<callback>multistatusItems</callback>
@@ -1254,7 +1254,7 @@
</header>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/Common/PROPFIND/Count.xml</filepath>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
</data>
<verify>
<callback>multistatusItems</callback>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -28,6 +28,9 @@
<start/>
<test-suite name='Check for the property on /'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<test name='1'>
<description>Check for authenticated property on /</description>
<request>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/directory.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -29,6 +29,9 @@
<test-suite name='GET on collections'>
<test name='1'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<description>GET on root collection</description>
<request>
<method>GET</method>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml 2015-05-29 01:26:24 UTC (rev 14853)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml 2015-05-29 14:27:26 UTC (rev 14854)
@@ -1101,6 +1101,9 @@
</test-suite>
-->
<test-suite name='Root resource'>
+ <require-feature>
+ <feature>own-root</feature>
+ </require-feature>
<test name='1'>
<description>DELETE /</description>
<request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150529/929e2aeb/attachment-0001.html>
More information about the calendarserver-changes
mailing list