From 0fb4cdd6df6679b5d5bfe794a4ec9044d013c826 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 9 Jul 2012 01:15:46 +1200
Subject: [PATCH] URL fixes in regression tests.

---
 .../2032-REPORT-addressbook-query.result      |  2 +-
 .../2032-REPORT-addressbook-query.test        |  1 +
 .../0532-iCal4-PROPFIND.result                | 22 +++++++++----------
 .../0541-iCal4-PROPFIND.result                |  6 ++---
 .../0547-iCal4-PROPFIND.result                | 22 +++++++++----------
 .../0548-iCal-PROPFIND.result                 | 22 +++++++++----------
 6 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/testing/tests/carddav/2032-REPORT-addressbook-query.result b/testing/tests/carddav/2032-REPORT-addressbook-query.result
index 73d86e86..215d024f 100644
--- a/testing/tests/carddav/2032-REPORT-addressbook-query.result
+++ b/testing/tests/carddav/2032-REPORT-addressbook-query.result
@@ -9,7 +9,7 @@
     <getcontentlength>1286</getcontentlength>
     <displayname>User 1</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <creationdate>20120708T112830Z</creationdate>
+    <creationdate>yyyymmddThhmmssZ</creationdate>
     <getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
     <getcontentlanguage/>
     <supportedlock>
diff --git a/testing/tests/carddav/2032-REPORT-addressbook-query.test b/testing/tests/carddav/2032-REPORT-addressbook-query.test
index e68105b8..11fc1e40 100644
--- a/testing/tests/carddav/2032-REPORT-addressbook-query.test
+++ b/testing/tests/carddav/2032-REPORT-addressbook-query.test
@@ -25,3 +25,4 @@ BEGINDATA
 </C:addressbook-query>
 ENDDATA
 
+REPLACE=#<creationdate>\d{8}T\d{6}Z</creationdate>#<creationdate>yyyymmddThhmmssZ</creationdate>#
diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
index 812c0f25..07b379cc 100644
--- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ 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: "760ca652c9842246f594738b3c8d03b9"
-Content-Length: 17602
+ETag: "af0e2626081e066848c332179455f34e"
+Content-Length: 17701
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -24,7 +24,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -105,7 +105,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -179,7 +179,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -260,7 +260,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -339,7 +339,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -427,7 +427,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -520,7 +520,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -593,7 +593,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -668,7 +668,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
diff --git a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
index f93e4138..c2b8e0de 100644
--- a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ 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: "906d1a3eca639905bd69e8ee92867c1a"
-Content-Length: 1521
+ETag: "f37173f187202c0128fbd251363ade37"
+Content-Length: 1532
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -25,7 +25,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <C:calendar-timezone>BEGIN:VCALENDAR
 PRODID:-//davical.org//NONSGML AWL Calendar//EN
diff --git a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
index 42dada2f..601d7909 100644
--- a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ 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: "b4c03d0f39542501b0fb1245d849bf8b"
-Content-Length: 20033
+ETag: "0c6e80ace8d360479d21cc6ebfcd3f6c"
+Content-Length: 20132
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -27,7 +27,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -121,7 +121,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -204,7 +204,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -296,7 +296,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -386,7 +386,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -485,7 +485,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -589,7 +589,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -673,7 +673,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
@@ -759,7 +759,7 @@ Content-Type: text/xml; charset="utf-8"
      <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
     </C1:calendar-free-busy-set>
     <C1:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C1:schedule-default-calendar-URL>
     <current-user-privilege-set>
      <privilege>
diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.result b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
index 50fbd636..ee17e3de 100644
--- a/testing/tests/regression-suite/0548-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
@@ -4,8 +4,8 @@ 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: "91f890210bc3d193a74ff758a83f54ce"
-Content-Length: 29792
+ETag: "908ab117a03a63e9f130ae222c0f3477"
+Content-Length: 29891
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -70,7 +70,7 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <supported-report-set>
      <supported-report>
@@ -192,7 +192,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:calendar/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
@@ -331,7 +331,7 @@ Content-Type: text/xml; charset="utf-8"
      <C2:addressbook/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <supported-report-set>
      <supported-report>
@@ -460,7 +460,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:calendar/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
@@ -612,7 +612,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-inbox/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
@@ -745,7 +745,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:schedule-outbox/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
@@ -870,7 +870,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:calendar/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <C:supported-calendar-component-set>
      <C:comp name="VEVENT"/>
@@ -1009,7 +1009,7 @@ Content-Type: text/xml; charset="utf-8"
      <C1:calendar-proxy-read/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <supported-report-set>
      <supported-report>
@@ -1152,7 +1152,7 @@ Content-Type: text/xml; charset="utf-8"
      <C1:calendar-proxy-write/>
     </resourcetype>
     <C:schedule-default-calendar-URL>
-     <href>/user1/home/</href>
+     <href>/caldav.php/user1/home/</href>
     </C:schedule-default-calendar-URL>
     <supported-report-set>
      <supported-report>