[CalendarServer-changes] [11600] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Aug 12 13:21:18 PDT 2013
Revision: 11600
http://trac.calendarserver.org//changeset/11600
Author: gaya at apple.com
Date: 2013-08-12 13:21:18 -0700 (Mon, 12 Aug 2013)
Log Message:
-----------
Add group tests to CardDAV/put.xml
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CardDAV/vcardput/16.vcf
CalDAVTester/trunk/Resource/CardDAV/vcardput/17.vcf
CalDAVTester/trunk/Resource/CardDAV/vcardput/18.vcf
CalDAVTester/trunk/Resource/CardDAV/vcardput/19.vcf
Copied: CalDAVTester/trunk/Resource/CardDAV/vcardput/16.vcf (from rev 11598, CalDAVTester/trunk/Resource/CardDAV/vcardput/13.vcf)
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vcardput/16.vcf (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vcardput/16.vcf 2013-08-12 20:21:18 UTC (rev 11600)
@@ -0,0 +1,27 @@
+BEGIN:VCARD
+VERSION:3.0
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:760d9b28-5a13-4880-b7eb-5769e6600fa3
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E2:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:F0A6918D-8E09-43FA-9684-226810B8A96F:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:F0A6918D-8E09-43FA-9684-226810B8A96F:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44EE78BF-8814-4471-899C-92280CEFB098:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8424B7F0-C878-4722-B522-EBB07CF48AD7:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:AFBB77B8-0438-4825-A1DB-A75D76B6C3A8:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:user01 at example.com
+X-ADDRESSBOOKSERVER-MEMBER:user02 at example.com
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6600fa3
+FN:Group
+N:Group;;;;
+REV:20120503T194243Z
+END:VCARD
Copied: CalDAVTester/trunk/Resource/CardDAV/vcardput/17.vcf (from rev 11598, CalDAVTester/trunk/Resource/CardDAV/vcardput/14.vcf)
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vcardput/17.vcf (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vcardput/17.vcf 2013-08-12 20:21:18 UTC (rev 11600)
@@ -0,0 +1,23 @@
+BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6600fa3
+FN:Group
+N:Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:3765A955-1B96-41EA-994D-335192BEDCCD:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44745975-AE6D-4FB0-80A6-A298427E047A:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:44EE78BF-8814-4471-899C-92280CEFB098:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:760d9b28-5a13-4880-b7eb-5769e6600fa3
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8424B7F0-C878-4722-B522-EBB07CF48AD7:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:934731C6-1C95-4C40-BE1F-FA4215B2307B:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:AFBB77B8-0438-4825-A1DB-A75D76B6C3A8:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:ED7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E2:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:F0A6918D-8E09-43FA-9684-226810B8A96F:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:FCBA0FA3-00B2-4C95-B4EC-4CCC4843F8B1:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:user01 at example.com
+X-ADDRESSBOOKSERVER-MEMBER:user02 at example.com
+END:VCARD
Copied: CalDAVTester/trunk/Resource/CardDAV/vcardput/18.vcf (from rev 11598, CalDAVTester/trunk/Resource/CardDAV/vcardput/15.vcf)
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vcardput/18.vcf (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vcardput/18.vcf 2013-08-12 20:21:18 UTC (rev 11600)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Non-default;;;
+FN:Non-default Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:nlthompson at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;12456 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:FD7A5AEC-AB19-4CE0-AD6A-2923A3E5C4E1:ABPerson
+END:VCARD
Added: CalDAVTester/trunk/Resource/CardDAV/vcardput/19.vcf
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vcardput/19.vcf (rev 0)
+++ CalDAVTester/trunk/Resource/CardDAV/vcardput/19.vcf 2013-08-12 20:21:18 UTC (rev 11600)
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:3.0
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:8424B7F0-C878-4722-B522-EBB07CF48AD7:ABPerson
+X-ADDRESSBOOKSERVER-MEMBER:user03 at example.com
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:760d9b28-5a13-4880-b7eb-5769e6600fa3
+FN:Changed Group
+N:ChangedGroup;;;;
+REV:20120503T194243Z
+END:VCARD
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/put.xml 2013-08-12 18:56:46 UTC (rev 11599)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/put.xml 2013-08-12 20:21:18 UTC (rev 11600)
@@ -25,7 +25,13 @@
<feature>carddav</feature>
</require-feature>
- <start/>
+ <start>
+ <description>clean up old data</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$addressbookhome1:/</ruri>
+ </request>
+ </start>
<test-suite name='PUT VCARD' ignore='no'>
<test name='1' ignore='no'>
@@ -481,6 +487,115 @@
</test>
</test-suite>
- <end/>
+ <test-suite name='PUT groups'>
+ <test name='1' ignore='no'>
+ <description>PUT group with circular reference, unknown members, group data changed</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/16.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/vcardput/16.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>!ETag</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$addressbookpath1:/16.vcf</ruri>
+ <verify>
+ <callback>addressDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/vcardput/17.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>PUT user over group</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/16.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/vcardput/18.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>PUT group over user</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/1.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/vcardput/19.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>403</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>PUT group over group, no data change</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$addressbookpath1:/16.vcf</ruri>
+ <data>
+ <content-type>text/vcard; charset=utf-8</content-type>
+ <filepath>Resource/CardDAV/vcardput/19.vcf</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>ETag</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>GET</method>
+ <ruri>$addressbookpath1:/16.vcf</ruri>
+ <verify>
+ <callback>addressDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CardDAV/vcardput/19.vcf</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+ <end>
+ <description>clean up old data</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$addressbookhome1:/</ruri>
+ </request>
+ </end>
+
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130812/22266527/attachment.html>
More information about the calendarserver-changes
mailing list