From 5dcb2908a8b2e08df677f4feb10d6412dea7bf0a Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Tue, 9 Mar 2010 09:22:52 +1300
Subject: [PATCH] Updated regression test results.

---
 .../regression-suite/101-Evo-OPTIONS-1.result |  2 +-
 .../regression-suite/201-Moz-OPTIONS-2.result |  2 +-
 .../302-Chandler-OPTIONS-2.result             |  2 +-
 .../400-Cadaver-OPTIONS-1.result              |  2 +-
 .../regression-suite/601-Soho-OPTIONS.result  |  2 +-
 .../regression-suite/910-Space-OPTIONS.result |  2 +-
 .../918-PROPFIND-supported-stuff.result       |  5 +-
 .../919-PROPFIND-supported-stuff.result       |  8 +-
 .../920-PROPFIND-supported-stuff.result       |  9 +-
 .../regression-suite/948-MKTICKET.result      |  8 ++
 .../tests/regression-suite/948-MKTICKET.test  |  4 +-
 .../regression-suite/950-MKTICKET.result      |  8 ++
 .../tests/regression-suite/950-MKTICKET.test  |  4 +
 .../regression-suite/952-PROPFIND.result      | 99 +------------------
 .../tests/regression-suite/952-PROPFIND.test  | 17 ++--
 .../tests/regression-suite/953-PROPFIND.test  | 13 +--
 16 files changed, 52 insertions(+), 135 deletions(-)

diff --git a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
index 291ab983..f08a10fc 100644
--- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, ACL, GET, PUT, HEAD
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
index 291ab983..f08a10fc 100644
--- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, ACL, GET, PUT, HEAD
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
index 291ab983..f08a10fc 100644
--- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, ACL, GET, PUT, HEAD
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
index 291ab983..f08a10fc 100644
--- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, ACL, GET, PUT, HEAD
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/601-Soho-OPTIONS.result b/testing/tests/regression-suite/601-Soho-OPTIONS.result
index b6cca469..2fd1ea0b 100644
--- a/testing/tests/regression-suite/601-Soho-OPTIONS.result
+++ b/testing/tests/regression-suite/601-Soho-OPTIONS.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, ACL, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKCOL, MKCALENDAR, PROPPATCH
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/910-Space-OPTIONS.result b/testing/tests/regression-suite/910-Space-OPTIONS.result
index 291ab983..f08a10fc 100644
--- a/testing/tests/regression-suite/910-Space-OPTIONS.result
+++ b/testing/tests/regression-suite/910-Space-OPTIONS.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, ACL, GET, PUT, HEAD
+Allow: OPTIONS, PROPFIND, REPORT, DELETE, LOCK, UNLOCK, MOVE, GET, PUT, HEAD, MKTICKET, DELTICKET
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
index 85fbec31..480fb8ad 100644
--- a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "037487962d2cbc6ed2c37459e8e273f1"
-Content-Length: 2011
+ETag: "bc08f49b27db6f752382addce09ec69b"
+Content-Length: 2053
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -28,6 +28,7 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="PUT"/>
      <supported-method name="HEAD"/>
      <supported-method name="MKTICKET"/>
+     <supported-method name="DELTICKET"/>
     </supported-method-set>
     <supported-report-set>
      <supported-report>
diff --git a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
index 171ba426..e5e24963 100644
--- a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "4d13193fda49c2ab5c78fa9664df25cc"
-Content-Length: 1659
+ETag: "88df59252290d58630f83da5be2a6405"
+Content-Length: 1663
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -24,11 +24,11 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="LOCK"/>
      <supported-method name="UNLOCK"/>
      <supported-method name="MOVE"/>
-     <supported-method name="POST"/>
      <supported-method name="GET"/>
      <supported-method name="PUT"/>
      <supported-method name="HEAD"/>
-     <supported-method name="PROPPATCH"/>
+     <supported-method name="MKTICKET"/>
+     <supported-method name="DELTICKET"/>
     </supported-method-set>
     <supported-report-set>
      <supported-report>
diff --git a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
index 5918f800..3e3cbeed 100644
--- a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "c9507e3664a6fb8e5f929c860ab1974e"
-Content-Length: 1662
+ETag: "f4ace4415ef70e47f318ae774aaaac48"
+Content-Length: 1636
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -25,10 +25,9 @@ Content-Type: text/xml; charset="utf-8"
      <supported-method name="UNLOCK"/>
      <supported-method name="MOVE"/>
      <supported-method name="POST"/>
-     <supported-method name="GET"/>
-     <supported-method name="PUT"/>
-     <supported-method name="HEAD"/>
      <supported-method name="PROPPATCH"/>
+     <supported-method name="MKTICKET"/>
+     <supported-method name="DELTICKET"/>
     </supported-method-set>
     <supported-report-set>
      <supported-report>
