From 3dbc88a17004c409619216507291cbc12a21ed18 Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Fri, 30 Dec 2022 17:39:52 +1300
Subject: [PATCH] Exclude caldav data from requests to simplify tests

---
 .../2300-VTODO-Read-Other-User-Create.result  |  8 +-
 .../2300-VTODO-Read-Other-User-Create.test    |  2 +-
 .../2302-VTODO-Read-Other-User.result         | 79 +------------------
 .../2302-VTODO-Read-Other-User.test           |  1 -
 .../2303-VTODO-Read-Other-User.result         | 43 +---------
 .../2303-VTODO-Read-Other-User.test           |  1 -
 6 files changed, 13 insertions(+), 121 deletions(-)

diff --git a/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.result b/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.result
index 2c577ae5..f6ea4f08 100644
--- a/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.result
+++ b/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.result
@@ -2,7 +2,7 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "5126577e86b1ff51857ad7334b6e0965"
+ETag: "b9920ae7e896c40ee0b602c7627bf533"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
@@ -35,7 +35,7 @@ DESCRIPTION:A readable event
 UID:E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74
 DTSTART;TZID=Pacific/Auckland:20040101T120000
 DTSTAMP:20071124T220925Z
-SUMMARY:An task for my assistant to read
+SUMMARY:A task for my assistant to read
 CREATED:20071124T220749Z
 X-APPLE-SORT-ORDER:2147483647
 DUE;VALUE=DATE:20100217
@@ -44,7 +44,7 @@ END:VCALENDAR
 <
       caldav_type: >VTODO<
             class: >PUBLIC<
-         dav_etag: >5126577e86b1ff51857ad7334b6e0965<
+         dav_etag: >b9920ae7e896c40ee0b602c7627bf533<
       description: >A readable event<
             dtend: >NULL<
           dtstamp: >2007-11-24 22:09:25<
@@ -57,7 +57,7 @@ END:VCALENDAR
          priority: >5<
             rrule: >NULL<
            status: >NULL<
-          summary: >An task for my assistant to read<
+          summary: >A task for my assistant to read<
            transp: >NULL<
             tz_id: >Pacific/Auckland<
               uid: >E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74<
diff --git a/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.test b/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.test
index 03f41ce4..026d7e83 100644
--- a/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.test
+++ b/testing/tests/regression-suite/2300-VTODO-Read-Other-User-Create.test
@@ -37,7 +37,7 @@ DESCRIPTION:A readable event
 UID:E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74
 DTSTART;TZID=Pacific/Auckland:20040101T120000
 DTSTAMP:20071124T220925Z
-SUMMARY:An task for my assistant to read
+SUMMARY:A task for my assistant to read
 CREATED:20071124T220749Z
 X-APPLE-SORT-ORDER:2147483647
 DUE;VALUE=DATE:20100217
diff --git a/testing/tests/regression-suite/2302-VTODO-Read-Other-User.result b/testing/tests/regression-suite/2302-VTODO-Read-Other-User.result
index fafc1ae1..a4a15675 100644
--- a/testing/tests/regression-suite/2302-VTODO-Read-Other-User.result
+++ b/testing/tests/regression-suite/2302-VTODO-Read-Other-User.result
@@ -2,52 +2,17 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "20c7556827a226030f58c9d67f438e90"
-Content-Length: 2237
+ETag: "445034d94bcefa69615e4b4e8dd37cbd"
+Content-Length: 549
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/davical/caldav.php/manager1/home/readable-task.ics</href>
   <propstat>
    <prop>
