From 1f5d8ddcac141e0d31fb304f42324f8be65306f8 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sun, 20 May 2012 21:50:30 +1200 Subject: [PATCH] Updated & new regression tests for various XML processing changes. --- testing/tests/binding/1025-PROPFIND.result | 7 ++- .../tests/binding/1101-PROPFIND-normal.result | 7 ++- .../tests/binding/1102-PROPFIND-bound.result | 3 +- .../0557-iPhone-MKCALENDAR.result | 2 +- .../0560-iPhone-PROPFIND.result | 34 +++++++++++++++ .../0560-iPhone-PROPFIND.test | 29 +++++++++++++ .../0561-iOS-PROPPATCH.result | 27 ++++++++++++ .../regression-suite/0561-iOS-PROPPATCH.test | 23 ++++++++++ .../regression-suite/0562-iOS-PROPFIND.result | 42 ++++++++++++++++++ .../regression-suite/0562-iOS-PROPFIND.test | 29 +++++++++++++ .../0840-Spec-PROPPATCH-1.result | 19 ++++++++ .../0841-Spec-PROPPATCH-2.result | 2 +- .../0842-Spec-PROPPATCH-3.result | 2 +- .../0844-Spec-PROPPATCH-addressbook.result | 2 +- .../0845-Spec-PROPPATCH-both-fail.result | 11 ++--- .../0846-Spec-PROPPATCH-calendar.result | 43 ++++++++++++------- .../0848-Spec-PROPPATCH-calendar.result | 28 ++++++++++++ .../0848-Spec-PROPPATCH-calendar.test | 35 +++++++++++++++ .../0918-PROPFIND-supported-stuff.result | 7 ++- 19 files changed, 311 insertions(+), 41 deletions(-) create mode 100644 testing/tests/regression-suite/0560-iPhone-PROPFIND.result create mode 100644 testing/tests/regression-suite/0560-iPhone-PROPFIND.test create mode 100644 testing/tests/regression-suite/0561-iOS-PROPPATCH.result create mode 100644 testing/tests/regression-suite/0561-iOS-PROPPATCH.test create mode 100644 testing/tests/regression-suite/0562-iOS-PROPFIND.result create mode 100644 testing/tests/regression-suite/0562-iOS-PROPFIND.test create mode 100644 testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result create mode 100644 testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result index 5e143788..494c6369 100644 --- a/testing/tests/binding/1025-PROPFIND.result +++ b/testing/tests/binding/1025-PROPFIND.result @@ -1,5 +1,5 @@ - + /caldav.php/user4/base/ @@ -46,8 +46,7 @@ - - + HTTP/1.1 200 OK @@ -78,7 +77,7 @@ - + HTTP/1.1 200 OK diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result index 62c75998..0603bc99 100644 --- a/testing/tests/binding/1101-PROPFIND-normal.result +++ b/testing/tests/binding/1101-PROPFIND-normal.result @@ -1,5 +1,5 @@ - + /caldav.php/user4/base/ @@ -46,8 +46,7 @@ - - + HTTP/1.1 200 OK @@ -78,7 +77,7 @@ - + HTTP/1.1 200 OK diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result index adebb5d1..584b004e 100644 --- a/testing/tests/binding/1102-PROPFIND-bound.result +++ b/testing/tests/binding/1102-PROPFIND-bound.result @@ -1,5 +1,5 @@ - + /caldav.php/user4/boundbase/ @@ -51,7 +51,6 @@ - diff --git a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result index 5323a8b0..491bebad 100644 --- a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result +++ b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.result @@ -20,6 +20,6 @@ public_events_onl: >0< changed_by: >10< property_name: >urn:ietf:params:xml:ns:caldav:supported-calendar-component-set< property_value: > - + < diff --git a/testing/tests/regression-suite/0560-iPhone-PROPFIND.result b/testing/tests/regression-suite/0560-iPhone-PROPFIND.result new file mode 100644 index 00000000..bb637525 --- /dev/null +++ b/testing/tests/regression-suite/0560-iPhone-PROPFIND.result @@ -0,0 +1,34 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +ETag: "2b2bbe0fd58f5dc4b170658721ef721f" +Content-Length: 735 +Content-Type: text/xml; charset="utf-8" + + + + + /caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/ + + + Untitled + #391B71A0 + + + + + + + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 404 Not Found + + + diff --git a/testing/tests/regression-suite/0560-iPhone-PROPFIND.test b/testing/tests/regression-suite/0560-iPhone-PROPFIND.test new file mode 100644 index 00000000..bd003ca8 --- /dev/null +++ b/testing/tests/regression-suite/0560-iPhone-PROPFIND.test @@ -0,0 +1,29 @@ +# +# Testing with a process similar to iPhone 3.1 +# +TYPE=PROPFIND +URL=http://mycaldav/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/ +HEAD + +AUTH=user1:user1 + +HEADER=User-Agent: DAVKit/4.0 (728.3); iCalendar/1 (34); iPhone/3.0 7A341 +HEADER=Content-Type: text/xml +HEADER=Depth: 0 + +# +# This query from the iPhone goes to the calendar-home-set and checks +# what is available under that collection. +# +BEGINDATA + + + + + + + + + + +ENDDATA diff --git a/testing/tests/regression-suite/0561-iOS-PROPPATCH.result b/testing/tests/regression-suite/0561-iOS-PROPPATCH.result new file mode 100644 index 00000000..3ae68f70 --- /dev/null +++ b/testing/tests/regression-suite/0561-iOS-PROPPATCH.result @@ -0,0 +1,27 @@ +HTTP/1.1 200 OK +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + property_name: >http://apple.com/ns/ical/:calendar-color< + property_value: >#0252D4FF< + + property_name: >http://apple.com/ns/ical/:calendar-order< + property_value: >1< + + property_name: >urn:ietf:params:xml:ns:caldav:schedule-default-calendar-URL< + property_value: > + /caldav.php/user1/home/ +< + + property_name: >urn:org:davical:outer< + property_value: > + + inside + inside2 + +< + diff --git a/testing/tests/regression-suite/0561-iOS-PROPPATCH.test b/testing/tests/regression-suite/0561-iOS-PROPPATCH.test new file mode 100644 index 00000000..5098391e --- /dev/null +++ b/testing/tests/regression-suite/0561-iOS-PROPPATCH.test @@ -0,0 +1,23 @@ +# +# Testing the encoding of arbitrary XML into the database +# +TYPE=PROPPATCH +URL=http://regression.host/caldav.php/user1/home/ +HEAD + +HEADER=DAVKit/4.0 (729); CalendarStore/4.0 (965); iCal/4.0 (1362); Mac OS X/10.6.1 (10B504) +HEADER=Content-Type: text/xml +HEADER=Prefer: return-minimal + +# +# +BEGINDATA + +/caldav.php/user1/home/1 +insideinside2 + +ENDDATA + +QUERY +SELECT property_name, property_value FROM property WHERE dav_name = '/user1/home/' +ENDQUERY diff --git a/testing/tests/regression-suite/0562-iOS-PROPFIND.result b/testing/tests/regression-suite/0562-iOS-PROPFIND.result new file mode 100644 index 00000000..5197ec7e --- /dev/null +++ b/testing/tests/regression-suite/0562-iOS-PROPFIND.result @@ -0,0 +1,42 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +ETag: "ad7ec8d22f626f3c8f86c0a275847c93" +Content-Length: 997 +Content-Type: text/xml; charset="utf-8" + + + + + /caldav.php/user1/home/ + + + + /caldav.php/user1/home/ + + 1 + + + + + + + + + + + + + + + + inside + inside2 + + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/0562-iOS-PROPFIND.test b/testing/tests/regression-suite/0562-iOS-PROPFIND.test new file mode 100644 index 00000000..6dea395f --- /dev/null +++ b/testing/tests/regression-suite/0562-iOS-PROPFIND.test @@ -0,0 +1,29 @@ +# +# Testing retrieval of the wierd properties we just set +# +TYPE=PROPFIND +URL=http://mycaldav/caldav.php/user1/home/ +HEAD + +AUTH=user1:user1 + +HEADER=User-Agent: DAVKit/4.0 (728.3); iCalendar/1 (34); iPhone/3.0 7A341 +HEADER=Content-Type: text/xml +HEADER=Depth: 0 + +# +# This query from the iPhone goes to the calendar-home-set and checks +# what is available under that collection. +# +BEGINDATA + + + + + + + + + + +ENDDATA diff --git a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result index b801b78f..e4db9784 100644 --- a/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result +++ b/testing/tests/regression-suite/0840-Spec-PROPPATCH-1.result @@ -47,3 +47,22 @@ Content-Type: text/xml; charset="utf-8" property_name: >http://apple.com/ns/ical/:calendar-order< property_value: >1< + changed_by: >10< + changed_recently: >1< + dav_name: >/user1/home/< + property_name: >urn:ietf:params:xml:ns:caldav:schedule-default-calendar-URL< + property_value: > + /caldav.php/user1/home/ +< + + changed_by: >10< + changed_recently: >1< + dav_name: >/user1/home/< + property_name: >urn:org:davical:outer< + property_value: > + + inside + inside2 + +< + diff --git a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result index f1b7ce72..b4eeb1fe 100644 --- a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result +++ b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result @@ -24,6 +24,6 @@ Content-Type: text/xml; charset="utf-8" dav_displayname: >User One's Transparent Calendar< is_addressbook: >0< is_calendar: >1< - resourcetypes: >< + resourcetypes: >< schedule_transp: >transparent< diff --git a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result index 431c3185..3ee55356 100644 --- a/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result +++ b/testing/tests/regression-suite/0842-Spec-PROPPATCH-3.result @@ -26,5 +26,5 @@ Content-Type: text/xml; charset="utf-8" changed_last_60se: >1< dav_displayname: >User One's Transparent Calendar< is_calendar: >1< - resourcetypes: >< + resourcetypes: >< diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result index 58f7def2..b9b17217 100644 --- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result +++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result @@ -22,5 +22,5 @@ Content-Type: text/xml; charset="utf-8" dav_displayname: >User One's addressbook< is_addressbook: >1< is_calendar: >0< - resourcetypes: >< + resourcetypes: >< diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result index d352886b..05994aa1 100644 --- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result +++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-both-fail.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -Content-Length: 508 +Content-Length: 452 Content-Type: text/xml; charset="utf-8" @@ -14,11 +14,8 @@ Content-Type: text/xml; charset="utf-8" - HTTP/1.1 403 Forbidden - Resources may not be changed to / from collections. - - - + HTTP/1.1 409 Conflict + A collection may not be both a calendar and an addressbook. @@ -27,5 +24,5 @@ Content-Type: text/xml; charset="utf-8" dav_displayname: >User One's addressbook< is_addressbook: >1< is_calendar: >0< - resourcetypes: >< + resourcetypes: >< diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result index 264a9336..209eb19f 100644 --- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result +++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result @@ -2,27 +2,38 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -Content-Length: 386 +Content-Length: 687 Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/ - All requested changes were made. - - - - - - - HTTP/1.1 200 OK - + + /caldav.php/user1/home/ + Some properties were not able to be changed. + + + + + HTTP/1.1 403 Forbidden + Unsupported resourcetype modification. + + + + + + + + + + HTTP/1.1 424 Failed Dependency + + changed_last_5m: >1< - dav_displayname: >User 1's Calendaranza< - is_addressbook: >0< - is_calendar: >1< - resourcetypes: >< - schedule_transp: >opaque< + dav_displayname: >User One's addressbook< + is_addressbook: >1< + is_calendar: >0< + resourcetypes: >< + schedule_transp: >transparent< diff --git a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result new file mode 100644 index 00000000..208413b8 --- /dev/null +++ b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result @@ -0,0 +1,28 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy +Content-Length: 386 +Content-Type: text/xml; charset="utf-8" + + + + /caldav.php/user1/home/ + All requested changes were made. + + + + + + + HTTP/1.1 200 OK + + + + changed_last_5m: >1< + dav_displayname: >User 1's Calendaranza< + is_addressbook: >0< + is_calendar: >1< + resourcetypes: >< + schedule_transp: >opaque< + diff --git a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test new file mode 100644 index 00000000..67e5fc7b --- /dev/null +++ b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.test @@ -0,0 +1,35 @@ +# +# Check for support of PROPPATCH method +# +# Try (and succeed) to set the collection to be a calendar. +# +TYPE=PROPPATCH +URL=http://regression.host/caldav.php/user1/home/ +HEADER=User-agent: SpecTest PROPPATCH +HEADER=Content-type: text/xml +HEAD + +BEGINDATA + + + + + + + + + User 1's Calendaranza + + + + + + +ENDDATA + +QUERY +SELECT dav_displayname, is_addressbook, is_calendar, resourcetypes, + modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m, + schedule_transp + FROM collection WHERE dav_name = '/user1/home/'; +ENDQUERY diff --git a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result index 8df87107..4838d282 100644 --- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result +++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result @@ -2,12 +2,12 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "6991cc83557b9ab4224fafebcb6e8565" -Content-Length: 2220 +ETag: "d8ca6e096e4f41c01747fcc58a8e822f" +Content-Length: 2155 Content-Type: text/xml; charset="utf-8" - + /caldav.php/user1/home/ @@ -16,7 +16,6 @@ Content-Type: text/xml; charset="utf-8" -