From 36a66597cdd193f12cf0b7b345bc7a67173f6027 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Fri, 2 Mar 2012 08:58:29 +1300
Subject: [PATCH] Ordering changes.

---
 .../0901-GET-Collection.result                | 62 ++++++-------
 .../0903-GET-Collection.result                | 88 +++++++++----------
 2 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/testing/tests/regression-suite/0901-GET-Collection.result b/testing/tests/regression-suite/0901-GET-Collection.result
index a4eef2bb..ac918f58 100644
--- a/testing/tests/regression-suite/0901-GET-Collection.result
+++ b/testing/tests/regression-suite/0901-GET-Collection.result
@@ -2,8 +2,8 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-Content-Length: 11093
 Etag: "855cbfab1940e342d7986c207bf3f973"
+Content-Length: 11095
 Content-Type: text/calendar; charset="utf-8"
 
 BEGIN:VCALENDAR
@@ -21,19 +21,6 @@ SUMMARY:Lunch with David
 UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
 END:VEVENT
 BEGIN:VEVENT
-UID:20061101T073000Z-10468-1000-1-7@ubu
-DTSTAMP:20061101T073000Z
-DTSTART;TZID=Pacific/Auckland:20061101T100000
-DTEND;TZID=Pacific/Auckland:20061101T110000
-SUMMARY:A Changed Meeting
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-DESCRIPTION:A Meeting
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 CREATED:20061120T041336Z
 LAST-MODIFIED:20061120T041709Z
 DTSTAMP:20061120T041709Z
@@ -197,6 +184,19 @@ STATUS:CONFIRMED
 SUMMARY:Morning Mgmt Mtg
 END:VEVENT
 BEGIN:VEVENT
+UID:20061101T073000Z-10468-1000-1-7@ubu
+DTSTAMP:20061101T073000Z
+DTSTART;TZID=Pacific/Auckland:20061101T100000
+DTEND;TZID=Pacific/Auckland:20061101T110000
+SUMMARY:A Changed Meeting
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:A Meeting
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
@@ -282,23 +282,6 @@ TZOFFSETTO:+1200
 END:STANDARD
 END:VTIMEZONE
 BEGIN:VTIMEZONE
-TZID: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
-BEGIN:VTIMEZONE
 TZID:/mozilla.org/20050126_1/Pacific/Auckland
 X-LIC-LOCATION:Pacific/Auckland
 BEGIN:STANDARD
@@ -353,6 +336,23 @@ RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+DTSTART:20000319T030000
+RRULE:FREQ=YEARLY;BYDAY=3SU;BYMONTH=3
+TZNAME:Pacific/Auckland
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20001001T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:Pacific/Auckland
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
 TZID:Europe/Prague
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
diff --git a/testing/tests/regression-suite/0903-GET-Collection.result b/testing/tests/regression-suite/0903-GET-Collection.result
index cd3b85a4..4a134b74 100644
--- a/testing/tests/regression-suite/0903-GET-Collection.result
+++ b/testing/tests/regression-suite/0903-GET-Collection.result
@@ -2,8 +2,8 @@ HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-Content-Length: 24817
 Etag: "f9a8ee6b41d9b02aa5176e6da349121a"
+Content-Length: 24817
 Content-Type: text/calendar; charset="utf-8"
 
 BEGIN:VCALENDAR
@@ -12,6 +12,49 @@ VERSION:2.0
 CALSCALE:GREGORIAN
 X-WR-CALNAME:anotherone
 BEGIN:VEVENT
+UID:20060912T233427Z-12681-1000-1-5@ubu
+DTSTAMP:20060912T233427Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:200609
+ 13T090000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:20060913
+ T143000
+TRANSP:OPAQUE
+SEQUENCE:5
+SUMMARY:9:am - 2:30pm in Helsinki
+CLASS:PUBLIC
+X-EVOLUTION-CALDAV-HREF:http://mycaldav:80/caldav.php/andrew/20060912T23
+ 3500Z.ics
+X-EVOLUTION-CALDAV-ETAG:"8d8ca5e838b7e088bf17d9916032eec6"
+X-EVOLUTION-MOVE-CALENDAR:1
+CREATED:20060913T003545
+LAST-MODIFIED:20060913T003631
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20060913T003631Z-12694-1000-1-24@ubu
+DESCRIPTION:9:am - 2:30pm in Helsinki
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:20060803T084628Z-6040-1000-1-6@lamb
+DTSTAMP:20060803T084628Z
+DTSTART:20060801T123456
+DTEND:20060802T123456
+SUMMARY:Steve's Private Birthday
+CREATED:20060803T084628
+LAST-MODIFIED:20060803T084657
+CLASS:PRIVATE
+TRANSP:OPAQUE
+RRULE:FREQ=YEARLY;INTERVAL=1
+SEQUENCE:1
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20060803T084657Z-6038-1000-1-13@lamb
+DESCRIPTION:Steve's Birthday
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 UID:20061119T201927Z-5105-1000-5103-8@ubu
 DTSTAMP:20061119T201927Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -376,49 +419,6 @@ DESCRIPTION:Summer Festival
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20060912T233427Z-12681-1000-1-5@ubu
-DTSTAMP:20060912T233427Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:200609
- 13T090000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:20060913
- T143000
-TRANSP:OPAQUE
-SEQUENCE:5
-SUMMARY:9:am - 2:30pm in Helsinki
-CLASS:PUBLIC
-X-EVOLUTION-CALDAV-HREF:http://mycaldav:80/caldav.php/andrew/20060912T23
- 3500Z.ics
-X-EVOLUTION-CALDAV-ETAG:"8d8ca5e838b7e088bf17d9916032eec6"
-X-EVOLUTION-MOVE-CALENDAR:1
-CREATED:20060913T003545
-LAST-MODIFIED:20060913T003631
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20060913T003631Z-12694-1000-1-24@ubu
-DESCRIPTION:9:am - 2:30pm in Helsinki
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:20060803T084628Z-6040-1000-1-6@lamb
-DTSTAMP:20060803T084628Z
-DTSTART:20060801T123456
-DTEND:20060802T123456
-SUMMARY:Steve's Private Birthday
-CREATED:20060803T084628
-LAST-MODIFIED:20060803T084657
-CLASS:PRIVATE
-TRANSP:OPAQUE
-RRULE:FREQ=YEARLY;INTERVAL=1
-SEQUENCE:1
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20060803T084657Z-6038-1000-1-13@lamb
-DESCRIPTION:Steve's Birthday
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 UID:20061210T214816Z-5064-1001-1-0@dolmein
 DTSTAMP:20061210T215058Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061