From 394f5d488f606ea2236ce7057b9aa6e0aa2748c3 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 18 Mar 2010 20:04:42 +1300 Subject: [PATCH] Updated DELETE results after earlier fixes to DELETE. --- testing/tests/regression-suite/020-Mulberry-DELETE-1.result | 5 ++++- testing/tests/regression-suite/020-Mulberry-DELETE-1.test | 6 ++++++ testing/tests/regression-suite/021-Mulberry-DELETE-2.result | 1 + testing/tests/regression-suite/021-Mulberry-DELETE-2.test | 6 ++++++ testing/tests/regression-suite/023-Mulberry-DELETE-3.result | 1 + testing/tests/regression-suite/023-Mulberry-DELETE-3.test | 6 ++++++ testing/tests/regression-suite/806-Mulberry-DELETE-1.result | 1 + testing/tests/regression-suite/806-Mulberry-DELETE-1.test | 6 ++++++ 8 files changed, 31 insertions(+), 1 deletion(-) diff --git a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result index b14da59b..a5e2810a 100644 --- a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result +++ b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result @@ -4,4 +4,7 @@ DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, c Content-Length: 44 Content-Type: text/plain; charset="utf-8" -Resource has changed on server - not deleted \ No newline at end of file +Resource has changed on server - not deleted + dav_etag: >557e551fae1b5c7f2131bde1ba0ba01e< + dav_name: >/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics< + diff --git a/testing/tests/regression-suite/020-Mulberry-DELETE-1.test b/testing/tests/regression-suite/020-Mulberry-DELETE-1.test index 9dd111a4..a18f2c1c 100644 --- a/testing/tests/regression-suite/020-Mulberry-DELETE-1.test +++ b/testing/tests/regression-suite/020-Mulberry-DELETE-1.test @@ -4,3 +4,9 @@ TYPE=DELETE URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics HEADER=If-Match: "bogus-etag-b000d7defa19ccb7cd21e546b54155ee" HEAD + +QUERY +SELECT dav_name, dav_etag + FROM caldav_data + WHERE dav_name = '/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics' +ENDQUERY diff --git a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result index cc598673..8560d509 100644 --- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result +++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result @@ -4,3 +4,4 @@ DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, c Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/021-Mulberry-DELETE-2.test b/testing/tests/regression-suite/021-Mulberry-DELETE-2.test index 523e9d69..f3420f81 100644 --- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.test +++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.test @@ -4,3 +4,9 @@ TYPE=DELETE URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics HEADER=If-Match: "557e551fae1b5c7f2131bde1ba0ba01e" HEAD + +QUERY +SELECT dav_id, dav_name, dav_etag + FROM caldav_data + WHERE dav_name = '/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics' +ENDQUERY diff --git a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result index cc598673..8560d509 100644 --- a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result +++ b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result @@ -4,3 +4,4 @@ DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, c Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/023-Mulberry-DELETE-3.test b/testing/tests/regression-suite/023-Mulberry-DELETE-3.test index 652d2297..074ac8c3 100644 --- a/testing/tests/regression-suite/023-Mulberry-DELETE-3.test +++ b/testing/tests/regression-suite/023-Mulberry-DELETE-3.test @@ -3,3 +3,9 @@ TYPE=DELETE URL=http://mycaldav/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics HEAD + +QUERY +SELECT dav_id, dav_name, dav_etag + FROM caldav_data + WHERE dav_name = '/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics' +ENDQUERY diff --git a/testing/tests/regression-suite/806-Mulberry-DELETE-1.result b/testing/tests/regression-suite/806-Mulberry-DELETE-1.result index cc598673..8560d509 100644 --- a/testing/tests/regression-suite/806-Mulberry-DELETE-1.result +++ b/testing/tests/regression-suite/806-Mulberry-DELETE-1.result @@ -4,3 +4,4 @@ DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, c Content-Length: 0 Content-Type: text/plain; charset="utf-8" + diff --git a/testing/tests/regression-suite/806-Mulberry-DELETE-1.test b/testing/tests/regression-suite/806-Mulberry-DELETE-1.test index 8f56a130..bba11055 100644 --- a/testing/tests/regression-suite/806-Mulberry-DELETE-1.test +++ b/testing/tests/regression-suite/806-Mulberry-DELETE-1.test @@ -15,3 +15,9 @@ HEADER=Content-Type: text/calendar; charset=utf-8 HEADER=Lock-Token: HEAD +QUERY +SELECT dav_id, dav_name, dav_etag + FROM caldav_data + WHERE dav_name = '/user1/home/i1278618276.ics' +ENDQUERY +