[CalendarServer-changes] [13705] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 30 07:53:12 PDT 2014
Revision: 13705
http://trac.calendarserver.org//changeset/13705
Author: cdaboo at apple.com
Date: 2014-06-30 07:53:12 -0700 (Mon, 30 Jun 2014)
Log Message:
-----------
Clean-up CardDAV tests.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml
CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml
CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml
CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml
CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml
CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml
CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml
CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml
CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml
CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
Removed Paths:
-------------
CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml
CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml
CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml
Deleted: CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/sharing/sync/addressbook/39.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:set>
-<D:prop>
-<C:schedule-default-calendar-URL><D:href>$calendarhome1:/synccalendar3/</D:href></C:schedule-default-calendar-URL>
-</D:prop>
-</D:set>
-</D:propertyupdate>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/17.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:supported-report-set/>
-</D:prop>
-</D:propfind>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/18.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<principal-search-property-set xmlns='DAV:'>
- <principal-search-property>
- <prop>
- <calendar-user-type xmlns='urn:ietf:params:xml:ns:caldav'/>
- </prop>
- <description xml:lang='en'>Calendar User Type</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <displayname/>
- </prop>
- <description xml:lang='en'>Display Name</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <email-address xmlns='http://calendarserver.org/ns/'/>
- </prop>
- <description xml:lang='en'>Email Addresses</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <first-name xmlns='http://calendarserver.org/ns/'/>
- </prop>
- <description xml:lang='en'>First Name</description>
- </principal-search-property>
- <principal-search-property>
- <prop>
- <last-name xmlns='http://calendarserver.org/ns/'/>
- </prop>
- <description xml:lang='en'>Last Name</description>
- </principal-search-property>
-</principal-search-property-set>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/19.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,43 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<multistatus xmlns='DAV:'>
- <response>
- <href>$calendarpath1:/1.ics</href>
- <propstat>
- <prop>
- <supported-report-set>
- <supported-report>
- <report>
- <acl-principal-prop-set/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-match/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-property-search/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <expand-property/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <calendar-multiget xmlns='urn:ietf:params:xml:ns:caldav'/>
- </report>
- </supported-report>
- </supported-report-set>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/20.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,53 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<multistatus xmlns='DAV:'>
- <response>
- <href>$principals:</href>
- <propstat>
- <prop>
- <supported-report-set>
- <supported-report>
- <report>
- <acl-principal-prop-set/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-match/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-property-search/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <expand-property/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <addressbook-query xmlns='urn:ietf:params:xml:ns:carddav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <addressbook-multiget xmlns='urn:ietf:params:xml:ns:carddav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <free-busy-query xmlns='urn:ietf:params:xml:ns:carddav'/>
- </report>
- </supported-report>
- <supported-report>
- <report>
- <principal-search-property-set/>
- </report>
- </supported-report>
- </supported-report-set>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/21.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="allof" type="INDIVIDUAL">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <c:first-name/>
- </D:prop>
- <D:match match-type="starts-with">appren</D:match>
- </D:property-search>
- <D:property-search>
- <D:prop>
- <c:last-name/>
- </D:prop>
- <D:match match-type="contains">uper</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- <c:first-name/>
- <c:last-name/>
- <c:email-address-set/>
- </D:prop>
-</D:principal-property-search>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/22.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="anyof" type="INDIVIDUAL">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <c:first-name/>
- </D:prop>
- <D:match match-type="starts-with">appren</D:match>
- </D:property-search>
- <D:property-search>
- <D:prop>
- <c:last-name/>
- </D:prop>
- <D:match match-type="contains">user</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- <c:first-name/>
- <c:last-name/>
- <c:email-address-set/>
- </D:prop>
-</D:principal-property-search>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/23.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="anyof" type="ROOM">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
- <D:match match-type="contains">03</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
-</D:principal-property-search>
Deleted: CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vaclreports/24.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:principal-property-search xmlns:D="DAV:" xmlns:c="http://calendarserver.org/ns/" test="anyof" type="RESOURCE">
- <D:apply-to-principal-collection-set/>
- <D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
- <D:match match-type="contains">03</D:match>
- </D:property-search>
- <D:prop>
- <D:displayname/>
- </D:prop>
-</D:principal-property-search>
Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/10.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -5,9 +5,6 @@
<C:address-data content-type="text/vcards" version="2.0"/>
</D:prop>
<C:filter>
-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
+<C:prop-filter name="NICKNAME" />
</C:filter>
</C:addressbook-query>
Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/11.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -5,9 +5,6 @@
<C:address-data content-type="text/vcard" version="4.0"/>
</D:prop>
<C:filter>
-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
+<C:prop-filter name="NICKNAME" />
</C:filter>
</C:addressbook-query>
Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/12.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -5,9 +5,6 @@
<C:address-data content-type="text/vcards" version="2.0"/>
</D:prop>
<C:filter>
-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
+<C:prop-filter name="NICKNAME"/>
</C:filter>
</C:addressbook-multiget>
Modified: CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/13.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -5,9 +5,6 @@
<C:address-data content-type="text/vcard" version="4.0"/>
</D:prop>
<C:filter>
-<C:comp-filter name="NICKNAME">
-<C:comp-filter name="FN">
-</C:comp-filter>
-</C:comp-filter>
+<C:prop-filter name="NICKNAME"/>
</C:filter>
</C:addressbook-multiget>
Deleted: CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/verrors/16.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
-<D:prop>
-<D:getetag/>
-<C:calendar-data/>
-</D:prop>
-<C:filter>
-<C:comp-filter name="VCALENDAR">
-<C:comp-filter name="VALARM">
-</C:comp-filter>
-</C:comp-filter>
-</C:filter>
-</C:calendar-query>
Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/2.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -3,5 +3,5 @@
<D:prop>
<D:getetag/>
</D:prop>
-<D:href>$calendarhome:/Tást/</D:href>
+<D:href>$addressbookhome:/Tást/</D:href>
</C:addressbook-multiget>
Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/3.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
<D:prop>
<D:getetag/>
</D:prop>
-<D:href>$calendarhome1:/Te%cc%81st/t%c3%a9st.ics</D:href>
-</C:calendar-multiget>
+<D:href>$addressbookhome1:/Te%cc%81st/t%c3%a9st.ics</D:href>
+</C:addressbook-multiget>
Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/4.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
<D:prop>
<D:getetag/>
</D:prop>
-<D:href>$calendarhome1:/T%c3%a9st/te%cc%81st.ics</D:href>
-</C:calendar-multiget>
+<D:href>$addressbookhome1:/T%c3%a9st/te%cc%81st.ics</D:href>
+</C:addressbook-multiget>
Modified: CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vnonascii/5.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
-<C:calendar-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
<D:prop>
<D:getetag/>
</D:prop>
-<D:href>$calendarhome1:/T%c3%a9st/t%c3%a9st.ics</D:href>
-</C:calendar-multiget>
+<D:href>$addressbookhome1:/T%c3%a9st/t%c3%a9st.ics</D:href>
+</C:addressbook-multiget>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/2.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -5,10 +5,8 @@
<C:address-data/>
</D:prop>
<C:filter>
-<C:comp-filter name="UID">
-<C:comp-filter name="FN">
+<C:prop-filter name="PHOTO">
<C:is-not-defined/>
-</C:comp-filter>
-</C:comp-filter>
+</C:prop-filter>
</C:filter>
</C:addressbook-query>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/basicquery/20.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -5,11 +5,9 @@
<C:address-data/>
</D:prop>
<C:filter>
-<C:comp-filter name="UID">
-<C:comp-filter name="FN">
+<C:prop-filter name="PHOTO">
<C:is-not-defined/>
-</C:comp-filter>
-</C:comp-filter>
+</C:prop-filter>
</C:filter>
<C:limit>
<C:nresults>5</C:nresults>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -650,92 +650,7 @@
</verify>
</request>
</test>
- <!--
- <test name='4'>
- <description>Valid report</description>
- <request>
- <method>REPORT</method>
- <ruri>$principalcollection:</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/vaclreports/16.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <verify>
- <callback>dataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CardDAV/vaclreports/18.xml</value>
- </arg>
- </verify>
- </request>
- </test>
- -->
</test-suite>
- <!--
- <test-suite name='supported-report-set property'>
- <test name='1'>
- <description>Regular resource</description>
- <request>
- <method>PROPFIND</method>
- <ruri>$addressbookpath1:/</ruri>
- <header>
- <name>Depth</name>
- <value>1</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/vaclreports/17.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>207</value>
- </arg>
- </verify>
- <verify>
- <callback>dataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CardDAV/vaclreports/19.xml</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='2'>
- <description>Regular resource</description>
- <request>
- <method>PROPFIND</method>
- <ruri>$principalcollection:</ruri>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CardDAV/vaclreports/17.xml</filepath>
- </data>
- <verify>
- <callback>statusCode</callback>
- <arg>
- <name>status</name>
- <value>207</value>
- </arg>
- </verify>
- <verify>
- <callback>dataMatch</callback>
- <arg>
- <name>filepath</name>
- <value>Resource/CardDAV/vaclreports/20.xml</value>
- </arg>
- </verify>
- </request>
- </test>
- </test-suite>
- -->
<end/>
</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -248,7 +248,7 @@
<description>REPORT with non-ascii - match parent, different child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/Tást/</ruri>
+ <ruri>$addressbookhome1:/Tást/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/3.xml</filepath>
@@ -266,7 +266,7 @@
<description>REPORT with non-ascii - different parent, match child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/Te%cc%81st/</ruri>
+ <ruri>$addressbookhome1:/Te%cc%81st/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/4.xml</filepath>
@@ -284,7 +284,7 @@
<description>REPORT with non-ascii - different parent, different child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/Te%cc%81st/</ruri>
+ <ruri>$addressbookhome1:/Te%cc%81st/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/5.xml</filepath>
@@ -302,7 +302,7 @@
<description>REPORT with non-ascii - match parent, match child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/2.xml</filepath>
@@ -320,7 +320,7 @@
<description>REPORT with non-ascii - match parent, different child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/3.xml</filepath>
@@ -338,7 +338,7 @@
<description>REPORT with non-ascii - different parent, match child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/4.xml</filepath>
@@ -356,7 +356,7 @@
<description>REPORT with non-ascii - different parent, different child</description>
<request>
<method>REPORT</method>
- <ruri>$calendarhome1:/T%c3%a9st/</ruri>
+ <ruri>$addressbookhome1:/T%c3%a9st/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/nonascii/5.xml</filepath>
@@ -491,14 +491,14 @@
</test>
</test-suite>
<!--
- <test-suite name='Copy/Move Non-utf-8 calendar data'>
+ <test-suite name='Copy/Move Non-utf-8 addressbook data'>
<test name='1'>
<description>PUT with non-utf-8 data to regular collection</description>
<request end-delete="yes">
<method>PUT</method>
- <ruri>$calendarhome1:/collection/nonutf8.ics</ruri>
+ <ruri>$addressbookhome1:/collection/nonutf8.ics</ruri>
<data>
- <content-type>text/calendar</content-type>
+ <content-type>text/vcard</content-type>
<filepath>Resource/CardDAV/nonascii/10.ics</filepath>
</data>
<verify>
@@ -507,37 +507,37 @@
</request>
</test>
<test name='2'>
- <description>COPY non-utf-8 data to calendar collection</description>
+ <description>COPY non-utf-8 data to addressbook collection</description>
<request end-delete="yes">
<method>COPY</method>
<header>
<name>Destination</name>
- <value>$host:$calendarpath1:/copy1.ics</value>
+ <value>$host:$addressbookpath1:/copy1.ics</value>
</header>
- <ruri>$calendarhome1:/collection/nonutf8.ics</ruri>
+ <ruri>$addressbookhome1:/collection/nonutf8.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
<name>error</name>
- <value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
+ <value>{urn:ietf:params:xml:ns:caldav}valid-address-data</value>
</arg>
</verify>
</request>
</test>
<test name='3'>
- <description>MOVE non-utf-8 data to calendar collection</description>
+ <description>MOVE non-utf-8 data to addressbook collection</description>
<request end-delete="yes">
<method>MOVE</method>
<header>
<name>Destination</name>
- <value>$host:$calendarpath1:/copy1.ics</value>
+ <value>$host:$addressbookpath1:/copy1.ics</value>
</header>
- <ruri>$calendarhome1:/collection/nonutf8.ics</ruri>
+ <ruri>$addressbookhome1:/collection/nonutf8.ics</ruri>
<verify>
<callback>prepostcondition</callback>
<arg>
<name>error</name>
- <value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
+ <value>{urn:ietf:params:xml:ns:caldav}valid-address-data</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2014-06-30 01:39:35 UTC (rev 13704)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2014-06-30 14:53:12 UTC (rev 13705)
@@ -197,16 +197,10 @@
<value>3.vcf</value>
<value>4.vcf</value>
<value>5.vcf</value>
- <value>6.vcf</value>
- <value>7.vcf</value>
<value>8.vcf</value>
<value>9.vcf</value>
<value>10.vcf</value>
- <value>11.vcf</value>
- <value>12.vcf</value>
<value>13.vcf</value>
- <value>14.vcf</value>
- <value>15.vcf</value>
</arg>
</verify>
</request>
@@ -570,9 +564,9 @@
<name>okhrefs</name>
<value>1.vcf</value>
<value>10.vcf</value>
- <value>11.vcf</value>
- <value>12.vcf</value>
<value>13.vcf</value>
+ <value>2.vcf</value>
+ <value>3.vcf</value>
</arg>
<arg>
<name>badhrefs</name>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140630/2ef1b098/attachment-0001.html>
More information about the calendarserver-changes
mailing list