From b44c2e433d5ae24edfde517b5cb4f0cdfcaeb9b2 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 17 Apr 2010 12:30:24 +1200 Subject: [PATCH] Add SQL query to test 244 to highlight the correct results. --- .../regression-suite/244-Moz-POST-FB.result | 17 +++++++++++++++++ .../tests/regression-suite/244-Moz-POST-FB.test | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result index 2a8f22d0..e5a12aec 100644 --- a/testing/tests/regression-suite/244-Moz-POST-FB.result +++ b/testing/tests/regression-suite/244-Moz-POST-FB.result @@ -35,3 +35,20 @@ END:VCALENDAR + + finish: >20081019T223000Z< + rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR< + start: >20081019T220000Z< + + finish: >20081019T210000Z< + rrule: >FREQ=WEEKLY;INTERVAL=1< + start: >20081019T200000Z< + + finish: >20081024T020000Z< + rrule: >FREQ=WEEKLY;INTERVAL=1< + start: >20081024T010000Z< + + finish: >20081007T070000Z< + rrule: >FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1< + start: >20081006T070000Z< + diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.test b/testing/tests/regression-suite/244-Moz-POST-FB.test index de4ee20d..98449a83 100644 --- a/testing/tests/regression-suite/244-Moz-POST-FB.test +++ b/testing/tests/regression-suite/244-Moz-POST-FB.test @@ -30,3 +30,19 @@ END:VFREEBUSY END:VCALENDAR ENDDATA +QUERY +SELECT calendar_item.rrule, + to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start, + to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS finish + FROM usr INNER JOIN collection USING (user_no) + INNER JOIN caldav_data USING (collection_id) + INNER JOIN calendar_item USING(dav_id) +WHERE lower(usr.email) = 'user2@example.net' + AND collection.is_calendar + AND rrule_event_overlaps( dtstart, dtend, rrule, '20081020T110000Z', '20081105T110000Z' ) + AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) + AND (calendar_item.transp != 'TRANSPARENT' OR calendar_item.transp IS NULL) + AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL) + AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) + ORDER BY dav_id +ENDQUERY