diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.result b/testing/tests/regression-suite/0702-caldav4j-PUT.result index 21fd721e..bad11696 100644 --- a/testing/tests/regression-suite/0702-caldav4j-PUT.result +++ b/testing/tests/regression-suite/0702-caldav4j-PUT.result @@ -41,9 +41,9 @@ END:VCALENDAR class: >PUBLIC< dav_etag: >c056350d3c91ac45724c0f9773778941< description: >NULL< - dtend: >2006-01-02 00:00:00< + dtend: >2006-01-02 00:00:00+13< dtstamp: >2009-05-15 09:53:26< - dtstart: >2006-01-01 00:00:00< + dtstart: >2006-01-01 00:00:00+13< due: >NULL< last_modified: >2009-05-15 09:53:26< location: >NULL< @@ -54,7 +54,7 @@ END:VCALENDAR status: >NULL< summary: >All_Day_NY_JAN1< transp: >NULL< - tz_id: >America/New_York< + tz_id: >NULL< uid: >C68DADAD-37CE-44F7-8A37-52E1D02E29CA< url: >NULL< user_no: >10< diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.test b/testing/tests/regression-suite/0702-caldav4j-PUT.test index bbc2b13a..1ee290ff 100644 --- a/testing/tests/regression-suite/0702-caldav4j-PUT.test +++ b/testing/tests/regression-suite/0702-caldav4j-PUT.test @@ -1,6 +1,10 @@ # # PUT an caldav4j regression testing event into the database # +# Note that although this event appears to refer to the NY time +# zone it does not reference it, since DTSTART/DTEND are VALLUE=DATE +# which may not reference a timezone. +# TYPE=PUT URL=http://mycaldav/caldav.php/user1/collection/All_Day_NY_JAN1.ics HEADER=Content-Type: text/calendar @@ -43,12 +47,11 @@ ENDDATA QUERY SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, - uid, dtstamp, dtstart at time zone tz_locn as dtstart, - dtend at time zone tz_locn as dtend, due, summary, location, + uid, dtstamp, dtstart, dtend, due, summary, location, description, priority, class, transp, rrule, url, percent_complete, tz_id, status, caldav_data AS " CalDAV Data", last_modified -FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id) +FROM caldav_data LEFT JOIN calendar_item USING(dav_name) LEFT JOIN time_zone USING (tz_id) WHERE caldav_data.dav_name = '/user1/collection/All_Day_NY_JAN1.ics' ENDQUERY