More correct results.

horde · Apr 26, 2016 · 5609a4e · 5609a4e
1 parent 9f97833
commit 5609a4e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 44 deletions.
diff --git a/framework/Timezone/test/Horde/Timezone/fixtures/budapest.ics b/framework/Timezone/test/Horde/Timezone/fixtures/budapest.ics
@@ -17,15 +17,15 @@ TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 DTSTART:19170416T020000
 RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=1MO;UNTIL
- =19180421T000000Z
+ =19180415T010000Z
 TZNAME:CEST
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19170917T020000
+DTSTART:19170917T030000
 RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=15,16,17,18,19,20,21;BYDAY=1MO;UNTIL
- =19180915T000000Z
+ =19180916T010000Z
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -53,9 +53,9 @@ DTSTART:19191124T030000
 TZNAME:CE-T
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19421102T020000
+DTSTART:19421102T030000
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -67,26 +67,26 @@ END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19431004T020000
+DTSTART:19431004T030000
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450401T010000Z
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
 TZNAME:CEST
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19441002T020000
+DTSTART:19441002T030000
 TZNAME:CE-T
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:+0100
+TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19450916T020000
+DTSTART:19450916T030000
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -110,7 +110,7 @@ END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19461006T020000
+DTSTART:19461006T030000
 RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
 TZNAME:CE-T
 END:STANDARD
@@ -131,7 +131,7 @@ END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19501023T020000
+DTSTART:19501023T030000
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -145,35 +145,31 @@ BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19541003T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=3;UNTIL=19551002T230000Z
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=3;UNTIL=19551002T220000Z
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 DTSTART:19560603T000000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19560602T230000Z
 TZNAME:CEST
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19560930T000000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9;UNTIL=19560929T230000Z
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
 DTSTART:19570602T010000
-RRULE:FREQ=YEARLY;BYMONTH=6;BYDAY=1SU;UNTIL=19570602T000000Z
 TZNAME:CEST
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19570929T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9;UNTIL=19570929T020000Z
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -185,28 +181,27 @@ END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-DTSTART:19800406T010000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T000000Z
+DTSTART:19800406T020000
 TZNAME:CEST
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19800928T010000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9;UNTIL=19950923T230000Z
+DTSTART:19800928T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9;UNTIL=19950924T010000Z
 TZNAME:CE-T
 END:STANDARD
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
-DTSTART:19810329T010000
+DTSTART:19810329T020000
 RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
 TZNAME:CEST
 END:DAYLIGHT
 BEGIN:STANDARD
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
-DTSTART:19961027T010000
+DTSTART:19961027T030000
 RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
 TZNAME:CE-T
 END:STANDARD

diff --git a/framework/Timezone/test/Horde/Timezone/fixtures/losangeles.ics b/framework/Timezone/test/Horde/Timezone/fixtures/losangeles.ics
@@ -11,7 +11,7 @@ BEGIN:STANDARD
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
 DTSTART:19181027T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=19191026T100000Z
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=19191026T090000Z
 TZNAME:PST
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -21,9 +21,9 @@ DTSTART:19420209T020000
 TZNAME:PWT
 END:DAYLIGHT
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0800
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0700
-DTSTART:19450814T230000
+DTSTART:19450814T160000
 TZNAME:PPT
 END:DAYLIGHT
 BEGIN:STANDARD
@@ -55,14 +55,14 @@ BEGIN:STANDARD
 TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
 DTSTART:19500924T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9;UNTIL=19610924T100000Z
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=9;UNTIL=19610924T090000Z
 TZNAME:PST
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0800
+TZOFFSETFROM:-0700
 TZOFFSETTO:-0800
 DTSTART:19621028T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=19661030T100000Z
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=19661030T090000Z
 TZNAME:PST
 END:STANDARD
 BEGIN:STANDARD

diff --git a/framework/Timezone/test/Horde/Timezone/fixtures/uruguay.ics b/framework/Timezone/test/Horde/Timezone/fixtures/uruguay.ics
@@ -13,10 +13,10 @@ DTSTART:19231002T000000
 TZNAME:UYHST
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0330
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0330
 DTSTART:19240401T000000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;UNTIL=19260401T033000Z
+RRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=1;UNTIL=19260401T030000Z
 TZNAME:UY-T
 END:STANDARD
 BEGIN:STANDARD
@@ -34,11 +34,11 @@ RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10;UNTIL=19351027T033000Z
 TZNAME:UYHST
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0330
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0330
-DTSTART:19340331T233000
+DTSTART:19340401T000000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=25,26,27,28,29,30,31;BYDAY=1SA;UNTIL
- =19360330T030000Z
+ =19360329T030000Z
 TZNAME:UY-T
 END:STANDARD
 BEGIN:STANDARD
@@ -48,10 +48,10 @@ DTSTART:19361101T000000
 TZNAME:UYHST
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0330
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0330
 DTSTART:19370328T000000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3;UNTIL=19410330T033000Z
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3;UNTIL=19410330T030000Z
 TZNAME:UY-T
 END:STANDARD
 BEGIN:STANDARD
@@ -68,7 +68,7 @@ DTSTART:19410801T000000
 TZNAME:UYHST
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0330
+TZOFFSETFROM:-0300
 TZOFFSETTO:-0330
 DTSTART:19420101T000000
 TZNAME:UY-T
@@ -135,10 +135,10 @@ DTSTART:19650926T000000
 TZNAME:UY-T
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
 DTSTART:19661031T000000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=31;UNTIL=19671031T030000Z
+RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=31;UNTIL=19671031T020000Z
 TZNAME:UY-T
 END:STANDARD
 BEGIN:STANDARD
@@ -149,10 +149,10 @@ RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=27;UNTIL=19700527T030000Z
 TZNAME:UYHST
 END:STANDARD
 BEGIN:STANDARD
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0230
 TZOFFSETTO:-0300
 DTSTART:19681202T000000
-RRULE:FREQ=YEARLY;BYMONTH=12;BYMONTHDAY=2;UNTIL=19701202T030000Z
+RRULE:FREQ=YEARLY;BYMONTH=12;BYMONTHDAY=2;UNTIL=19701202T023000Z
 TZNAME:UY-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -174,7 +174,7 @@ DTSTART:19740310T000000
 TZNAME:UYHST
 END:STANDARD
 BEGIN:DAYLIGHT
-TZOFFSETFROM:-0300
+TZOFFSETFROM:-0230
 TZOFFSETTO:-0200
 DTSTART:19741222T000000
 TZNAME:UYST
@@ -243,7 +243,7 @@ BEGIN:STANDARD
 TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
 DTSTART:19900304T000000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920301T030000Z
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=1SU;UNTIL=19920301T020000Z
 TZNAME:UY-T
 END:STANDARD
 BEGIN:DAYLIGHT
@@ -302,7 +302,7 @@ TZOFFSETFROM:-0200
 TZOFFSETTO:-0300
 DTSTART:20070311T020000
 RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=8,9,10,11,12,13,14;BYDAY=1SU;UNTIL=2
- 0150308T050000Z
+ 0150308T040000Z
 TZNAME:UY-T
 END:STANDARD
 END:VTIMEZONE