From 94446f98ca14daeff474a809d91a3bc9f43f748a Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 20 Mar 2010 01:09:22 +1300 Subject: [PATCH] Current regression tests. --- .../regression-suite/801-Spec-LOCK-1.test | 1 - .../841-Spec-PROPPATCH-2.result | 6 +- .../841-Spec-PROPPATCH-2.test | 19 +-- .../842-Spec-PROPPATCH-3.result | 2 +- .../regression-suite/843-Spec-PROPFIND.result | 2 +- .../846-Spec-PROPPATCH-calendar.result | 1 + .../846-Spec-PROPPATCH-calendar.test | 8 +- .../regression-suite/949-MKTICKET.result | 8 +- .../regression-suite/964-PROPFIND.result | 7 +- .../regression-suite/980-MKCOL-base.result | 16 +++ .../regression-suite/980-MKCOL-base.test | 29 +++++ .../regression-suite/981-MKCOL-subcal.result | 28 +++++ .../regression-suite/981-MKCOL-subcal.test | 37 ++++++ .../tests/regression-suite/982-BIND.result | 29 +++++ testing/tests/regression-suite/982-BIND.test | 38 ++++++ .../tests/regression-suite/983-BIND.result | 36 ++++++ testing/tests/regression-suite/983-BIND.test | 38 ++++++ .../tests/regression-suite/984-BIND.result | 38 ++++++ testing/tests/regression-suite/984-BIND.test | 38 ++++++ .../regression-suite/985-PROPFIND.result | 109 ++++++++++++++++++ .../tests/regression-suite/985-PROPFIND.test | 25 ++++ .../986-PUT-bound-succeed.result | 18 +++ .../986-PUT-bound-succeed.test | 54 +++++++++ .../regression-suite/987-PROPFIND.result | 24 ++++ .../tests/regression-suite/987-PROPFIND.test | 27 +++++ .../regression-suite/988-PROPFIND.result | 27 +++++ .../tests/regression-suite/988-PROPFIND.test | 28 +++++ 27 files changed, 674 insertions(+), 19 deletions(-) create mode 100644 testing/tests/regression-suite/980-MKCOL-base.result create mode 100644 testing/tests/regression-suite/980-MKCOL-base.test create mode 100644 testing/tests/regression-suite/981-MKCOL-subcal.result create mode 100644 testing/tests/regression-suite/981-MKCOL-subcal.test create mode 100644 testing/tests/regression-suite/982-BIND.result create mode 100644 testing/tests/regression-suite/982-BIND.test create mode 100644 testing/tests/regression-suite/983-BIND.result create mode 100644 testing/tests/regression-suite/983-BIND.test create mode 100644 testing/tests/regression-suite/984-BIND.result create mode 100644 testing/tests/regression-suite/984-BIND.test create mode 100644 testing/tests/regression-suite/985-PROPFIND.result create mode 100644 testing/tests/regression-suite/985-PROPFIND.test create mode 100644 testing/tests/regression-suite/986-PUT-bound-succeed.result create mode 100644 testing/tests/regression-suite/986-PUT-bound-succeed.test create mode 100644 testing/tests/regression-suite/987-PROPFIND.result create mode 100644 testing/tests/regression-suite/987-PROPFIND.test create mode 100644 testing/tests/regression-suite/988-PROPFIND.result create mode 100644 testing/tests/regression-suite/988-PROPFIND.test diff --git a/testing/tests/regression-suite/801-Spec-LOCK-1.test b/testing/tests/regression-suite/801-Spec-LOCK-1.test index 15ad2879..b60f5d92 100644 --- a/testing/tests/regression-suite/801-Spec-LOCK-1.test +++ b/testing/tests/regression-suite/801-Spec-LOCK-1.test @@ -18,7 +18,6 @@ ENDSQL HEADER=Depth: 0 HEADER=Timeout: Infinite,Second-4100000000 -HEADER=Content-type: text/xml; charset="utf-8" HEADER=Lock-Token: HEAD diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result index 06aefd0e..a9ac4826 100644 --- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result +++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result @@ -12,8 +12,10 @@ Content-Type: text/xml; charset="utf-8" -changed_last_60se: >1< - dav_displayname: >User One's Calendar< + changed_last_5m: >1< + dav_displayname: >User One's Transparent Calendar< + is_addressbook: >0< is_calendar: >1< resourcetypes: >< + schedule_transp: >transparent< diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test index ae2e4db7..009ab0c2 100644 --- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test +++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.test @@ -2,7 +2,7 @@ # Check for support of PROPPATCH method # # Convert the collection back to a calendar, change the displayname -# again, and remove the owner property. +# again, set the calendar as transparent and remove the arbitrary property. # TYPE=PROPPATCH URL=http://regression.host/caldav.php/user1/home/ @@ -12,14 +12,18 @@ HEAD BEGINDATA - + - + - User One's Calendar + User One's Transparent Calendar + + + @@ -27,11 +31,12 @@ BEGINDATA - + ENDDATA QUERY -SELECT dav_displayname, is_calendar, resourcetypes, - modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs +SELECT dav_displayname, is_calendar, is_addressbook, 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/842-Spec-PROPPATCH-3.result b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result index 6ddd7b78..fcef4343 100644 --- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result +++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result @@ -24,7 +24,7 @@ Content-Type: text/xml; charset="utf-8" changed_last_60se: >1< - dav_displayname: >User One's Calendar< + dav_displayname: >User One's Transparent Calendar< is_calendar: >1< resourcetypes: >< diff --git a/testing/tests/regression-suite/843-Spec-PROPFIND.result b/testing/tests/regression-suite/843-Spec-PROPFIND.result index f338ce1b..f9953345 100644 --- a/testing/tests/regression-suite/843-Spec-PROPFIND.result +++ b/testing/tests/regression-suite/843-Spec-PROPFIND.result @@ -7,7 +7,7 @@ /caldav.php/user1/ - User One's Calendar + User One's Transparent Calendar HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.result index 47ef5a8e..43645144 100644 --- a/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.result +++ b/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.result @@ -17,4 +17,5 @@ Content-Type: text/xml; charset="utf-8" is_addressbook: >0< is_calendar: >1< resourcetypes: >< + schedule_transp: >opaque< diff --git a/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.test b/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.test index ecc1a9a0..11c6a045 100644 --- a/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.test +++ b/testing/tests/regression-suite/846-Spec-PROPPATCH-calendar.test @@ -11,7 +11,7 @@ HEAD BEGINDATA - + @@ -20,6 +20,9 @@ BEGINDATA User 1's Calendaranza + + + @@ -27,6 +30,7 @@ ENDDATA QUERY SELECT dav_displayname, is_addressbook, is_calendar, resourcetypes, - modified > (current_timestamp - '5 minutes'::interval) AS changed_last_5m + 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/949-MKTICKET.result b/testing/tests/regression-suite/949-MKTICKET.result index 6d9f601a..c6bc9d05 100644 --- a/testing/tests/regression-suite/949-MKTICKET.result +++ b/testing/tests/regression-suite/949-MKTICKET.result @@ -1,14 +1,14 @@ HTTP/1.1 400 Bad Request Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -ETag: "7bc3d8a76fb705dfff8a6654bb8d7fb8" -Content-Length: 155 +ETag: "567b0424ecca3303b030d882be2093ef" +Content-Length: 86 Connection: close Content-Type: text/xml; charset="utf-8" - - + + dav_owner_id: >3< diff --git a/testing/tests/regression-suite/964-PROPFIND.result b/testing/tests/regression-suite/964-PROPFIND.result index 5fd281ca..3168e58a 100644 --- a/testing/tests/regression-suite/964-PROPFIND.result +++ b/testing/tests/regression-suite/964-PROPFIND.result @@ -8,7 +8,12 @@ /caldav.php/.resources/6 - + + + /caldav.php + user4 + + HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/980-MKCOL-base.result b/testing/tests/regression-suite/980-MKCOL-base.result new file mode 100644 index 00000000..9f174e49 --- /dev/null +++ b/testing/tests/regression-suite/980-MKCOL-base.result @@ -0,0 +1,16 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +Cache-Control: no-cache +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + dav_displayname: >A normal collection< + is_addressbook: >0< + is_calendar: >0< + parent_container: >/user4/< +public_events_onl: >0< + resourcetypes: >< + user_no: >13< + diff --git a/testing/tests/regression-suite/980-MKCOL-base.test b/testing/tests/regression-suite/980-MKCOL-base.test new file mode 100644 index 00000000..d103a7e5 --- /dev/null +++ b/testing/tests/regression-suite/980-MKCOL-base.test @@ -0,0 +1,29 @@ +# +# Extended MKCOL test - Normal collection to create off a principal-URL +# +TYPE=MKCOL +URL=http://regression.host/caldav.php/user4/base/ +HEADER=Content-Type: text/xml +AUTH=user4:user4 +HEAD + + +BEGINDATA + + + + + A normal collection + + + +ENDDATA + + +QUERY +SELECT user_no, parent_container, dav_displayname, + is_calendar, public_events_only, is_addressbook, resourcetypes +FROM collection +WHERE dav_name ~ '/user4/base/'; +ENDQUERY + diff --git a/testing/tests/regression-suite/981-MKCOL-subcal.result b/testing/tests/regression-suite/981-MKCOL-subcal.result new file mode 100644 index 00000000..75f89d78 --- /dev/null +++ b/testing/tests/regression-suite/981-MKCOL-subcal.result @@ -0,0 +1,28 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +Cache-Control: no-cache +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + dav_displayname: >A normal collection< + dav_name: >/user4/base/< + is_addressbook: >0< + is_calendar: >0< + parent_container: >/user4/< +public_events_onl: >0< + resourcetypes: >< + schedule_transp: >opaque< + user_no: >13< + + dav_displayname: >A sub collection< + dav_name: >/user4/base/calendar/< + is_addressbook: >0< + is_calendar: >1< + parent_container: >/user4/base/< +public_events_onl: >0< + resourcetypes: >< + schedule_transp: >opaque< + user_no: >13< + diff --git a/testing/tests/regression-suite/981-MKCOL-subcal.test b/testing/tests/regression-suite/981-MKCOL-subcal.test new file mode 100644 index 00000000..7f86e95a --- /dev/null +++ b/testing/tests/regression-suite/981-MKCOL-subcal.test @@ -0,0 +1,37 @@ +# +# Extended MKCOL test - Sub collection to create off a normal collection +# +TYPE=MKCOL +URL=http://regression.host/caldav.php/user4/base/calendar/ +HEADER=Content-Type: text/xml +AUTH=user4:user4 +HEAD + + +BEGINDATA + + + + + + + + + A sub collection + + + + + + +ENDDATA + + +QUERY +SELECT user_no, parent_container, dav_displayname, dav_name, + is_calendar, public_events_only, is_addressbook, resourcetypes, + schedule_transp +FROM collection +WHERE dav_name ~ '/user4/base/'; +ENDQUERY + diff --git a/testing/tests/regression-suite/982-BIND.result b/testing/tests/regression-suite/982-BIND.result new file mode 100644 index 00000000..668f7618 --- /dev/null +++ b/testing/tests/regression-suite/982-BIND.result @@ -0,0 +1,29 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +Location: /caldav.php/user4/base/user1/ +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + bind_id: >1430< + bound_source_id: >11< + dav_displayname: >Updated Displayname with PROPPATCH< + dav_name: >/user4/user2/< + length: >8< + parent_container: >/user4/< + + bind_id: >1431< + bound_source_id: >10< + dav_displayname: >User 1's Calendaranza< + dav_name: >/user4/user1/< + length: >8< + parent_container: >/user4/< + + bind_id: >1435< + bound_source_id: >10< + dav_displayname: >User 1's Calendaranza< + dav_name: >/user4/base/user1/< + length: >8< + parent_container: >/user4/base/< + diff --git a/testing/tests/regression-suite/982-BIND.test b/testing/tests/regression-suite/982-BIND.test new file mode 100644 index 00000000..e68e7a80 --- /dev/null +++ b/testing/tests/regression-suite/982-BIND.test @@ -0,0 +1,38 @@ +# +# BIND a collection into an additional location +# also applying a ticket during the bind +# +TYPE=BIND +URL=http://regression.host/caldav.php/user4/base/ +AUTH=user4:user4 + +# Get the ticket we created earlier in 948... +GETSQL=ticket +SELECT ticket_id FROM access_ticket + WHERE target_collection_id = 10 AND target_resource_id is null; +ENDSQL + +HEADER=User-Agent: Ticket Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Ticket: ##ticket## +HEAD + + +BEGINDATA + + + user1 + /caldav.php/user1/home + +ENDDATA + +QUERY +SELECT bind_id, + bound_source_id, + length(access_ticket_id), + parent_container, + dav_name, + dav_displayname + FROM dav_binding +ENDQUERY + diff --git a/testing/tests/regression-suite/983-BIND.result b/testing/tests/regression-suite/983-BIND.result new file mode 100644 index 00000000..84c4227f --- /dev/null +++ b/testing/tests/regression-suite/983-BIND.result @@ -0,0 +1,36 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +Location: /caldav.php/user4/base/user2/ +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + bind_id: >1430< + bound_source_id: >11< + dav_displayname: >Updated Displayname with PROPPATCH< + dav_name: >/user4/user2/< + length: >8< + parent_container: >/user4/< + + bind_id: >1431< + bound_source_id: >10< + dav_displayname: >User 1's Calendaranza< + dav_name: >/user4/user1/< + length: >8< + parent_container: >/user4/< + + bind_id: >1435< + bound_source_id: >10< + dav_displayname: >User 1's Calendaranza< + dav_name: >/user4/base/user1/< + length: >8< + parent_container: >/user4/base/< + + bind_id: >1436< + bound_source_id: >11< + dav_displayname: >User 2's Calendar, as uploaded by Admin< + dav_name: >/user4/base/user2/< + length: >8< + parent_container: >/user4/base/< + diff --git a/testing/tests/regression-suite/983-BIND.test b/testing/tests/regression-suite/983-BIND.test new file mode 100644 index 00000000..994dc889 --- /dev/null +++ b/testing/tests/regression-suite/983-BIND.test @@ -0,0 +1,38 @@ +# +# BIND a collection into an additional location +# also applying a ticket during the bind +# +TYPE=BIND +URL=http://regression.host/caldav.php/user4/base/ +AUTH=user4:user4 + +# Get the ticket we created earlier in 948... +GETSQL=ticket +SELECT ticket_id FROM access_ticket + WHERE target_collection_id = 11 AND target_resource_id is null; +ENDSQL + +HEADER=User-Agent: Ticket Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Ticket: ##ticket## +HEAD + + +BEGINDATA + + + user2 + /caldav.php/user2/home/ + +ENDDATA + +QUERY +SELECT bind_id, + bound_source_id, + length(access_ticket_id), + parent_container, + dav_name, + dav_displayname + FROM dav_binding +ENDQUERY + diff --git a/testing/tests/regression-suite/984-BIND.result b/testing/tests/regression-suite/984-BIND.result new file mode 100644 index 00000000..683075dc --- /dev/null +++ b/testing/tests/regression-suite/984-BIND.result @@ -0,0 +1,38 @@ +HTTP/1.1 403 Forbidden +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +Content-Length: 138 +Content-Type: text/xml; charset="utf-8" + + + + A resource already exists at the destination. + + bind_id: >1430< + bound_source_id: >11< + dav_displayname: >Updated Displayname with PROPPATCH< + dav_name: >/user4/user2/< + length: >8< + parent_container: >/user4/< + + bind_id: >1431< + bound_source_id: >10< + dav_displayname: >User 1's Calendaranza< + dav_name: >/user4/user1/< + length: >8< + parent_container: >/user4/< + + bind_id: >1435< + bound_source_id: >10< + dav_displayname: >User 1's Calendaranza< + dav_name: >/user4/base/user1/< + length: >8< + parent_container: >/user4/base/< + + bind_id: >1436< + bound_source_id: >11< + dav_displayname: >User 2's Calendar, as uploaded by Admin< + dav_name: >/user4/base/user2/< + length: >8< + parent_container: >/user4/base/< + diff --git a/testing/tests/regression-suite/984-BIND.test b/testing/tests/regression-suite/984-BIND.test new file mode 100644 index 00000000..03248232 --- /dev/null +++ b/testing/tests/regression-suite/984-BIND.test @@ -0,0 +1,38 @@ +# +# BIND a collection into an additional location +# also applying a ticket during the bind +# +TYPE=BIND +URL=http://regression.host/caldav.php/user4/base/ +AUTH=user4:user4 + +# Get the ticket we created earlier in 948... +GETSQL=ticket +SELECT ticket_id FROM access_ticket + WHERE target_collection_id = 11 AND target_resource_id is null; +ENDSQL + +HEADER=User-Agent: Ticket Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Ticket: ##ticket## +HEAD + + +BEGINDATA + + + user2 + /caldav.php/user2/home + +ENDDATA + +QUERY +SELECT bind_id, + bound_source_id, + length(access_ticket_id), + parent_container, + dav_name, + dav_displayname + FROM dav_binding +ENDQUERY + diff --git a/testing/tests/regression-suite/985-PROPFIND.result b/testing/tests/regression-suite/985-PROPFIND.result new file mode 100644 index 00000000..2c2ac814 --- /dev/null +++ b/testing/tests/regression-suite/985-PROPFIND.result @@ -0,0 +1,109 @@ + + + + /caldav.php/user4/base/ + + + A normal collection + + /caldav.php/.resources/1433 + + + + /caldav.php/user4 + base + + + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/base/user1/ + + + User 1's Calendaranza + + /caldav.php/.resources/10 + + + + /caldav.php/user1 + home + + + /caldav.php/user4 + user1 + + + /caldav.php/user4/base + user1 + + + + + + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/base/user2/ + + + User 2's Calendar, as uploaded by Admin + + /caldav.php/.resources/11 + + + + /caldav.php/user2 + home + + + /caldav.php/user4 + user2 + + + /caldav.php/user4/base + user2 + + + + + + + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/base/calendar/ + + + A sub collection + + /caldav.php/.resources/1434 + + + + /caldav.php/user4/base + calendar + + + + + + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/985-PROPFIND.test b/testing/tests/regression-suite/985-PROPFIND.test new file mode 100644 index 00000000..534af62b --- /dev/null +++ b/testing/tests/regression-suite/985-PROPFIND.test @@ -0,0 +1,25 @@ +# +# PROPFIND on a collection in which we have binds & collections +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user4/base/ +AUTH=user4:user4 + +HEADER=User-Agent: BIND Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Depth: 1 + + +BEGINDATA + + + + + + + + + +ENDDATA + +# diff --git a/testing/tests/regression-suite/986-PUT-bound-succeed.result b/testing/tests/regression-suite/986-PUT-bound-succeed.result new file mode 100644 index 00000000..18b2f212 --- /dev/null +++ b/testing/tests/regression-suite/986-PUT-bound-succeed.result @@ -0,0 +1,18 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +ETag: "1c7895f11787e71fd6dbe3260d72d4a0" +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a< + dav_name: >/user2/home/thiswillworkfine.ics< + dtstart: >2010-03-22 18:00:00+13< + summary: >Test adding an event to a bound collection< + + dav_etag: >1c7895f11787e71fd6dbe3260d72d4a0< + dav_name: >/user2/home/thiswillalsobegood.ics< + dtstart: >2004-01-01 12:00:00+13< + summary: >Release DAViCal 0.9.9< + diff --git a/testing/tests/regression-suite/986-PUT-bound-succeed.test b/testing/tests/regression-suite/986-PUT-bound-succeed.test new file mode 100644 index 00000000..32262776 --- /dev/null +++ b/testing/tests/regression-suite/986-PUT-bound-succeed.test @@ -0,0 +1,54 @@ +# +# Attempt to put an event into a bound location, where +# the binding does confer write privileges +# +TYPE=PUT +URL=http://regression.host/caldav.php/user4/base/user2/thiswillalsobegood.ics + +HEADER=Content-Type: text/calendar; charset=utf-8 +AUTH=user4:user4 +HEAD + +BEGINDATA +BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//Apple Inc.//iCal 3.0//EN +CALSCALE:GREGORIAN +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +DTSTART:19900318T030000 +RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU +TZNAME:NZST +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +DTSTART:19901007T020000 +RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYMONTH=10;BYDAY=1SU +TZNAME:NZDT +END:DAYLIGHT +END:VTIMEZONE +BEGIN:VTODO +PRIORITY:0 +SEQUENCE:4 +DTSTART;TZID=Pacific/Auckland:20040101T120000 +UID:A51AC037-E6F9-4E03-872C-7DFE0B67D1FF +DTSTAMP:20100318T210557Z +SUMMARY:Release DAViCal 0.9.9 +CREATED:20100318T210457Z +X-APPLE-SORT-ORDER:2147483647 +DUE;VALUE=DATE:20100326 +END:VTODO +END:VCALENDAR +ENDDATA + +QUERY +SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary + FROM caldav_data JOIN calendar_item USING(dav_name) + WHERE caldav_data.dav_name ~ '/user2/.*thiswill' +ENDQUERY + + diff --git a/testing/tests/regression-suite/987-PROPFIND.result b/testing/tests/regression-suite/987-PROPFIND.result new file mode 100644 index 00000000..408e5adf --- /dev/null +++ b/testing/tests/regression-suite/987-PROPFIND.result @@ -0,0 +1,24 @@ + + + + /caldav.php/user4/base/ + + + A normal collection + + /caldav.php/.resources/1433 + + + + /caldav.php/user4 + base + + + + + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/987-PROPFIND.test b/testing/tests/regression-suite/987-PROPFIND.test new file mode 100644 index 00000000..d80effe3 --- /dev/null +++ b/testing/tests/regression-suite/987-PROPFIND.test @@ -0,0 +1,27 @@ +# +# PROPFIND on a collection in which we have binds & collections +# +# In this case we're doing Depth: 0 +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user4/base/ +AUTH=user4:user4 + +HEADER=User-Agent: BIND Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Depth: 0 + + +BEGINDATA + + + + + + + + + +ENDDATA + +# diff --git a/testing/tests/regression-suite/988-PROPFIND.result b/testing/tests/regression-suite/988-PROPFIND.result new file mode 100644 index 00000000..9d140835 --- /dev/null +++ b/testing/tests/regression-suite/988-PROPFIND.result @@ -0,0 +1,27 @@ + + + + /caldav.php/user4/ + + + + /caldav.php/user4/ + + + /caldav.php/.resources/6 + + + + /caldav.php + user4 + + + + + + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/988-PROPFIND.test b/testing/tests/regression-suite/988-PROPFIND.test new file mode 100644 index 00000000..51638149 --- /dev/null +++ b/testing/tests/regression-suite/988-PROPFIND.test @@ -0,0 +1,28 @@ +# +# PROPFIND calendar-home-set where we have a calendar in +# another collection somewhere. +# +# In this case we're doing Depth: 0 on the principal +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user4/ +AUTH=user4:user4 + +HEADER=User-Agent: BIND Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Depth: 0 + + +BEGINDATA + + + + + + + + + +ENDDATA + +#