-    <getetag>"5126577e86b1ff51857ad7334b6e0965"</getetag>
-    <C:calendar-data>BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 3.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
-TZNAME:NZST
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYMONTH=10;BYDAY=1SU
-TZNAME:NZDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTODO
-PRIORITY:5
-SEQUENCE:7
-DESCRIPTION:A readable event
-UID:E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74
-DTSTART;TZID=Pacific/Auckland:20040101T120000
-DTSTAMP:20071124T220925Z
-SUMMARY:An task for my assistant to read
-CREATED:20071124T220749Z
-X-APPLE-SORT-ORDER:2147483647
-DUE;VALUE=DATE:20100217
-END:VTODO
-END:VCALENDAR
-</C:calendar-data>
+    <getetag>"b9920ae7e896c40ee0b602c7627bf533"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -57,42 +22,6 @@ END:VCALENDAR
   <propstat>
    <prop>
     <getetag>"5a0d4dd46dfd8e8dcbba4f2ed2b2631b"</getetag>
-    <C:calendar-data>BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 3.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
-TZNAME:NZST
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYMONTH=10;BYDAY=1SU
-TZNAME:NZDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTODO
-PRIORITY:5
-SEQUENCE:7
-DESCRIPTION:A private event
-UID:E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE75
-DTSTART;TZID=Pacific/Auckland:20040101T120000
-DTSTAMP:20071124T220925Z
-SUMMARY:A task for my assistant to not read
-CLASS:PRIVATE
-CREATED:20071124T220749Z
-X-APPLE-SORT-ORDER:2147483647
-DUE;VALUE=DATE:20100217
-END:VTODO
-END:VCALENDAR
-</C:calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/2302-VTODO-Read-Other-User.test b/testing/tests/regression-suite/2302-VTODO-Read-Other-User.test
index 609b1406..3dbcbe5e 100644
--- a/testing/tests/regression-suite/2302-VTODO-Read-Other-User.test
+++ b/testing/tests/regression-suite/2302-VTODO-Read-Other-User.test
@@ -17,7 +17,6 @@ BEGINDATA
 <calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
    <D:prop>
      <D:getetag/>
-     <calendar-data/>
    </D:prop>
    <filter>
      <comp-filter name="VCALENDAR">
diff --git a/testing/tests/regression-suite/2303-VTODO-Read-Other-User.result b/testing/tests/regression-suite/2303-VTODO-Read-Other-User.result
index e46d0ac9..29a488d1 100644
--- a/testing/tests/regression-suite/2303-VTODO-Read-Other-User.result
+++ b/testing/tests/regression-suite/2303-VTODO-Read-Other-User.result
@@ -2,52 +2,17 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "5ce0ce846622e0f4208a25ff49a1ecf3"
-Content-Length: 1206
+ETag: "e0510e9b4388a08d88ff3ee3fa3b0388"
+Content-Length: 316
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:">
  <response>
   <href>/davical/caldav.php/manager1/home/readable-task.ics</href>
   <propstat>
    <prop>
-    <getetag>"5126577e86b1ff51857ad7334b6e0965"</getetag>
-    <C:calendar-data>BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 3.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
-TZNAME:NZST
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-DTSTART:19901007T020000
-RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYMONTH=10;BYDAY=1SU
-TZNAME:NZDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTODO
-PRIORITY:5
-SEQUENCE:7
-DESCRIPTION:A readable event
-UID:E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74
-DTSTART;TZID=Pacific/Auckland:20040101T120000
-DTSTAMP:20071124T220925Z
-SUMMARY:An task for my assistant to read
-CREATED:20071124T220749Z
-X-APPLE-SORT-ORDER:2147483647
-DUE;VALUE=DATE:20100217
-END:VTODO
-END:VCALENDAR
-</C:calendar-data>
+    <getetag>"b9920ae7e896c40ee0b602c7627bf533"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/2303-VTODO-Read-Other-User.test b/testing/tests/regression-suite/2303-VTODO-Read-Other-User.test
index 6a6515f8..11273852 100644
--- a/testing/tests/regression-suite/2303-VTODO-Read-Other-User.test
+++ b/testing/tests/regression-suite/2303-VTODO-Read-Other-User.test
@@ -17,7 +17,6 @@ BEGINDATA
 <calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
    <D:prop>
      <D:getetag/>
-     <calendar-data/>
    </D:prop>
    <filter>
      <comp-filter name="VCALENDAR">