diff --git a/testing/tests/regression-suite/948-MKTICKET.result b/testing/tests/regression-suite/948-MKTICKET.result
index 109fe460..557a481a 100644
--- a/testing/tests/regression-suite/948-MKTICKET.result
+++ b/testing/tests/regression-suite/948-MKTICKET.result
@@ -1,3 +1,11 @@
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
+Ticket:Good Ticket ID
+ETag: "Some good etag"
+Content-Length: 537
+Content-Type: text/xml; charset="utf-8"
+
 <?xml version="1.0" encoding="utf-8" ?>
 <prop xmlns="DAV:" xmlns:T="http://www.xythos.com/namespaces/StorageServer" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <T:ticketdiscovery>
diff --git a/testing/tests/regression-suite/948-MKTICKET.test b/testing/tests/regression-suite/948-MKTICKET.test
index f5a2d0a1..0e6b8184 100644
--- a/testing/tests/regression-suite/948-MKTICKET.test
+++ b/testing/tests/regression-suite/948-MKTICKET.test
@@ -5,7 +5,7 @@ TYPE=MKTICKET
 URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Ticket Spec Tests
 HEADER=Content-Type: text/xml; charset="UTF-8"
-
+HEAD
 
 BEGINDATA
 <?xml version="1.0" encoding="utf-8" ?>
@@ -25,4 +25,6 @@ SELECT dav_owner_id,
   FROM access_ticket
 ENDQUERY
 
+REPLACE=!ETag: "\S+"!ETag: "Some good etag"!
 REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!
+REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID!
diff --git a/testing/tests/regression-suite/950-MKTICKET.result b/testing/tests/regression-suite/950-MKTICKET.result
index f9e77fcd..8eda4895 100644
--- a/testing/tests/regression-suite/950-MKTICKET.result
+++ b/testing/tests/regression-suite/950-MKTICKET.result
@@ -1,3 +1,11 @@
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
+Ticket:Good Ticket ID
+ETag: "Some good ETag"
+Content-Length: 622
+Content-Type: text/xml; charset="utf-8"
+
 <?xml version="1.0" encoding="utf-8" ?>
 <prop xmlns="DAV:" xmlns:T="http://www.xythos.com/namespaces/StorageServer" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <T:ticketdiscovery>
diff --git a/testing/tests/regression-suite/950-MKTICKET.test b/testing/tests/regression-suite/950-MKTICKET.test
index 80b013bb..9bf7a2dd 100644
--- a/testing/tests/regression-suite/950-MKTICKET.test
+++ b/testing/tests/regression-suite/950-MKTICKET.test
@@ -5,6 +5,7 @@ TYPE=MKTICKET
 URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
 HEADER=User-Agent: Ticket Spec Tests
 HEADER=Content-Type: text/xml; charset="UTF-8"
+HEAD
 
 
 BEGINDATA
@@ -25,3 +26,6 @@ SELECT dav_owner_id,
 ENDQUERY
 
 REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!
+REPLACE=!Ticket: \S{8}!Ticket:Good Ticket ID!
+REPLACE=!ETag: "\S+"!ETag: "Some good ETag"!
+REPLACE=!<TKT:timeout>Seconds-3\d+</TKT:timeout>!<TKT:timeout>Seconds-3600</TKT:timeout>!
diff --git a/testing/tests/regression-suite/952-PROPFIND.result b/testing/tests/regression-suite/952-PROPFIND.result
index 97a25b37..0486d1d1 100644
--- a/testing/tests/regression-suite/952-PROPFIND.result
+++ b/testing/tests/regression-suite/952-PROPFIND.result
@@ -1,67 +1,9 @@
-HTTP/1.1 207 Multi-Status
-Date: Dow, 01 Jan 2000 00:00:00 GMT
-DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "7c8b51dfb3d0b3caa8da3ab3f98c3707"
-Content-Length: 2895
-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:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:W="http://www.xythos.com/namespaces/StorageServer">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
    <prop>
-    <displayname>User One's Calendar</displayname>
-    <supported-report-set>
-     <supported-report>
-      <report>
-       <principal-property-search/>
-      </report>
-     </supported-report>
-     <supported-report>
-      <report>
-       <principal-search-property-set/>
-      </report>
-     </supported-report>
-     <supported-report>
-      <report>
-       <expand-property/>
-      </report>
-     </supported-report>
-     <supported-report>
-      <report>
-       <sync-collection/>
-      </report>
-     </supported-report>
-     <supported-report>
-      <report>
-       <C:calendar-query/>
-      </report>
-     </supported-report>
-     <supported-report>
-      <report>
-       <C:calendar-multiget/>
-      </report>
-     </supported-report>
-     <supported-report>
-      <report>
-       <C:free-busy-query/>
-      </report>
-     </supported-report>
-    </supported-report-set>
-    <supported-method-set>
-     <supported-method name="OPTIONS"/>
-     <supported-method name="PROPFIND"/>
-     <supported-method name="REPORT"/>
-     <supported-method name="DELETE"/>
-     <supported-method name="LOCK"/>
-     <supported-method name="UNLOCK"/>
-     <supported-method name="MOVE"/>
-     <supported-method name="GET"/>
-     <supported-method name="PUT"/>
-     <supported-method name="HEAD"/>
-     <supported-method name="MKTICKET"/>
-    </supported-method-set>
     <current-user-privilege-set>
      <privilege>
       <read/>
