Updated test results

This commit is contained in:
Andrew McMillan 2010-10-09 09:21:33 -04:00
parent 57df0e140f
commit a47f636392
26 changed files with 77 additions and 54 deletions

View File

@ -7,7 +7,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/<

View File

@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8"
<error xmlns="DAV:">
<DAV::can-overwrite/>A resource already exists at the destination.
</error>
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/<

View File

@ -58,6 +58,24 @@
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<response>
<href>/caldav.php/user4/.out/</href>
<propstat>
<prop>
<displayname>User 4 Outbox</displayname>
<resource-id>
<href>/caldav.php/.resources/1435</href>
</resource-id>
<parent-set>
<parent>
<href>/caldav.php</href>
<segment>user4</segment>
</parent>
</parent-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
</response>
<response>
<href>/caldav.php/user4/calendar-proxy-read/</href>
<propstat>

View File

@ -7,14 +7,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
parent_container: >/user4/<
ticket_id_length: >8<
bind_id: >1435<
bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<

View File

@ -7,21 +7,21 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1435<
bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1439<
bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<

View File

@ -7,28 +7,28 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1435<
bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1439<
bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1440<
bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<

View File

@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8"
<error xmlns="DAV:">
<DAV::can-overwrite/>A resource already exists at the destination.
</error>
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1435<
bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1439<
bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1440<
bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<

View File

@ -6,7 +6,7 @@
<prop>
<displayname>A normal collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1437</href>
<href>/caldav.php/.resources/1440</href>
</resource-id>
<parent-set>
<parent>
@ -90,7 +90,7 @@
<prop>
<displayname>A sub collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1438</href>
<href>/caldav.php/.resources/1441</href>
</resource-id>
<parent-set>
<parent>

View File

@ -6,7 +6,7 @@
<prop>
<displayname>A normal collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1437</href>
<href>/caldav.php/.resources/1440</href>
</resource-id>
<parent-set>
<parent>

View File

@ -7,7 +7,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1434<
bind_id: >1437<
bind_owner: >6<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
@ -19,7 +19,7 @@ target_collection: >11<
target_resource_i: >NULL<
ticket_owner: >4<
bind_id: >1435<
bind_id: >1438<
bind_owner: >6<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
@ -31,7 +31,7 @@ target_collection: >10<
target_resource_i: >NULL<
ticket_owner: >3<
bind_id: >1439<
bind_id: >1442<
bind_owner: >6<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
@ -43,7 +43,7 @@ target_collection: >10<
target_resource_i: >NULL<
ticket_owner: >3<
bind_id: >1440<
bind_id: >1443<
bind_owner: >6<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
@ -55,7 +55,7 @@ target_collection: >11<
target_resource_i: >NULL<
ticket_owner: >4<
bind_id: >1453<
bind_id: >1456<
bind_owner: >1<
bound_source_id: >12<
dav_displayname: >user3 home<

View File

@ -6,14 +6,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1439<
bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
dav_owner_id: >6<
parent_container: >/user4/base/<
bind_id: >1440<
bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<

View File

@ -7,36 +7,36 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
bind_id: >1434<
bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1435<
bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1439<
bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1440<
bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1454<
bound_source_id: >1437<
bind_id: >1457<
bound_source_id: >1440<
dav_displayname: >A normal collection<
dav_name: >/user4/boundbase/<
length: >NULL<

View File

@ -6,7 +6,7 @@
<prop>
<displayname>A normal collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1437</href>
<href>/caldav.php/.resources/1440</href>
</resource-id>
<parent-set>
<parent>
@ -90,7 +90,7 @@
<prop>
<displayname>A sub collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1438</href>
<href>/caldav.php/.resources/1441</href>
</resource-id>
<parent-set>
<parent>
@ -112,7 +112,7 @@
<prop>
<displayname>newcalendar</displayname>
<resource-id>
<href>/caldav.php/.resources/1443</href>
<href>/caldav.php/.resources/1446</href>
</resource-id>
<parent-set>
<parent>

View File

@ -6,7 +6,7 @@
<prop>
<displayname>A normal collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1437</href>
<href>/caldav.php/.resources/1440</href>
</resource-id>
<parent-set>
<parent>
@ -99,7 +99,7 @@
<prop>
<displayname>A sub collection</displayname>
<resource-id>
<href>/caldav.php/.resources/1438</href>
<href>/caldav.php/.resources/1441</href>
</resource-id>
<parent-set>
<parent>
@ -125,7 +125,7 @@
<prop>
<displayname>newcalendar</displayname>
<resource-id>
<href>/caldav.php/.resources/1443</href>
<href>/caldav.php/.resources/1446</href>
</resource-id>
<parent-set>
<parent>

