From 1ff298c42b062023b1daf7776a4314aadd05fccf Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Tue, 6 Oct 2009 14:39:53 +1300 Subject: [PATCH] Updated results. --- .../013-Mulberry-PROPFIND-5.result | 24 +- .../015-Mulberry-PROPFIND-6.result | 24 +- .../regression-suite/103-Evo-GET-1.result | 2 +- .../regression-suite/106-Evo-GET-1.result | 2 +- .../regression-suite/108-Evo-REPORT-1.test | 2 +- .../230-Moz-REPORT-Tasks-Completed.test | 2 +- .../231-Moz-REPORT-All-Tasks.test | 2 +- .../240-Moz-PROPFIND-sub.test | 2 +- .../309-Chandler-PROPFIND-4.result | 124 +-- .../regression-suite/504-iCal-PROPFIND.result | 150 ++-- .../regression-suite/602-Soho-PROPFIND.result | 232 +++--- .../822-Spec-PROPFIND-3.result | 778 +++++++++--------- .../840-Spec-PROPPATCH-1.result | 24 +- .../840-Spec-PROPPATCH-1.test | 2 +- .../regression-suite/872-PROPFIND.result | 10 +- .../901-GET-Collection.result | 2 +- .../903-GET-Collection.result | 2 +- 17 files changed, 692 insertions(+), 692 deletions(-) diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result index 89d82617..b4e51c01 100644 --- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result +++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result @@ -1,7 +1,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 -ETag: "d316148bfdf4f6d2cb5c4df178609e23" +ETag: "5747e43a52649b3441d9f8cff66c0e8f" Content-Length: 1083 Content-Type: text/xml; charset="utf-8" @@ -22,17 +22,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - - - 705 - text/calendar - - - HTTP/1.1 200 OK - - /caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics @@ -44,4 +33,15 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics + + + 705 + text/calendar + + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result index d4ef2cf8..ffb18b9b 100644 --- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result +++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result @@ -1,7 +1,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 -ETag: "c9ccb2ceab9d94e563d624971bb5bdfe" +ETag: "48a3d4c6e9074f82e775ae6604591d2c" Content-Length: 1083 Content-Type: text/xml; charset="utf-8" @@ -22,17 +22,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - - - 747 - text/calendar - - - HTTP/1.1 200 OK - - /caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics @@ -44,4 +33,15 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics + + + 747 + text/calendar + + + HTTP/1.1 200 OK + + diff --git a/testing/tests/regression-suite/103-Evo-GET-1.result b/testing/tests/regression-suite/103-Evo-GET-1.result index dc62813f..c7677113 100644 --- a/testing/tests/regression-suite/103-Evo-GET-1.result +++ b/testing/tests/regression-suite/103-Evo-GET-1.result @@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule Etag: "2c32a2f8aba853654eb17fe037a4db4d" Content-Length: 747 -Content-Type: text/calendar +Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR CALSCALE:GREGORIAN diff --git a/testing/tests/regression-suite/106-Evo-GET-1.result b/testing/tests/regression-suite/106-Evo-GET-1.result index e4566baf..e266e3b8 100644 --- a/testing/tests/regression-suite/106-Evo-GET-1.result +++ b/testing/tests/regression-suite/106-Evo-GET-1.result @@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule Etag: "c3658901fd4689d4a1e1d6f08601ef4f" Content-Length: 1059 -Content-Type: text/calendar +Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR CALSCALE:GREGORIAN diff --git a/testing/tests/regression-suite/108-Evo-REPORT-1.test b/testing/tests/regression-suite/108-Evo-REPORT-1.test index bbda3ac4..a1a24e83 100644 --- a/testing/tests/regression-suite/108-Evo-REPORT-1.test +++ b/testing/tests/regression-suite/108-Evo-REPORT-1.test @@ -2,7 +2,7 @@ # Do a REPORT request (test operation in subdirectory of unrelated site) # TYPE=REPORT -URL=http://myempty/davical/caldav.php/user1/home/ +URL=http://alternate.host/davical/caldav.php/user1/home/ HEAD HEADER=Depth: 1 HEADER=User-Agent: Evolution/1.8.1 diff --git a/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.test b/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.test index 0ed6e97b..41353258 100644 --- a/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.test +++ b/testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.test @@ -2,7 +2,7 @@ # Do a REPORT request (test operation in subdirectory of unrelated site) # TYPE=REPORT -URL=http://myempty/davical/caldav.php/user1/home/ +URL=http://alternate.host/davical/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 diff --git a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.test b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.test index 773e564d..8f030cd7 100644 --- a/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.test +++ b/testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.test @@ -2,7 +2,7 @@ # Do a REPORT request (test operation in subdirectory of unrelated site) # TYPE=REPORT -URL=http://myempty/davical/caldav.php/user1/home/ +URL=http://alternate.host/davical/caldav.php/user1/home/ HEAD HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7 diff --git a/testing/tests/regression-suite/240-Moz-PROPFIND-sub.test b/testing/tests/regression-suite/240-Moz-PROPFIND-sub.test index 11a48d4e..cea4d27e 100644 --- a/testing/tests/regression-suite/240-Moz-PROPFIND-sub.test +++ b/testing/tests/regression-suite/240-Moz-PROPFIND-sub.test @@ -2,7 +2,7 @@ # Check for PROPFIND for scheduing inbox/outbox # TYPE=PROPFIND -URL=http://myempty/davical/caldav.php/user1/ +URL=http://alternate.host/davical/caldav.php/user1/ HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9 HEADER=Accept: text/xml HEADER=Accept-Language: en-us,en;q=0.5 diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result index 5a564bef..a9db0084 100644 --- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result +++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result @@ -1,7 +1,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 -ETag: "cc05bebfa735e4f0ece20d0881208947" +ETag: "943586f4f818ccaff360f46d7b8e97e5" Content-Length: 4267 Content-Type: text/xml; charset="utf-8" @@ -23,23 +23,12 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - Due 7/8/7 16:30, completed + Lunch with David - "00ad5eb1eb5507884710b0b66aa5d5c4" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics - - - Private Event - - "5def8ae2b20893a1c7f4dbaeb008f2f1" + "2c32a2f8aba853654eb17fe037a4db4d" HTTP/1.1 200 OK @@ -55,28 +44,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - - - Incomplete, uncancelled - - "509b0f0d8a3363379f9f5727f5dd74a0" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - - - Lunch with David - - "2c32a2f8aba853654eb17fe037a4db4d" - - HTTP/1.1 200 OK - - /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics @@ -88,17 +55,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics - - - 50% Complete, uncancelled - - "cb3d9dc3e8c157f53eba3ea0e1e0f146" - - HTTP/1.1 200 OK - - /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics @@ -110,6 +66,61 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics + + + Private Event + + "5def8ae2b20893a1c7f4dbaeb008f2f1" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + + + Tentative Event + + "ac90acd649c25070b1a2a17fb31a105a" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics + + + Incomplete, uncancelled + + "509b0f0d8a3363379f9f5727f5dd74a0" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics + + + 50% Complete, uncancelled + + "cb3d9dc3e8c157f53eba3ea0e1e0f146" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics + + + Due 7/8/7 16:30, completed + + "00ad5eb1eb5507884710b0b66aa5d5c4" + + HTTP/1.1 200 OK + + /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics @@ -121,17 +132,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - - - Release 0.9.3 - - "8f581a053df6d833254756dfd7553d37" - - HTTP/1.1 200 OK - - /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics @@ -144,12 +144,12 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - Tentative Event + Release 0.9.3 - "ac90acd649c25070b1a2a17fb31a105a" + "8f581a053df6d833254756dfd7553d37" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.result b/testing/tests/regression-suite/504-iCal-PROPFIND.result index 77ea7e6a..4368dd5a 100644 --- a/testing/tests/regression-suite/504-iCal-PROPFIND.result +++ b/testing/tests/regression-suite/504-iCal-PROPFIND.result @@ -1,7 +1,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 -ETag: "a49a7e4a5017a52585a5fe3a3659542e" +ETag: "9953cc10c8f89c379815cd05912cf774" Content-Length: 4135 Content-Type: text/xml; charset="utf-8" @@ -22,21 +22,11 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - "00ad5eb1eb5507884710b0b66aa5d5c4" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics - - - - "5def8ae2b20893a1c7f4dbaeb008f2f1" + "2c32a2f8aba853654eb17fe037a4db4d" HTTP/1.1 200 OK @@ -51,26 +41,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - - - - "509b0f0d8a3363379f9f5727f5dd74a0" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - - - - "2c32a2f8aba853654eb17fe037a4db4d" - - HTTP/1.1 200 OK - - /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics @@ -81,26 +51,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - - - - "0d7a68984bf525342d22b8924a57e8e2" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics - - - - "cb3d9dc3e8c157f53eba3ea0e1e0f146" - - HTTP/1.1 200 OK - - /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics @@ -111,6 +61,56 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK + + /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics + + + + "5def8ae2b20893a1c7f4dbaeb008f2f1" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + + + + "ac90acd649c25070b1a2a17fb31a105a" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics + + + + "509b0f0d8a3363379f9f5727f5dd74a0" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics + + + + "cb3d9dc3e8c157f53eba3ea0e1e0f146" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics + + + + "00ad5eb1eb5507884710b0b66aa5d5c4" + + HTTP/1.1 200 OK + + /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics @@ -121,26 +121,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - - /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - - - - "421abf7e4848d2fecbf64217ed205d4b" - - HTTP/1.1 200 OK - - - - /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - - - - "8f581a053df6d833254756dfd7553d37" - - HTTP/1.1 200 OK - - /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics @@ -152,11 +132,31 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - "ac90acd649c25070b1a2a17fb31a105a" + "8f581a053df6d833254756dfd7553d37" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics + + + + "0d7a68984bf525342d22b8924a57e8e2" + + HTTP/1.1 200 OK + + + + /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + + + + "421abf7e4848d2fecbf64217ed205d4b" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result index 007903f8..48806ce1 100644 --- a/testing/tests/regression-suite/602-Soho-PROPFIND.result +++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result @@ -1,7 +1,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 -ETag: "6d6148f70715665afa09075dff4049a1" +ETag: "4391c4dac4fc275ca25641a267e12291" Transfer-Encoding: chunked Content-Type: text/xml; charset="utf-8" @@ -52,29 +52,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics - - - - /caldav.php/user1/ - - - mailto:user1@example.net - /caldav.php/user1/ - - - HTTP/1.1 200 OK - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics + /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics @@ -117,50 +95,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 404 Not Found - - /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - - - - /caldav.php/user1/ - - - mailto:user1@example.net - /caldav.php/user1/ - - - HTTP/1.1 200 OK - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics - - - - /caldav.php/user1/ - - - mailto:user1@example.net - /caldav.php/user1/ - - - HTTP/1.1 200 OK - - - - - - - HTTP/1.1 404 Not Found - - /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics @@ -183,50 +117,6 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 404 Not Found - - /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - - - - /caldav.php/user1/ - - - mailto:user1@example.net - /caldav.php/user1/ - - - HTTP/1.1 200 OK - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics - - - - /caldav.php/user1/ - - - mailto:user1@example.net - /caldav.php/user1/ - - - HTTP/1.1 200 OK - - - - - - - HTTP/1.1 404 Not Found - - /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics @@ -250,7 +140,95 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics + /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics + + + + /caldav.php/user1/ + + + mailto:user1@example.net + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + + + + /caldav.php/user1/ + + + mailto:user1@example.net + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics + + + + /caldav.php/user1/ + + + mailto:user1@example.net + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics + + + + /caldav.php/user1/ + + + mailto:user1@example.net + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics @@ -294,7 +272,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics @@ -338,7 +316,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics + /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics @@ -360,7 +338,29 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics + /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + + + + /caldav.php/user1/ + + + mailto:user1@example.net + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result index f5a0d70f..79261913 100644 --- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result +++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result @@ -39,146 +39,6 @@ HTTP/1.1 404 Not Found - - /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics - - - 961 - text/calendar - Due 7/8/7 16:30, completed - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "00ad5eb1eb5507884710b0b66aa5d5c4" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics - - - 970 - text/calendar - Private Event - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "5def8ae2b20893a1c7f4dbaeb008f2f1" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/20061101T073004Z.ics - - - 1059 - text/calendar - A Meeting - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "c3658901fd4689d4a1e1d6f08601ef4f" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics - - - 415 - text/calendar - Incomplete, uncancelled - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "509b0f0d8a3363379f9f5727f5dd74a0" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - /caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics @@ -214,6 +74,41 @@ HTTP/1.1 404 Not Found + + /caldav.php/user1/home/20061101T073004Z.ics + + + 1059 + text/calendar + A Meeting + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "c3658901fd4689d4a1e1d6f08601ef4f" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + /caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics @@ -249,76 +144,6 @@ HTTP/1.1 404 Not Found - - /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics - - - 743 - text/calendar - Beer O'Clock - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "0d7a68984bf525342d22b8924a57e8e2" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics - - - 449 - text/calendar - 50% Complete, uncancelled - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "cb3d9dc3e8c157f53eba3ea0e1e0f146" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - /caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics @@ -355,191 +180,16 @@ - /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics + /caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics - 981 + 970 text/calendar - BBQ @ ML's + Private Event Dow, 01 Jan 2000 00:00:00 GMT Dow, 01 Jan 2000 00:00:00 GMT - "5f050eca5480bbebbe9428222570913d" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics - - - 1001 - text/calendar - A Cancelled Task, with a start and due date - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "a2990674708634a311bb98a59865ca50" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics - - - 302 - text/calendar - Morning Mgmt Mtg - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "421abf7e4848d2fecbf64217ed205d4b" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics - - - 772 - text/calendar - Party all day! - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "165746adbab8bc0c8336a63cc5332ff2" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics - - - 1013 - text/calendar - Release 0.9.3 - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "8f581a053df6d833254756dfd7553d37" - - - - - - - - - - - - - HTTP/1.1 200 OK - - - - - - - - - HTTP/1.1 404 Not Found - - - - /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics - - - 1119 - text/calendar - Morning Meeting - - Dow, 01 Jan 2000 00:00:00 GMT - Dow, 01 Jan 2000 00:00:00 GMT - "e8060931f30c1798ac58ffbe4ec0bffc" + "5def8ae2b20893a1c7f4dbaeb008f2f1" @@ -599,6 +249,356 @@ HTTP/1.1 404 Not Found + + /caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics + + + 415 + text/calendar + Incomplete, uncancelled + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "509b0f0d8a3363379f9f5727f5dd74a0" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics + + + 449 + text/calendar + 50% Complete, uncancelled + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "cb3d9dc3e8c157f53eba3ea0e1e0f146" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics + + + 961 + text/calendar + Due 7/8/7 16:30, completed + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "00ad5eb1eb5507884710b0b66aa5d5c4" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics + + + 1001 + text/calendar + A Cancelled Task, with a start and due date + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "a2990674708634a311bb98a59865ca50" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics + + + 1119 + text/calendar + Morning Meeting + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "e8060931f30c1798ac58ffbe4ec0bffc" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics + + + 1013 + text/calendar + Release 0.9.3 + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "8f581a053df6d833254756dfd7553d37" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics + + + 743 + text/calendar + Beer O'Clock + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "0d7a68984bf525342d22b8924a57e8e2" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics + + + 302 + text/calendar + Morning Mgmt Mtg + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "421abf7e4848d2fecbf64217ed205d4b" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics + + + 981 + text/calendar + BBQ @ ML's + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "5f050eca5480bbebbe9428222570913d" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + + + /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics + + + 772 + text/calendar + Party all day! + + Dow, 01 Jan 2000 00:00:00 GMT + Dow, 01 Jan 2000 00:00:00 GMT + "165746adbab8bc0c8336a63cc5332ff2" + + + + + + + + + + + + + HTTP/1.1 200 OK + + + + + + + + + HTTP/1.1 404 Not Found + + /caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result index af39b60f..b9d78557 100644 --- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result +++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result @@ -21,6 +21,18 @@ changed_last_30se: >1< property_name: >http://apple.com/ns/ical/:calendar-color< property_value: >#391B71A0< + changed_by: >10< +changed_last_30se: >1< + dav_name: >/user1/SOHO collection/< + property_name: >com.apple.ical::calendarcolor< + property_value: >#FF8000FF< + + changed_by: >10< +changed_last_30se: >1< + dav_name: >/user1/SOHO collection/< + property_name: >urn:ietf:params:xml:ns:caldav:calendar-description< + property_value: >Calendar description< + changed_by: >10< changed_last_30se: >1< dav_name: >/user1/collection/< @@ -34,15 +46,3 @@ changed_last_30se: >1< property_name: >urn:mcmillan:bogus:xml:ns:rscds:arbitrary< property_value: >A completely bogus property which should be saved.< - changed_by: >10< -changed_last_30se: >1< - dav_name: >/user1/SOHO collection/< - property_name: >com.apple.ical::calendarcolor< - property_value: >#FF8000FF< - - changed_by: >10< -changed_last_30se: >1< - dav_name: >/user1/SOHO collection/< - property_name: >urn:ietf:params:xml:ns:caldav:calendar-description< - property_value: >Calendar description< - diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test index 01adb1c2..2853c636 100644 --- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test +++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.test @@ -31,7 +31,7 @@ ENDDATA QUERY SELECT dav_displayname, is_calendar, modified > (current_timestamp - '60 seconds'::interval) AS changed_last_60secs - FROM collection WHERE dav_name = '/user1/home/' + FROM collection WHERE dav_name = '/user1/home/' ORDER BY collection_id ENDQUERY QUERY diff --git a/testing/tests/regression-suite/872-PROPFIND.result b/testing/tests/regression-suite/872-PROPFIND.result index 1ab76853..9398b66d 100644 --- a/testing/tests/regression-suite/872-PROPFIND.result +++ b/testing/tests/regression-suite/872-PROPFIND.result @@ -1,7 +1,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 -ETag: "df869ffbdcfc5abd7d56c9c54d6b181e" +ETag: "800ca97cec1b737be874e0ec11094f59" Content-Length: 1670 Content-Type: text/xml; charset="utf-8" @@ -24,10 +24,10 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics + /caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics - "58cba7e3fafb6080e85619ea77d08c7a" + "64d28f4f57515d6c63cec02b5d882eaa" HTTP/1.1 200 OK @@ -40,10 +40,10 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics + /caldav.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics - "64d28f4f57515d6c63cec02b5d882eaa" + "58cba7e3fafb6080e85619ea77d08c7a" HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/901-GET-Collection.result b/testing/tests/regression-suite/901-GET-Collection.result index 4aa835d5..8fbe45ff 100644 --- a/testing/tests/regression-suite/901-GET-Collection.result +++ b/testing/tests/regression-suite/901-GET-Collection.result @@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule Content-Length: 9698 Etag: "735679d819034badbcddd8aa6029bc3d" -Content-Type: text/calendar +Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN diff --git a/testing/tests/regression-suite/903-GET-Collection.result b/testing/tests/regression-suite/903-GET-Collection.result index 935d5e10..e8a30442 100644 --- a/testing/tests/regression-suite/903-GET-Collection.result +++ b/testing/tests/regression-suite/903-GET-Collection.result @@ -3,7 +3,7 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule Content-Length: 24642 Etag: "a52157c35d64e6051e54024625d3a94a" -Content-Type: text/calendar +Content-Type: text/calendar; charset="utf-8" BEGIN:VCALENDAR PRODID:-//davical.org//NONSGML AWL Calendar//EN