@@ -76,46 +18,9 @@ Content-Type: text/xml; charset="utf-8"
       <C:schedule-query-freebusy/>
      </privilege>
     </current-user-privilege-set>
-    <C:supported-calendar-component-set>
-     <C:comp name="VEVENT"/>
-     <C:comp name="VTODO"/>
-     <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-    </C:supported-calendar-component-set>
-    <C:calendar-timezone>BEGIN:VCALENDAR
-PRODID:-//davical.org//NONSGML AWL Calendar//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Europe/Prague
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
-</C:calendar-timezone>
+    <W:ticketdiscovery/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <C:calendar-description/>
-    <C:schedule-calendar-transp/>
-    <C:schedule-default-calendar-URL/>
-   </prop>
-   <status>HTTP/1.1 404 Not Found</status>
-  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/952-PROPFIND.test b/testing/tests/regression-suite/952-PROPFIND.test
index 24bb6bb7..c50dbfad 100644
--- a/testing/tests/regression-suite/952-PROPFIND.test
+++ b/testing/tests/regression-suite/952-PROPFIND.test
@@ -1,5 +1,6 @@
 #
 # PROPFIND on a collection which we can only access via a ticket
+#     also retrieving the tickets on that resource.
 #
 TYPE=PROPFIND
 URL=http://regression.host/caldav.php/user1/home/
@@ -16,23 +17,17 @@ HEADER=Content-Type: text/xml; charset="UTF-8"
 HEADER=Ticket: ##ticket##
 HEADER=Depth: 0
 
-HEAD
 
 BEGINDATA
 <?xml version="1.0" encoding="utf-8"?>
-<propfind xmlns="DAV:" xmlns:caldav="urn:ietf:params:xml:ns:caldav">
+<propfind xmlns="DAV:"
+          xmlns:T="http://www.xythos.com/namespaces/StorageServer">
  <prop>
-  <displayname/>
-  <supported-report-set/>
-  <supported-method-set/>
   <current-user-privilege-set/>
-  <caldav:calendar-description/>
-  <caldav:supported-calendar-component-set/>
-  <caldav:schedule-calendar-transp/>
-  <caldav:schedule-default-calendar-URL/>
-  <caldav:calendar-timezone/>
+  <T:ticketdiscovery/>
  </prop>
 </propfind>
 ENDDATA
 
-REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!
+REPLACE=!<TKT:id>\S{8}</TKT:id>!<TKT:id>Good Ticket ID</TKT:id>!
+REPLACE=!<TKT:timeout>Seconds-3\d+</TKT:timeout>!<TKT:timeout>Seconds-3600</TKT:timeout>!
diff --git a/testing/tests/regression-suite/953-PROPFIND.test b/testing/tests/regression-suite/953-PROPFIND.test
index 464cde05..f94e4f6f 100644
--- a/testing/tests/regression-suite/953-PROPFIND.test
+++ b/testing/tests/regression-suite/953-PROPFIND.test
@@ -1,5 +1,6 @@
 #
 # PROPFIND on a collection which we can only access via a ticket
+#   this should fail, because we don't supply the ticket
 #
 TYPE=PROPFIND
 URL=http://regression.host/caldav.php/user1/home/
@@ -19,17 +20,11 @@ HEADER=Depth: 0
 
 BEGINDATA
 <?xml version="1.0" encoding="utf-8"?>
-<propfind xmlns="DAV:" xmlns:caldav="urn:ietf:params:xml:ns:caldav">
+<propfind xmlns="DAV:"
+          xmlns:T="http://www.xythos.com/namespaces/StorageServer">
  <prop>
-  <displayname/>
-  <supported-report-set/>
-  <supported-method-set/>
   <current-user-privilege-set/>
-  <caldav:calendar-description/>
-  <caldav:supported-calendar-component-set/>
-  <caldav:schedule-calendar-transp/>
-  <caldav:schedule-default-calendar-URL/>
-  <caldav:calendar-timezone/>
+  <T:ticketdiscovery/>
  </prop>
 </propfind>
 ENDDATA