summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-03-11 14:40:23 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-03-11 14:40:23 (GMT)
commitf504a341cefaec1072e1829d41e32555ff423abf (patch)
tree4566d60a4bf1adb82bea9a95bb85aa325ead38e2
parent16d0e127a1e9fb8399c841aad315466bff3d5a3a (diff)
downloadiRony-f504a341cefaec1072e1829d41e32555ff423abf.tar.gz
Make CalDAV tests pass (again)
-rw-r--r--test/Resource/CalDAV/caldaviop/1/1_1.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/1/1_2.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/1/1_3.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/1/1_4.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_1.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_2.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_3.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_4.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_5.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_6.txt6
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_7.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_8.txt8
-rw-r--r--test/Resource/CalDAV/caldaviop/2/2_9.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_1.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_2.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_3.txt6
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_4a.txt4
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_4b.txt6
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_5a.txt6
-rw-r--r--test/Resource/CalDAV/caldaviop/4/4_5b.txt6
-rw-r--r--test/Resource/CalDAV/ctag/2.ics4
-rw-r--r--test/Resource/CalDAV/delete/1.txt30
-rw-r--r--test/Resource/CalDAV/delete/2.txt31
-rw-r--r--test/Resource/CalDAV/delete/3.txt32
-rw-r--r--test/Resource/CalDAV/delete/4.txt34
-rw-r--r--test/Resource/CalDAV/event/1.txt4
-rw-r--r--test/Resource/CalDAV/event/2.txt4
-rw-r--r--test/Resource/CalDAV/event/4.txt4
-rw-r--r--test/scripts/tests/CalDAV/ctag.xml12
-rw-r--r--test/serverinfo.xml6
30 files changed, 191 insertions, 64 deletions
diff --git a/test/Resource/CalDAV/caldaviop/1/1_1.txt b/test/Resource/CalDAV/caldaviop/1/1_1.txt
index 02d4093..5b1af48 100644
--- a/test/Resource/CalDAV/caldaviop/1/1_1.txt
+++ b/test/Resource/CalDAV/caldaviop/1/1_1.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T090000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T090000
DURATION:PT1H
LOCATION:Durham
SUMMARY:Meeting 1.1
diff --git a/test/Resource/CalDAV/caldaviop/1/1_2.txt b/test/Resource/CalDAV/caldaviop/1/1_2.txt
index 26c859a..4d4aecc 100644
--- a/test/Resource/CalDAV/caldaviop/1/1_2.txt
+++ b/test/Resource/CalDAV/caldaviop/1/1_2.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T100000
DURATION:PT1H
RRULE:FREQ=WEEKLY;COUNT=4
SUMMARY:Meeting 1.2
diff --git a/test/Resource/CalDAV/caldaviop/1/1_3.txt b/test/Resource/CalDAV/caldaviop/1/1_3.txt
index b7e1415..7905630 100644
--- a/test/Resource/CalDAV/caldaviop/1/1_3.txt
+++ b/test/Resource/CalDAV/caldaviop/1/1_3.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -25,7 +25,7 @@ ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr3:
DTSTAMP:20051228T232640Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T111500
+DTSTART;TZID=America/Detroit:$now.year.1:0109T111500
DURATION:PT1H
ORGANIZER;CN=$username1::$cuaddr1:
SUMMARY:Meeting 1.3
diff --git a/test/Resource/CalDAV/caldaviop/1/1_4.txt b/test/Resource/CalDAV/caldaviop/1/1_4.txt
index 5a69565..bd35b1d 100644
--- a/test/Resource/CalDAV/caldaviop/1/1_4.txt
+++ b/test/Resource/CalDAV/caldaviop/1/1_4.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T234558Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T120000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T120000
DURATION:PT1H
SUMMARY:Meeting 1.4
UID:1-1_4
diff --git a/test/Resource/CalDAV/caldaviop/2/2_1.txt b/test/Resource/CalDAV/caldaviop/2/2_1.txt
index 1e40ee2..dc3aa51 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_1.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_1.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T090000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031237Z
LOCATION:Durham
diff --git a/test/Resource/CalDAV/caldaviop/2/2_2.txt b/test/Resource/CalDAV/caldaviop/2/2_2.txt
index 4e6ca18..82c08ce 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_2.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_2.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T090000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031253Z
LOCATION:Seattle bis
diff --git a/test/Resource/CalDAV/caldaviop/2/2_3.txt b/test/Resource/CalDAV/caldaviop/2/2_3.txt
index 51b0f06..347d8ff 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_3.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_3.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0110T090000
+DTSTART;TZID=America/Detroit:$now.year.1:0110T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031307Z
LOCATION:Seattle bis
diff --git a/test/Resource/CalDAV/caldaviop/2/2_4.txt b/test/Resource/CalDAV/caldaviop/2/2_4.txt
index f37ef76..9f841fb 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_4.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_4.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -24,7 +24,7 @@ BEGIN:VEVENT
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0110T090000
+DTSTART;TZID=America/Detroit:$now.year.1:0110T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031335Z
LOCATION:Seattle bis
diff --git a/test/Resource/CalDAV/caldaviop/2/2_5.txt b/test/Resource/CalDAV/caldaviop/2/2_5.txt
index 857e604..3d315e7 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_5.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_5.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -24,7 +24,7 @@ BEGIN:VEVENT
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0110T090000
+DTSTART;TZID=America/Detroit:$now.year.1:0110T090000
DURATION:PT1H
LAST-MODIFIED:20051229T031502Z
LOCATION:Seattle bis
diff --git a/test/Resource/CalDAV/caldaviop/2/2_6.txt b/test/Resource/CalDAV/caldaviop/2/2_6.txt
index b0267b5..be57ded 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_6.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_6.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T100000
DURATION:PT1H
LAST-MODIFIED:20051229T031626Z
RRULE:FREQ=WEEKLY;COUNT=4
@@ -32,7 +32,7 @@ UID:1-1_2
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T100000
DURATION:PT1H
LAST-MODIFIED:20051229T031626Z
SEQUENCE:1
diff --git a/test/Resource/CalDAV/caldaviop/2/2_7.txt b/test/Resource/CalDAV/caldaviop/2/2_7.txt
index 6231689..879608e 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_7.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_7.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -25,7 +25,7 @@ ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
ATTENDEE;PARTSTAT=DECLINED;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr3:
DTSTAMP:20051228T232640Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T111500
+DTSTART;TZID=America/Detroit:$now.year.1:0109T111500
DURATION:PT1H
ORGANIZER;CN=$username1::$cuaddr1:
SEQUENCE:1
diff --git a/test/Resource/CalDAV/caldaviop/2/2_8.txt b/test/Resource/CalDAV/caldaviop/2/2_8.txt
index 564b4d6..232acdd 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_8.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_8.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,9 +22,9 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T100000
DURATION:PT1H
-EXDATE;TZID=US/Eastern:$now.year.1:0130T100000
+EXDATE;TZID=America/Detroit:$now.year.1:0130T100000
LAST-MODIFIED:20051229T031649Z
RRULE:FREQ=WEEKLY;COUNT=4
SEQUENCE:2
@@ -33,7 +33,7 @@ UID:1-1_2
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051228T232548Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T100000
DURATION:PT1H
LAST-MODIFIED:20051229T031626Z
SEQUENCE:2
diff --git a/test/Resource/CalDAV/caldaviop/2/2_9.txt b/test/Resource/CalDAV/caldaviop/2/2_9.txt
index 50e6c66..bcd0b57 100644
--- a/test/Resource/CalDAV/caldaviop/2/2_9.txt
+++ b/test/Resource/CalDAV/caldaviop/2/2_9.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -24,7 +24,7 @@ BEGIN:VEVENT
ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;ROLE=CHAIR:$cuaddr1:
ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:$cuaddr2:
DTSTAMP:20051228T232517Z
-DTSTART;TZID=US/Eastern:$now.year.1:0110T120000
+DTSTART;TZID=America/Detroit:$now.year.1:0110T120000
DURATION:PT1H
LAST-MODIFIED:20051229T031502Z
LOCATION:Seattle bis
diff --git a/test/Resource/CalDAV/caldaviop/4/4_1.txt b/test/Resource/CalDAV/caldaviop/4/4_1.txt
index b4ef093..1a698f2 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_1.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_1.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035051Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T110000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T110000
DURATION:PT1H
SUMMARY:Meeting 4.1
UID:4-4_1
diff --git a/test/Resource/CalDAV/caldaviop/4/4_2.txt b/test/Resource/CalDAV/caldaviop/4/4_2.txt
index 7f28371..14110a1 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_2.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_2.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035131Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T120000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T120000
DURATION:PT1H
RRULE:FREQ=DAILY;COUNT=5
SUMMARY:Meeting 4.2
diff --git a/test/Resource/CalDAV/caldaviop/4/4_3.txt b/test/Resource/CalDAV/caldaviop/4/4_3.txt
index f46dc65..1441131 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_3.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_3.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035241Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T130000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T130000
DURATION:PT1H
RRULE:FREQ=DAILY;COUNT=5
SUMMARY:Meeting 4.3
@@ -30,7 +30,7 @@ UID:4-4_3
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051229T035241Z
-DTSTART;TZID=US/Eastern:$now.year.1:0110T130000
+DTSTART;TZID=America/Detroit:$now.year.1:0110T130000
DURATION:PT2H
RECURRENCE-ID:$now.year.1:0110T180000Z
SUMMARY:Meeting 4.3
diff --git a/test/Resource/CalDAV/caldaviop/4/4_4a.txt b/test/Resource/CalDAV/caldaviop/4/4_4a.txt
index 8cd09bc..8311747 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_4a.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_4a.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035317Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T140000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T140000
DURATION:PT1H
RRULE:FREQ=DAILY;COUNT=5
SUMMARY:Meeting 4.4
diff --git a/test/Resource/CalDAV/caldaviop/4/4_4b.txt b/test/Resource/CalDAV/caldaviop/4/4_4b.txt
index fc3ef20..4b4feba 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_4b.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_4b.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,9 +22,9 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035317Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T140000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T140000
DURATION:PT1H
-EXDATE;TZID=US/Eastern:$now.year.1:0110T140000
+EXDATE;TZID=America/Detroit:$now.year.1:0110T140000
LAST-MODIFIED:20051229T035328Z
RRULE:FREQ=DAILY;COUNT=5
SEQUENCE:1
diff --git a/test/Resource/CalDAV/caldaviop/4/4_5a.txt b/test/Resource/CalDAV/caldaviop/4/4_5a.txt
index 21a066d..ed16531 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_5a.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_5a.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035352Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T150000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T150000
DURATION:PT1H
RRULE:FREQ=DAILY;COUNT=5
SUMMARY:Meeting 4.5
@@ -30,7 +30,7 @@ UID:4-4_5
END:VEVENT
BEGIN:VEVENT
DTSTAMP:20051229T035352Z
-DTSTART;TZID=US/Eastern:$now.year.1:0110T150000
+DTSTART;TZID=America/Detroit:$now.year.1:0110T150000
DURATION:PT2H
RECURRENCE-ID:$now.year.1:0110T200000Z
SUMMARY:Meeting 4.5
diff --git a/test/Resource/CalDAV/caldaviop/4/4_5b.txt b/test/Resource/CalDAV/caldaviop/4/4_5b.txt
index a5ce450..519a662 100644
--- a/test/Resource/CalDAV/caldaviop/4/4_5b.txt
+++ b/test/Resource/CalDAV/caldaviop/4/4_5b.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,9 +22,9 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051229T035352Z
-DTSTART;TZID=US/Eastern:$now.year.1:0109T150000
+DTSTART;TZID=America/Detroit:$now.year.1:0109T150000
DURATION:PT1H
-EXDATE;TZID=US/Eastern:$now.year.1:0110T150000
+EXDATE;TZID=America/Detroit:$now.year.1:0110T150000
LAST-MODIFIED:20051229T035404Z
RRULE:FREQ=DAILY;COUNT=5
SEQUENCE:1
diff --git a/test/Resource/CalDAV/ctag/2.ics b/test/Resource/CalDAV/ctag/2.ics
index b259a29..5cc246e 100644
--- a/test/Resource/CalDAV/ctag/2.ics
+++ b/test/Resource/CalDAV/ctag/2.ics
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -23,7 +23,7 @@ END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
CREATED:20060101T150000Z
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0101T100000
DURATION:PT1H
SUMMARY:event 1
UID:2
diff --git a/test/Resource/CalDAV/delete/1.txt b/test/Resource/CalDAV/delete/1.txt
new file mode 100644
index 0000000..6d906bb
--- /dev/null
+++ b/test/Resource/CalDAV/delete/1.txt
@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:America/Detroit
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T205953Z
+DTSTART;TZID=America/Detroit:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:1
+END:VEVENT
+END:VCALENDAR
diff --git a/test/Resource/CalDAV/delete/2.txt b/test/Resource/CalDAV/delete/2.txt
new file mode 100644
index 0000000..1658e15
--- /dev/null
+++ b/test/Resource/CalDAV/delete/2.txt
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:America/Denver
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:MDT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0600
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:MST
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0700
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T210052Z
+DTSTART;TZID=America/Denver:$now.year.1:0101T110000
+DURATION:PT1H
+SUMMARY:event 2
+DESCRIPTION:Some notes
+UID:2
+END:VEVENT
+END:VCALENDAR
diff --git a/test/Resource/CalDAV/delete/3.txt b/test/Resource/CalDAV/delete/3.txt
new file mode 100644
index 0000000..7cb5da6
--- /dev/null
+++ b/test/Resource/CalDAV/delete/3.txt
@@ -0,0 +1,32 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Pacific
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T210146Z
+DTSTART;TZID=US/Pacific:$now.year.1:0101T130000
+DURATION:PT1H
+LAST-MODIFIED:20051222T210203Z
+SEQUENCE:1
+SUMMARY:event 3
+UID:3
+END:VEVENT
+END:VCALENDAR
diff --git a/test/Resource/CalDAV/delete/4.txt b/test/Resource/CalDAV/delete/4.txt
new file mode 100644
index 0000000..2ea0eeb
--- /dev/null
+++ b/test/Resource/CalDAV/delete/4.txt
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:America/Detroit
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20051222T210310Z
+DTSTART;TZID=America/Detroit:$now.year.1:0101T180000
+DURATION:PT1H
+SUMMARY:event 4
+UID:4
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/test/Resource/CalDAV/event/1.txt b/test/Resource/CalDAV/event/1.txt
index c5b7f9b..6d906bb 100644
--- a/test/Resource/CalDAV/event/1.txt
+++ b/test/Resource/CalDAV/event/1.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051222T205953Z
-DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DTSTART;TZID=America/Detroit:$now.year.1:0101T100000
DURATION:PT1H
SUMMARY:event 1
UID:1
diff --git a/test/Resource/CalDAV/event/2.txt b/test/Resource/CalDAV/event/2.txt
index 68a601b..1658e15 100644
--- a/test/Resource/CalDAV/event/2.txt
+++ b/test/Resource/CalDAV/event/2.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Mountain
+TZID:America/Denver
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051222T210052Z
-DTSTART;TZID=US/Mountain:$now.year.1:0101T110000
+DTSTART;TZID=America/Denver:$now.year.1:0101T110000
DURATION:PT1H
SUMMARY:event 2
DESCRIPTION:Some notes
diff --git a/test/Resource/CalDAV/event/4.txt b/test/Resource/CalDAV/event/4.txt
index b078d46..2ea0eeb 100644
--- a/test/Resource/CalDAV/event/4.txt
+++ b/test/Resource/CalDAV/event/4.txt
@@ -4,7 +4,7 @@ PRODID:-//Example Inc.//Example Calendar//EN
VERSION:2.0
BEGIN:VTIMEZONE
LAST-MODIFIED:20040110T032845Z
-TZID:US/Eastern
+TZID:America/Detroit
BEGIN:DAYLIGHT
DTSTART:20000404T020000
RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
@@ -22,7 +22,7 @@ END:STANDARD
END:VTIMEZONE
BEGIN:VEVENT
DTSTAMP:20051222T210310Z
-DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
+DTSTART;TZID=America/Detroit:$now.year.1:0101T180000
DURATION:PT1H
SUMMARY:event 4
UID:4
diff --git a/test/scripts/tests/CalDAV/ctag.xml b/test/scripts/tests/CalDAV/ctag.xml
index fbcb0ed..4c04639 100644
--- a/test/scripts/tests/CalDAV/ctag.xml
+++ b/test/scripts/tests/CalDAV/ctag.xml
@@ -32,7 +32,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/event/1.txt</filepath>
+ <filepath>Resource/CalDAV/delete/1.txt</filepath>
</data>
</request>
<request>
@@ -44,7 +44,7 @@
<ruri>$calendarhome1:/movecopy/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/event/2.txt</filepath>
+ <filepath>Resource/CalDAV/delete/2.txt</filepath>
</data>
</request>
<request>
@@ -151,7 +151,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/event/1.txt</filepath>
+ <filepath>Resource/CalDAV/delete/1.txt</filepath>
</data>
</request>
<request>
@@ -185,7 +185,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/event/1.txt</filepath>
+ <filepath>Resource/CalDAV/delete/1.txt</filepath>
</data>
</request>
<request>
@@ -473,7 +473,7 @@
</test-suite>
<!-- TODO: enable these tests once scheduling is implemented -->
- <test-suite name='Scheduling' ignore='no'>
+ <test-suite name='Scheduling' ignore='yes'>
<require-feature>
<feature>schedule-inbox</feature>
</require-feature>
@@ -653,7 +653,7 @@
<ruri>$calendarpath1:/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/event/1.txt</filepath>
+ <filepath>Resource/CalDAV/delete/1.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
diff --git a/test/serverinfo.xml b/test/serverinfo.xml
index 501e275..9eeba5a 100644
--- a/test/serverinfo.xml
+++ b/test/serverinfo.xml
@@ -108,7 +108,7 @@
<!-- relative path to caldav root-->
<substitution>
<key>$root:</key>
- <value>/dav/</value>
+ <value>/iRony/</value>
</substitution>
<!-- Useful xpath shortcuts for verifiers -->
@@ -448,7 +448,7 @@
</substitution>
<substitution>
<key>$principaluri%d:</key>
- <value>$principalcollection:$userguid%d:/</value>
+ <value>$principalcollection:dav.user%02d%%40example.org/</value>
</substitution>
<substitution>
<key>$principal%dnoslash:</key>
@@ -507,7 +507,7 @@
</substitution>
<substitution>
<key>$email%d:</key>
- <value>$userid%d:@example.com</value>
+ <value>$userid%d:</value>
</substitution>
<!-- calendar user address of user-->
<substitution>