From b80ba50e088d86b703e2477fe7dfd19aeae7f5d8 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Tue, 16 Oct 2007 12:04:01 +1300 Subject: [PATCH] Modified regression test output for version / name changes. --- .../regression-suite/100-Evo-OPTIONS-1.result | 2 +- .../regression-suite/200-Moz-OPTIONS-1.result | 2 +- .../regression-suite/202-Moz-REPORT-1.result | 2 +- .../230-Moz-REPORT-Tasks-Completed.result | 50 +++++++++---------- .../231-Moz-REPORT-All-Tasks.result | 50 +++++++++---------- .../300-Chandler-OPTIONS-1.result | 2 +- .../301-Chandler-HEAD-1.result | 2 +- .../regression-suite/900-Moz-REPORT.result | 48 +++++++++--------- 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/testing/tests/regression-suite/100-Evo-OPTIONS-1.result b/testing/tests/regression-suite/100-Evo-OPTIONS-1.result index ccf9a32d..33fda4cd 100644 --- a/testing/tests/regression-suite/100-Evo-OPTIONS-1.result +++ b/testing/tests/regression-suite/100-Evo-OPTIONS-1.result @@ -1,6 +1,6 @@ HTTP/1.1 401 Unauthorized Date: Dow, 01 Jan 2000 00:00:00 GMT -WWW-Authenticate: Basic realm="Really Simple CalDAV Store" +WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" diff --git a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result index ccf9a32d..33fda4cd 100644 --- a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result +++ b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result @@ -1,6 +1,6 @@ HTTP/1.1 401 Unauthorized Date: Dow, 01 Jan 2000 00:00:00 GMT -WWW-Authenticate: Basic realm="Really Simple CalDAV Store" +WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" diff --git a/testing/tests/regression-suite/202-Moz-REPORT-1.result b/testing/tests/regression-suite/202-Moz-REPORT-1.result index ccf9a32d..33fda4cd 100644 --- a/testing/tests/regression-suite/202-Moz-REPORT-1.result +++ b/testing/tests/regression-suite/202-Moz-REPORT-1.result @@ -1,6 +1,6 @@ HTTP/1.1 401 Unauthorized Date: Dow, 01 Jan 2000 00:00:00 GMT -WWW-Authenticate: Basic realm="Really Simple CalDAV Store" +WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" diff --git a/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result b/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result index 71abec17..29398665 100644 --- a/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result +++ b/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result @@ -1,35 +1,11 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT -ETag: "8f48e613721a5ccb5e44c277f7a1a909" +ETag: "bbb923460d5444f84e412613abba341f" Content-Length: 1630 Content-Type: text/xml; charset="utf-8" - - http://myapms/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - - - "509b0f0d8a3363379f9f5727f5dd74a0" - BEGIN:VCALENDAR -PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN -VERSION:2.0 -BEGIN:VTODO -CREATED:20070805T200215Z -LAST-MODIFIED:20070805T201531Z -DTSTAMP:20070805T200215Z -UID:2178279a-aec2-471f-832d-1f6df6203f2f -SUMMARY:Incomplete\, uncancelled -X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics -DESCRIPTION:This task is incomplete and has not been cancelled (has no - status at all) -END:VTODO -END:VCALENDAR - - - HTTP/1.1 200 OK - - http://myapms/calendar/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics @@ -51,6 +27,30 @@ DESCRIPTION:This task is in progress (50% complete) and has not been cancelled. END:VTODO END:VCALENDAR + + + HTTP/1.1 200 OK + + + + http://myapms/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics + + + "509b0f0d8a3363379f9f5727f5dd74a0" + BEGIN:VCALENDAR +PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN +VERSION:2.0 +BEGIN:VTODO +CREATED:20070805T200215Z +LAST-MODIFIED:20070805T201531Z +DTSTAMP:20070805T200215Z +UID:2178279a-aec2-471f-832d-1f6df6203f2f +SUMMARY:Incomplete\, uncancelled +X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics +DESCRIPTION:This task is incomplete and has not been cancelled (has no + status at all) +END:VTODO +END:VCALENDAR HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result index fb9fbe69..a04a340c 100644 --- a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result +++ b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result @@ -1,35 +1,11 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT -ETag: "5c9f342ddba9b5c267dac8ad62586abe" +ETag: "413676a830dba33b4dd06de313db79f6" Content-Length: 4276 Content-Type: text/xml; charset="utf-8" - - http://myapms/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - - - "509b0f0d8a3363379f9f5727f5dd74a0" - BEGIN:VCALENDAR -PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN -VERSION:2.0 -BEGIN:VTODO -CREATED:20070805T200215Z -LAST-MODIFIED:20070805T201531Z -DTSTAMP:20070805T200215Z -UID:2178279a-aec2-471f-832d-1f6df6203f2f -SUMMARY:Incomplete\, uncancelled -X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics -DESCRIPTION:This task is incomplete and has not been cancelled (has no - status at all) -END:VTODO -END:VCALENDAR - - - HTTP/1.1 200 OK - - http://myapms/calendar/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics @@ -142,6 +118,30 @@ DESCRIPTION:This is a task with a Start and a Due date\, but it has been cancelled. END:VTODO END:VCALENDAR + + + HTTP/1.1 200 OK + + + + http://myapms/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics + + + "509b0f0d8a3363379f9f5727f5dd74a0" + BEGIN:VCALENDAR +PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN +VERSION:2.0 +BEGIN:VTODO +CREATED:20070805T200215Z +LAST-MODIFIED:20070805T201531Z +DTSTAMP:20070805T200215Z +UID:2178279a-aec2-471f-832d-1f6df6203f2f +SUMMARY:Incomplete\, uncancelled +X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics +DESCRIPTION:This task is incomplete and has not been cancelled (has no + status at all) +END:VTODO +END:VCALENDAR HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result b/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result index ccf9a32d..33fda4cd 100644 --- a/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result +++ b/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result @@ -1,6 +1,6 @@ HTTP/1.1 401 Unauthorized Date: Dow, 01 Jan 2000 00:00:00 GMT -WWW-Authenticate: Basic realm="Really Simple CalDAV Store" +WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Length: 40 Content-Type: text/plain; ; charset="utf-8" diff --git a/testing/tests/regression-suite/301-Chandler-HEAD-1.result b/testing/tests/regression-suite/301-Chandler-HEAD-1.result index 9ebc741e..8e56aeda 100644 --- a/testing/tests/regression-suite/301-Chandler-HEAD-1.result +++ b/testing/tests/regression-suite/301-Chandler-HEAD-1.result @@ -1,5 +1,5 @@ HTTP/1.1 401 Unauthorized Date: Dow, 01 Jan 2000 00:00:00 GMT -WWW-Authenticate: Basic realm="Really Simple CalDAV Store" +WWW-Authenticate: Basic realm="DAViCal CalDAV Server" Content-Type: text/plain; ; charset="utf-8" diff --git a/testing/tests/regression-suite/900-Moz-REPORT.result b/testing/tests/regression-suite/900-Moz-REPORT.result index d3c16a97..51e18e36 100644 --- a/testing/tests/regression-suite/900-Moz-REPORT.result +++ b/testing/tests/regression-suite/900-Moz-REPORT.result @@ -1,6 +1,6 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT -ETag: "22d2ec2ca3e08afc175c8adff74a499c" +ETag: "fd581d26474ce6a1468269c0c5a6573e" Content-Length: 6643 Keep-Alive: timeout=15, max=100 Connection: Keep-Alive @@ -183,6 +183,29 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10 END:DAYLIGHT END:VTIMEZONE END:VCALENDAR + + + HTTP/1.1 200 OK + + + + http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + + + BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//PYVOBJECT//NONSGML Version 1//EN +BEGIN:VEVENT +UID:da81c0ee-7871-11db-c6d6-f6927c144649 +DTSTART:20061103T073000 +DTEND:20061103T093000 +DESCRIPTION: +LOCATION:Olivia's +RRULE:FREQ=MONTHLY +STATUS:CONFIRMED +SUMMARY:Morning Mgmt Mtg +END:VEVENT +END:VCALENDAR HTTP/1.1 200 OK @@ -223,29 +246,6 @@ STATUS:CONFIRMED SUMMARY:Beer O'Clock END:VEVENT END:VCALENDAR - - - HTTP/1.1 200 OK - - - - http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - - - BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//PYVOBJECT//NONSGML Version 1//EN -BEGIN:VEVENT -UID:da81c0ee-7871-11db-c6d6-f6927c144649 -DTSTART:20061103T073000 -DTEND:20061103T093000 -DESCRIPTION: -LOCATION:Olivia's -RRULE:FREQ=MONTHLY -STATUS:CONFIRMED -SUMMARY:Morning Mgmt Mtg -END:VEVENT -END:VCALENDAR HTTP/1.1 200 OK