From 54222e32a522ed9abdf5823e917ed3c6f5fbb57b Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Tue, 15 Oct 2013 23:46:06 +1300
Subject: [PATCH] Improve successful result checking.

---
 .../tests/binding/1029-PUT-subcalendar.result | 31 +++++++++++++++++++
 .../tests/binding/1029-PUT-subcalendar.test   | 15 +++++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/testing/tests/binding/1029-PUT-subcalendar.result b/testing/tests/binding/1029-PUT-subcalendar.result
index 329604ba..8ba3f2ac 100644
--- a/testing/tests/binding/1029-PUT-subcalendar.result
+++ b/testing/tests/binding/1029-PUT-subcalendar.result
@@ -1,3 +1,6 @@
+SQL executed successfully.
+DELETE FROM caldav_data WHERE caldav_data.caldav_data LIKE '%UID:70399cd7-50a4-4be4-a665-af593e19a7fd%';
+
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
@@ -11,3 +14,31 @@ Content-Type: text/plain; charset="utf-8"
           dtstart: >2010-03-22 16:00:00+13<
           summary: >An invited event.  Black tie with pink polka dots is essential.  Do not bring a leopard.  Any leopards which do attend will be forcibly chained to a nearby fence.<
 
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user4/base/calendar/anothergoodleopard.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user2/.in/70399cd7-50a4-4be4-a665-af593e19a7fd.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user2/home/70399cd7-50a4-4be4-a665-af593e19a7fd.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user3/.in/70399cd7-50a4-4be4-a665-af593e19a7fd.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user3/home/70399cd7-50a4-4be4-a665-af593e19a7fd.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user5/.in/70399cd7-50a4-4be4-a665-af593e19a7fd.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
+          created: >2010-03-19 10:32:47<
+         dav_name: >/user5/home/70399cd7-50a4-4be4-a665-af593e19a7fd.ics<
+          dtstamp: >2010-03-19 10:56:20<
+
diff --git a/testing/tests/binding/1029-PUT-subcalendar.test b/testing/tests/binding/1029-PUT-subcalendar.test
index 88d7d94e..4de82c15 100644
--- a/testing/tests/binding/1029-PUT-subcalendar.test
+++ b/testing/tests/binding/1029-PUT-subcalendar.test
@@ -1,6 +1,5 @@
 #
-# Attempt to put an event into a bound location, where
-# the binding does confer write privileges
+# Attempt to put an event into a calendar within a collection in their normal home
 #
 TYPE=PUT
 URL=http://regression.host/caldav.php/user4/base/calendar/anothergoodleopard.ics
@@ -9,6 +8,11 @@ HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user4:user4
 HEAD
 
+DOSQL
+DELETE FROM caldav_data WHERE caldav_data.caldav_data LIKE '%UID:70399cd7-50a4-4be4-a665-af593e19a7fd%';
+ENDDOSQL
+
+
 BEGINDATA
 BEGIN:VCALENDAR
 PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -47,4 +51,9 @@ SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary
   WHERE caldav_data.dav_name ~ '/user4/base/calendar/'
 ENDQUERY
 
-
+QUERY
+SELECT dav_name, dtstamp, created
+  FROM calendar_item
+ WHERE uid = '70399cd7-50a4-4be4-a665-af593e19a7fd'
+ ORDER BY dav_id
+ENDQUERY