From d943c3f26374b51c24fa60812cc005b6ece68ed7 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 15 Mar 2010 00:29:46 +1300 Subject: [PATCH] New regression tests/results for BIND/PROPFIND/REPORT. --- .../tests/regression-suite/962-BIND.result | 16 ++ testing/tests/regression-suite/962-BIND.test | 39 +++++ .../tests/regression-suite/963-BIND.result | 18 +++ testing/tests/regression-suite/963-BIND.test | 39 +++++ .../regression-suite/964-PROPFIND.result | 48 ++++++ .../tests/regression-suite/964-PROPFIND.test | 22 +++ .../regression-suite/965-PROPFIND.result | 128 ++++++++++++++++ .../tests/regression-suite/965-PROPFIND.test | 24 +++ .../regression-suite/966-REPORT-bound.result | 142 ++++++++++++++++++ .../regression-suite/966-REPORT-bound.test | 26 ++++ .../regression-suite/967-PROPFIND.result | 55 +++++++ .../tests/regression-suite/967-PROPFIND.test | 23 +++ 12 files changed, 580 insertions(+) create mode 100644 testing/tests/regression-suite/962-BIND.result create mode 100644 testing/tests/regression-suite/962-BIND.test create mode 100644 testing/tests/regression-suite/963-BIND.result create mode 100644 testing/tests/regression-suite/963-BIND.test create mode 100644 testing/tests/regression-suite/964-PROPFIND.result create mode 100644 testing/tests/regression-suite/964-PROPFIND.test create mode 100644 testing/tests/regression-suite/965-PROPFIND.result create mode 100644 testing/tests/regression-suite/965-PROPFIND.test create mode 100644 testing/tests/regression-suite/966-REPORT-bound.result create mode 100644 testing/tests/regression-suite/966-REPORT-bound.test create mode 100644 testing/tests/regression-suite/967-PROPFIND.result create mode 100644 testing/tests/regression-suite/967-PROPFIND.test diff --git a/testing/tests/regression-suite/962-BIND.result b/testing/tests/regression-suite/962-BIND.result new file mode 100644 index 00000000..849c4025 --- /dev/null +++ b/testing/tests/regression-suite/962-BIND.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 +Location: /caldav.php/user4/user2/ +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + bind_id: >1430< + bound_source_id: >11< + dav_displayname: >Bind to User 2's Calendar, as uploaded by Admin< + dav_name: >/user4/user2/< + dav_owner_id: >6< + length: >8< + parent_container: >/user4/< + diff --git a/testing/tests/regression-suite/962-BIND.test b/testing/tests/regression-suite/962-BIND.test new file mode 100644 index 00000000..1da2acf0 --- /dev/null +++ b/testing/tests/regression-suite/962-BIND.test @@ -0,0 +1,39 @@ +# +# BIND a collection into an additional location +# also applying a ticket during the bind +# +TYPE=BIND +URL=http://regression.host/caldav.php/user4/ +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), + dav_owner_id, + parent_container, + dav_name, + dav_displayname + FROM dav_binding +ENDQUERY + diff --git a/testing/tests/regression-suite/963-BIND.result b/testing/tests/regression-suite/963-BIND.result new file mode 100644 index 00000000..cd29b194 --- /dev/null +++ b/testing/tests/regression-suite/963-BIND.result @@ -0,0 +1,18 @@ +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: >Bind to User 2's Calendar, as uploaded by Admin< + dav_name: >/user4/user2/< + dav_owner_id: >6< + length: >8< + parent_container: >/user4/< + diff --git a/testing/tests/regression-suite/963-BIND.test b/testing/tests/regression-suite/963-BIND.test new file mode 100644 index 00000000..1da2acf0 --- /dev/null +++ b/testing/tests/regression-suite/963-BIND.test @@ -0,0 +1,39 @@ +# +# BIND a collection into an additional location +# also applying a ticket during the bind +# +TYPE=BIND +URL=http://regression.host/caldav.php/user4/ +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), + dav_owner_id, + parent_container, + dav_name, + dav_displayname + FROM dav_binding +ENDQUERY + diff --git a/testing/tests/regression-suite/964-PROPFIND.result b/testing/tests/regression-suite/964-PROPFIND.result new file mode 100644 index 00000000..a40fffb4 --- /dev/null +++ b/testing/tests/regression-suite/964-PROPFIND.result @@ -0,0 +1,48 @@ + + + + /caldav.php/user4/ + + + User 4 + + HTTP/1.1 200 OK + + + + /caldav.php/user4/user2/ + + + Bind to User 2's Calendar, as uploaded by Admin + + HTTP/1.1 200 OK + + + + /caldav.php/user4/home/ + + + mir-test + + HTTP/1.1 200 OK + + + + /caldav.php/user4/calendar-proxy-read/ + + + /user4/calendar-proxy-read/ + + HTTP/1.1 200 OK + + + + /caldav.php/user4/calendar-proxy-write/ + + + /user4/calendar-proxy-write/ + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/964-PROPFIND.test b/testing/tests/regression-suite/964-PROPFIND.test new file mode 100644 index 00000000..d3b9d14c --- /dev/null +++ b/testing/tests/regression-suite/964-PROPFIND.test @@ -0,0 +1,22 @@ +# +# PROPFIND on a collection which we have bound into user4's home +# +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: 1 + + +BEGINDATA + + + + + + +ENDDATA + +# diff --git a/testing/tests/regression-suite/965-PROPFIND.result b/testing/tests/regression-suite/965-PROPFIND.result new file mode 100644 index 00000000..ee61b7d0 --- /dev/null +++ b/testing/tests/regression-suite/965-PROPFIND.result @@ -0,0 +1,128 @@ + + + + /caldav.php/user4/user2/ + + + Bind to User 2's Calendar, as uploaded by Admin + + /user4/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics + + + "64d28f4f57515d6c63cec02b5d882eaa" + Daily Action Meeting + + /caldav.php/user2/ + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 403 Forbidden + + + + /caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics + + + "58cba7e3fafb6080e85619ea77d08c7a" + Weekly Project Meeting + + /caldav.php/user2/ + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 403 Forbidden + + + + /caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics + + + "13249ced6c7527191a003f54f7e3cd25" + Weekly catch-up + + /caldav.php/user2/ + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 403 Forbidden + + + diff --git a/testing/tests/regression-suite/965-PROPFIND.test b/testing/tests/regression-suite/965-PROPFIND.test new file mode 100644 index 00000000..7e6d2a85 --- /dev/null +++ b/testing/tests/regression-suite/965-PROPFIND.test @@ -0,0 +1,24 @@ +# +# PROPFIND on a collection which we have bound into user4's home +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user4/user2/ +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/966-REPORT-bound.result b/testing/tests/regression-suite/966-REPORT-bound.result new file mode 100644 index 00000000..2e2d0dc1 --- /dev/null +++ b/testing/tests/regression-suite/966-REPORT-bound.result @@ -0,0 +1,142 @@ +HTTP/1.1 207 Multi-Status +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy +ETag: "46385e06c78acb23818555378cced9bd" +Content-Length: 3517 +Content-Type: text/xml; charset="utf-8" + + + + + /caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics + + + "64d28f4f57515d6c63cec02b5d882eaa" + BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VEVENT +CREATED:20081023T054958Z +LAST-MODIFIED:20081023T055044Z +DTSTAMP:20081023T054958Z +UID:33169d69-2969-4a96-a3e1-2e312b7614e6 +SUMMARY:Daily Action Meeting +RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR +DTSTART;TZID=Pacific/Auckland:20081020T110000 +DTEND;TZID=Pacific/Auckland:20081020T113000 +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +X-LIC-LOCATION:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:NZDT +DTSTART:19700927T020000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19700405T030000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics + + + "58cba7e3fafb6080e85619ea77d08c7a" + BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VEVENT +CREATED:20081023T054934Z +LAST-MODIFIED:20081023T055059Z +DTSTAMP:20081023T054934Z +UID:047871e3-6b70-4178-9af8-0ceb50f7b092 +SUMMARY:Weekly Project Meeting +RRULE:FREQ=WEEKLY;INTERVAL=1 +DTSTART;TZID=Pacific/Auckland:20081020T090000 +DTEND;TZID=Pacific/Auckland:20081020T100000 +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +X-LIC-LOCATION:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:NZDT +DTSTART:19700927T020000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19700405T030000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR + + + HTTP/1.1 200 OK + + + + /caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics + + + "13249ced6c7527191a003f54f7e3cd25" + BEGIN:VCALENDAR +PRODID:-//davical.org//NONSGML AWL Calendar//EN +VERSION:2.0 +CALSCALE:GREGORIAN +BEGIN:VEVENT +CREATED:20081023T055115Z +LAST-MODIFIED:20081023T055139Z +DTSTAMP:20081023T055115Z +UID:9429a973-2b13-4b1a-be09-948d75425c45 +SUMMARY:Weekly catch-up +RRULE:FREQ=WEEKLY;INTERVAL=1 +DTSTART;TZID=Pacific/Auckland:20081024T140000 +DTEND;TZID=Pacific/Auckland:20081024T150000 +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VTIMEZONE +TZID:Pacific/Auckland +X-LIC-LOCATION:Pacific/Auckland +BEGIN:DAYLIGHT +TZOFFSETFROM:+1200 +TZOFFSETTO:+1300 +TZNAME:NZDT +DTSTART:19700927T020000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+1300 +TZOFFSETTO:+1200 +TZNAME:NZST +DTSTART:19700405T030000 +RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4 +END:STANDARD +END:VTIMEZONE +END:VCALENDAR + + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/966-REPORT-bound.test b/testing/tests/regression-suite/966-REPORT-bound.test new file mode 100644 index 00000000..d3a6389d --- /dev/null +++ b/testing/tests/regression-suite/966-REPORT-bound.test @@ -0,0 +1,26 @@ +# +# Test multiget REPORT access to a bound calendar +# +TYPE=REPORT +URL=http://regression.host/caldav.php/user4/user2/ +AUTH=user4:user4 + + +HEADER=User-Agent: DAViCalTester/public +HEADER=Content-Type: text/xml; charset="UTF-8" +HEAD + + +BEGINDATA + + + + + + + /caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics + /caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics + /caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics + +ENDDATA + diff --git a/testing/tests/regression-suite/967-PROPFIND.result b/testing/tests/regression-suite/967-PROPFIND.result new file mode 100644 index 00000000..41a81997 --- /dev/null +++ b/testing/tests/regression-suite/967-PROPFIND.result @@ -0,0 +1,55 @@ + + + + /caldav.php/user4/user2/ + + + httpd/unix-directory + + + + + + HTTP/1.1 200 OK + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics + + + text/calendar + + "64d28f4f57515d6c63cec02b5d882eaa" + + HTTP/1.1 200 OK + + + + /caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics + + + text/calendar + + "58cba7e3fafb6080e85619ea77d08c7a" + + HTTP/1.1 200 OK + + + + /caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics + + + text/calendar + + "13249ced6c7527191a003f54f7e3cd25" + + HTTP/1.1 200 OK + + + diff --git a/testing/tests/regression-suite/967-PROPFIND.test b/testing/tests/regression-suite/967-PROPFIND.test new file mode 100644 index 00000000..946f1475 --- /dev/null +++ b/testing/tests/regression-suite/967-PROPFIND.test @@ -0,0 +1,23 @@ +# +# PROPFIND on a collection which we have bound into user4's home +# +TYPE=PROPFIND +URL=http://regression.host/caldav.php/user4/user2/ +AUTH=user4:user4 + +HEADER=User-Agent: BIND Spec Tests +HEADER=Content-Type: text/xml; charset="UTF-8" +HEADER=Depth: 1 + + +BEGINDATA + + + + + + + + +ENDDATA +