From b3551c909113ba76273cc85b4167ad47287da2c7 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sun, 24 Dec 2006 21:20:56 +1300
Subject: [PATCH] Correct regression test for PRIVATE entry.

---
 .../210-Moz-PUT-PRIVATE.result                |  2 +-
 .../regression-suite/210-Moz-PUT-PRIVATE.test |  1 +
 .../309-Chandler-PROPFIND-4.result            |  8 +--
 .../401-Cadaver-PROPFIND-1.result             |  2 +-
 .../820-Spec-PROPFIND-1.result                |  2 +-
 .../821-Spec-PROPFIND-2.result                |  4 +-
 .../822-Spec-PROPFIND-3.result                |  8 +--
 .../824-Spec-PROPFIND-5.result                |  2 +-
 .../regression-suite/832-freebusy.result      |  3 +-
 .../regression-suite/833-freebusy.result      |  3 +-
 .../regression-suite/900-Moz-REPORT.result    | 50 ++++++++++++++++++-
 11 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
index 3edba38b..bc24f14f 100644
--- a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
+++ b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.result
@@ -1,6 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "ce83cb40cb8bc72301ea2abd6849d8eb"
+ETag: "5def8ae2b20893a1c7f4dbaeb008f2f1"
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.test b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.test
index 7c152a70..1c7791b9 100644
--- a/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.test
+++ b/testing/tests/regression-suite/210-Moz-PUT-PRIVATE.test
@@ -14,6 +14,7 @@ HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
 BEGINDATA
+BEGIN:VCALENDAR
 PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
 VERSION:2.0
 BEGIN:VEVENT
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
index ad456c36..33a049b4 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "ad0a179fd9a619a319844473bf2cfb8f"
-Content-Length: 2270
+ETag: "8416cb0e188d7286507ceb79f1c780e8"
+Content-Length: 2296
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -25,8 +25,8 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <resourcetype/>
-    <displayname/>
-    <getetag>"ce83cb40cb8bc72301ea2abd6849d8eb"</getetag>
+    <displayname>Private Event</displayname>
+    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
index 28d5cc48..fabe56e7 100644
--- a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
+++ b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>6689</getcontentlength>
+    <getcontentlength>6705</getcontentlength>
     <resourcetype>
      <collection/>
      <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index f50845cb..fe2a32f0 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>6689</getcontentlength>
+    <getcontentlength>6705</getcontentlength>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index 88713c1a..b144c6ce 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -1,6 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "fe928ac898184555ef5bae3a700784ea"
+ETag: "d857bd6617792951329353bf414d7e1b"
 Content-Length: 963
 Content-Type: text/xml; charset="utf-8"
 
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>6689</getcontentlength>
+    <getcontentlength>6705</getcontentlength>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index f4971afb..7d59cff5 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>6689</getcontentlength>
+    <getcontentlength>6705</getcontentlength>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
@@ -34,12 +34,12 @@
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>954</getcontentlength>
+    <getcontentlength>970</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype/>
-    <displayname/>
-    <getetag>"ce83cb40cb8bc72301ea2abd6849d8eb"</getetag>
+    <displayname>Private Event</displayname>
+    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
     <getcontentlanguage>en_NZ</getcontentlanguage>
     <supportedlock>
      <lockentry>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index e57ea048..d29c71d0 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>6689</getcontentlength>
+    <getcontentlength>6705</getcontentlength>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
diff --git a/testing/tests/regression-suite/832-freebusy.result b/testing/tests/regression-suite/832-freebusy.result
index ea84bf01..59aead02 100644
--- a/testing/tests/regression-suite/832-freebusy.result
+++ b/testing/tests/regression-suite/832-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 1780
+Content-Length: 1810
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -60,6 +60,7 @@ FREEBUSY:20070518T030000/PT1H45M
 FREEBUSY:20070601T030000/PT1H45M
 FREEBUSY:20070615T030000/PT1H45M
 FREEBUSY:20070629T030000/PT1H45M
+FREEBUSY:20061223T000000/PT2H
 FREEBUSY:20061223T030000/PT2H
 END:VFREEBUSY
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/833-freebusy.result b/testing/tests/regression-suite/833-freebusy.result
index ea84bf01..59aead02 100644
--- a/testing/tests/regression-suite/833-freebusy.result
+++ b/testing/tests/regression-suite/833-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 1780
+Content-Length: 1810
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -60,6 +60,7 @@ FREEBUSY:20070518T030000/PT1H45M
 FREEBUSY:20070601T030000/PT1H45M
 FREEBUSY:20070615T030000/PT1H45M
 FREEBUSY:20070629T030000/PT1H45M
+FREEBUSY:20061223T000000/PT2H
 FREEBUSY:20061223T030000/PT2H
 END:VFREEBUSY
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.result b/testing/tests/regression-suite/900-Moz-REPORT.result
index cef6cb91..d3c16a97 100644
--- a/testing/tests/regression-suite/900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/900-Moz-REPORT.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-ETag: "a0f54632904fd2933cbf6d8b0e302c70"
-Content-Length: 5396
+ETag: "22d2ec2ca3e08afc175c8adff74a499c"
+Content-Length: 6643
 Keep-Alive: timeout=15, max=100
 Connection: Keep-Alive
 Content-Type: text/xml; charset="utf-8"
@@ -93,6 +93,52 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
 END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>http://mycaldav/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+BEGIN:VEVENT
+CREATED:20061223T031415Z
+LAST-MODIFIED:20061223T032305Z
+DTSTAMP:20061223T032305Z
+UID:1906b3ca-4890-468a-9b58-1de74bf2c716
+SUMMARY:Private Event
+PRIORITY:0
+STATUS:CONFIRMED
+CLASS:PRIVATE
+DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T130000
+DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T150000
+X-MOZ-LOCATIONPATH:1906b3ca-4890-468a-9b58-1de74bf2c716.ics
+LOCATION:At a private location
+DESCRIPTION:Private and Confirmed
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+END:VCALENDAR
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>