diff --git a/testing/tests/regression-suite/0831-Spec-RRULE-1.result b/testing/tests/regression-suite/0831-Spec-RRULE-1.result index 733230cc..75a823d6 100644 --- a/testing/tests/regression-suite/0831-Spec-RRULE-1.result +++ b/testing/tests/regression-suite/0831-Spec-RRULE-1.result @@ -10,7 +10,7 @@ Testing the RRule v2 Library =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061103T073000 - RRULE:FREQ=DAILY;COUNT=7 Daily for 7 days -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-03 07:30:00 2006-11-04 07:30:00 2006-11-05 07:30:00 2006-11-06 07:30:00 @@ -24,7 +24,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061102T100000 - RRULE:FREQ=WEEKLY;COUNT=26;INTERVAL=1;BYDAY=TH Weekly for 26 weeks -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-02 10:00:00 2006-11-09 10:00:00 2006-11-16 10:00:00 2006-11-23 10:00:00 @@ -48,7 +48,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061103T160000 - RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=4 Fortnightly for 4 events -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-03 16:00:00 2006-11-17 16:00:00 2006-12-01 16:00:00 2006-12-15 16:00:00 @@ -60,7 +60,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061103T160000 - RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071122T235900 Fortnightly for 28 events -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-03 16:00:00 2006-11-17 16:00:00 2006-12-01 16:00:00 2006-12-15 16:00:00 @@ -84,7 +84,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081101T160000 - RRULE:FREQ=WEEKLY;COUNT=15;INTERVAL=1;BYDAY=MO,WE,FR 3/wk for 5 weeks -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2008-11-03 16:00:00 2008-11-05 16:00:00 2008-11-07 16:00:00 2008-11-10 16:00:00 @@ -102,7 +102,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061104T073000 - RRULE:FREQ=MONTHLY Monthly forever -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-04 07:30:00 2006-12-04 07:30:00 2007-01-04 07:30:00 2007-02-04 07:30:00 @@ -128,7 +128,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061117T073000 - RRULE:FREQ=MONTHLY;BYDAY=1MO,2WE,3FR,-1SU Monthly, on the 1st monday, 2nd wednesday, 3rd friday and last sunday, forever -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-17 07:30:00 2006-11-26 07:30:00 2006-12-04 07:30:00 2006-12-13 07:30:00 @@ -154,7 +154,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061107T113000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;UNTIL=20070101T000000 The working days of each month -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-07 11:30:00 2006-11-08 11:30:00 2006-11-09 11:30:00 2006-11-10 11:30:00 @@ -180,7 +180,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20061107T113000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1;COUNT=30 The last working day of each month -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2006-11-30 11:30:00 2006-12-29 11:30:00 2007-01-31 11:30:00 2007-02-28 11:30:00 @@ -206,7 +206,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081020T103000 - RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;COUNT=30 Every working day -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2008-10-20 10:30:00 2008-10-21 10:30:00 2008-10-22 10:30:00 2008-10-23 10:30:00 @@ -232,7 +232,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081020T110000 - RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;COUNT=30 Every working day -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2008-10-20 11:00:00 2008-10-21 11:00:00 2008-10-22 11:00:00 2008-10-23 11:00:00 @@ -258,7 +258,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20110831 - RRULE:FREQ=MONTHLY;BYMONTHDAY=-1 The last day of each month -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2011-08-31 00:00:00 2011-09-30 00:00:00 2011-10-31 00:00:00 2011-11-30 00:00:00 @@ -284,7 +284,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081001T133000 - RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1TU,2WE,3TH,4FR;BYMONTH=3,6,9,10,12 1st Tuesday, 2nd Wednesday, 3rd Thursday & 4th Friday, every March, June, September, October and December (SQL is wrong) -PHP & SQL results differ :-( +PHP & SQL results differ :-( PHP Result: 2008-10-07 13:30:00 2008-10-08 13:30:00 2008-10-16 13:30:00 2008-10-24 13:30:00 @@ -310,7 +310,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081017T084500 - RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR;COUNT=30 Every tuesday and friday -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2008-10-17 08:45:00 2008-10-21 08:45:00 2008-10-24 08:45:00 2008-10-28 08:45:00 @@ -336,7 +336,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081017T084500 - RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,FR;COUNT=30 Every tuesday and friday -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2008-10-17 08:45:00 2008-10-21 08:45:00 2008-10-24 08:45:00 2008-10-28 08:45:00 @@ -362,7 +362,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20081017T084500 - RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=TU,FR;COUNT=30 Every tuesday and friday -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2008-10-17 08:45:00 2008-10-21 08:45:00 2008-10-24 08:45:00 2008-10-28 08:45:00 @@ -388,7 +388,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 19700315T030000 Pacific/Auckland - FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3 Time zone 1 -PHP & SQL results differ :-( +PHP & SQL results differ :-( PHP Result: 1970-03-15 03:00:00 1971-03-21 03:00:00 1972-03-19 03:00:00 1973-03-18 03:00:00 @@ -414,7 +414,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 19700927T020000 - FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9 Time zone 2 -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 1970-09-27 02:00:00 1971-09-26 02:00:00 1972-09-24 02:00:00 1973-09-30 02:00:00 @@ -440,7 +440,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 19810329T030000 - FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU Time zone 3 -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 1981-03-29 03:00:00 1982-03-28 03:00:00 1983-03-27 03:00:00 1984-03-25 03:00:00 @@ -466,7 +466,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20000404T010000 - FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;COUNT=15 Time zone 4 -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2001-04-01 01:00:00 2002-04-07 01:00:00 2003-04-06 01:00:00 2004-04-04 01:00:00 @@ -484,7 +484,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20110905 - FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR;COUNT=6 Six Working Days -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2011-09-05 00:00:00 2011-09-06 00:00:00 2011-09-07 00:00:00 2011-09-08 00:00:00 @@ -498,7 +498,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20110905 - FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR;COUNT=6 Six Working Days -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2011-09-05 00:00:00 2011-09-06 00:00:00 2011-09-07 00:00:00 2011-09-08 00:00:00 @@ -512,7 +512,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20110831 - RRULE:FREQ=MONTHLY;BYMONTHDAY=31;COUNT=12 31st of each month -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2011-08-31 00:00:00 2011-10-31 00:00:00 2011-12-31 00:00:00 2012-01-31 00:00:00 @@ -528,7 +528,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20200925T011500 Pacific/Auckland - RRULE:FREQ=DAILY;COUNT=12 Expand over daylight savings change day forward - but no time change (2020-09-27) -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2020-09-25 01:15:00 2020-09-26 01:15:00 2020-09-27 01:15:00 2020-09-28 01:15:00 @@ -544,7 +544,7 @@ SQL Result: =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~= 20200925T021500 Pacific/Auckland - RRULE:FREQ=DAILY;COUNT=12 Expand over daylight savings change forward - time jump (2020-09-27) -PHP & SQL results are identical (-: +PHP & SQL results are identical (-: PHP Result: 2020-09-25 02:15:00 2020-09-26 02:15:00 2020-09-27 03:15:00 2020-09-28 03:15:00 diff --git a/testing/tests/regression-suite/0831-Spec-RRULE-1.test b/testing/tests/regression-suite/0831-Spec-RRULE-1.test index 3f2a919d..e86f4b29 100644 --- a/testing/tests/regression-suite/0831-Spec-RRULE-1.test +++ b/testing/tests/regression-suite/0831-Spec-RRULE-1.test @@ -7,11 +7,11 @@ URL=http://regression.host/caldav.php HEAD -# # This is a special type of request which just calls a PHP # program specifically for exercising the RRULE library. # +# You can also manually run: testing/test-RRULE-v2.php -REPLACE=/P: 0\.\d{4} & S: 0\.\d{4}// +REPLACE=/ P: 0\.\d{4} & S: 0\.\d{4}// # REPLACE=/Content-Type: text.(html|plain)/Content-Type: text/ REPLACE=~Content-Type: text/html~Content-Type: text/plain~