View File

@ -1,6 +1,6 @@
setval
--------
1433
1436
(1 row)
setval

View File

@ -1,6 +1,6 @@
setval
--------
1454
1457
(1 row)
setval

View File

@ -37,18 +37,22 @@ END:VCALENDAR
</C:response>
</C:schedule-response>
class: >PUBLIC<
finish: >20081019T223000Z<
rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR<
start: >20081019T220000Z<
class: >PUBLIC<
finish: >20081019T210000Z<
rrule: >FREQ=WEEKLY;INTERVAL=1<
start: >20081019T200000Z<
class: >PUBLIC<
finish: >20081024T020000Z<
rrule: >FREQ=WEEKLY;INTERVAL=1<
start: >20081024T010000Z<
class: >PUBLIC<
finish: >20081007T070000Z<
rrule: >FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1<
start: >20081006T070000Z<

View File

@ -33,7 +33,8 @@ 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
to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS finish,
class
FROM usr INNER JOIN collection USING (user_no)
INNER JOIN caldav_data USING (collection_id)
INNER JOIN calendar_item USING(dav_id)
@ -43,6 +44,5 @@ WHERE lower(usr.email) = 'user2@example.net'
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

View File

@ -39,6 +39,7 @@ END:VCALENDAR
a) Start: >20081024T054500Z<
b) Finish: >20081024T083000Z<
c) RRule: >FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR<
class: >PUBLIC<
d) Start: >2008-10-24 08:45:00<
status: >NULL<
tz_locn: >Europe/Helsinki<

View File

@ -38,7 +38,8 @@ SELECT calendar_item.rrule AS "c) RRule", calendar_item.status,
to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) Start",
to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "b) Finish",
calendar_item.dtstart at time zone tz_locn AS "d) Start",
time_zone.tz_locn
time_zone.tz_locn,
class
FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name,collection_id)
INNER JOIN collection USING(collection_id)
LEFT JOIN time_zone USING( tz_id )
@ -49,5 +50,4 @@ SELECT calendar_item.rrule AS "c) RRule", calendar_item.status,
AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL)
AND collection.is_calendar
AND collection.schedule_transp = 'opaque'
AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL)
ENDQUERY

View File

@ -16,7 +16,7 @@ Content-Type: text/plain; charset="utf-8"
attendees: >40<
collection_id: >1400<
collection_id: >1402<
dav_displayname: >anotherone<
dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a<
dav_name: >/user1/anotherone/<

View File

@ -406,9 +406,9 @@ END:VEVENT
BEGIN:VEVENT
UID:20060803T084628Z-6040-1000-1-6@lamb
DTSTAMP:20060803T084628Z
DTSTART;VALUE=DATE:20060801
DTEND;VALUE=DATE:20060802
SUMMARY:Steve's Birthday
DTSTART:20060801T123456
DTEND:20060802T123456
SUMMARY:Steve's Private Birthday
CREATED:20060803T084628
LAST-MODIFIED:20060803T084657
CLASS:PRIVATE

View File

@ -402,9 +402,9 @@ END:VEVENT
BEGIN:VEVENT
UID:20060803T084628Z-6040-1000-1-6@lamb
DTSTAMP:20060803T084628Z
DTSTART;VALUE=DATE:20060801
DTEND;VALUE=DATE:20060802
SUMMARY:Steve's Birthday
DTSTART:20060801T123456
DTEND:20060802T123456
SUMMARY:Steve's Private Birthday
CREATED:20060803T084628
LAST-MODIFIED:20060803T084657
CLASS:PRIVATE

View File

@ -6,9 +6,9 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
cd_collection: >1400<
cd_collection: >1402<
cd_user_no: >10<
ci_collection: >1400<
ci_collection: >1402<
ci_user_no: >10<
data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<

View File

@ -39,6 +39,6 @@ target_resource_i: >NULL<
dav_owner_id: >3<
privileges: >000000000001001011100111<
target_collection: >10<
target_resource_i: >1367<
target_resource_i: >1369<
timeout: >1 day<

View File

@ -19,6 +19,6 @@ target_resource_i: >NULL<
dav_owner_id: >3<
privileges: >000000000001001011100111<
target_collection: >10<
target_resource_i: >1367<
target_resource_i: >1369<
timeout: >24:00:00<