Change the collection ids used in regression testing - modified results.

This commit is contained in:
Andrew McMillan 2012-05-05 16:57:05 +12:00
parent 24d51de757
commit 0d2ef3475d
41 changed files with 78 additions and 78 deletions

View File

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

View File

@ -9,7 +9,7 @@ AUTH=user4:user4
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=X-DAViCal-Flush-Cache: true

View File

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

View File

@ -9,7 +9,7 @@ AUTH=user4:user4
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -24,7 +24,7 @@
<prop>
<displayname>User 2's Calendar, as uploaded by Admin</displayname>
<resource-id>
<href>/caldav.php/.resources/11</href>
<href>/caldav.php/.resources/161</href>
</resource-id>
<parent-set>
<parent>
@ -46,7 +46,7 @@
<prop>
<displayname>mir-test</displayname>
<resource-id>
<href>/caldav.php/.resources/13</href>
<href>/caldav.php/.resources/163</href>
</resource-id>
<parent-set>
<parent>
@ -64,7 +64,7 @@
<prop>
<displayname>user4 addresses</displayname>
<resource-id>
<href>/caldav.php/.resources/63</href>
<href>/caldav.php/.resources/463</href>
</resource-id>
<parent-set>
<parent>

View File

@ -8,14 +8,14 @@ Content-Type: text/plain; charset="utf-8"
bind_id: >1602<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
parent_container: >/user4/<
ticket_id_length: >8<
bind_id: >1603<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
parent_container: >/user4/<

View File

@ -9,7 +9,7 @@ AUTH=user4:user4
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 10 AND target_resource_id is null;
WHERE target_collection_id = 160 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -8,21 +8,21 @@ Content-Type: text/plain; charset="utf-8"
bind_id: >1602<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1603<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1607<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<

View File

@ -9,7 +9,7 @@ AUTH=user4:user4
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 10 AND target_resource_id is null;
WHERE target_collection_id = 160 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -8,28 +8,28 @@ Content-Type: text/plain; charset="utf-8"
bind_id: >1602<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1603<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1607<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1608<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<

View File

@ -9,7 +9,7 @@ AUTH=user4:user4
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -10,28 +10,28 @@ Content-Type: text/xml; charset="utf-8"
<can-overwrite/>A resource already exists at the destination.
</error>
bind_id: >1602<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1603<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1607<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1608<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<

View File

@ -9,7 +9,7 @@ AUTH=user4:user4
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -27,7 +27,7 @@
<prop>
<displayname>User 1's Calendaranza</displayname>
<resource-id>
<href>/caldav.php/.resources/10</href>
<href>/caldav.php/.resources/160</href>
</resource-id>
<parent-set>
<parent>
@ -59,7 +59,7 @@
<prop>
<displayname>User 2's Calendar, as uploaded by Admin</displayname>
<resource-id>
<href>/caldav.php/.resources/11</href>
<href>/caldav.php/.resources/161</href>
</resource-id>
<parent-set>
<parent>

View File

@ -33,7 +33,7 @@ Content-Type: text/xml; charset="utf-8"
dav_name: >/user3/home/<
dav_owner_id: >1<
privileges: >000000000001001011100111<
target_collection: >12<
target_collection: >162<
target_resource_i: >NULL<
timeout: >NULL<

View File

@ -28,7 +28,7 @@ SELECT access_ticket.dav_owner_id,
INNER JOIN collection ON (collection_id = target_collection_id)
WHERE collection.dav_name = '/user3/home/'
ENDQUERY
# WHERE target_collection = 11
# WHERE target_collection = 161
REPLACE=!ETag: "\S+"!ETag: "Some good etag"!
REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!

View File

@ -9,61 +9,61 @@ Content-Type: text/plain; charset="utf-8"
bind_id: >1602<
bind_owner: >1005<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
privileges: >000000000001001011100111<
target_collection: >11<
target_collection: >161<
target_resource_i: >NULL<
ticket_owner: >1003<
bind_id: >1603<
bind_owner: >1005<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
ticket_owner: >1002<
bind_id: >1607<
bind_owner: >1005<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
ticket_owner: >1002<
bind_id: >1608<
bind_owner: >1005<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<
parent_container: >/user4/base/<
privileges: >000000000001001011100111<
target_collection: >11<
target_collection: >161<
target_resource_i: >NULL<
ticket_owner: >1003<
bind_id: >1629<
bind_owner: >1<
bound_source_id: >12<
bound_source_id: >162<
dav_displayname: >user3 home<
dav_name: >/user4/base/user3/<
length: >8<
parent_container: >/user4/base/<
privileges: >000000000001001011100111<
target_collection: >12<
target_collection: >162<
target_resource_i: >NULL<
ticket_owner: >1<

View File

@ -9,7 +9,7 @@ AUTH=admin:nimda
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 12 AND target_resource_id is null;
WHERE target_collection_id = 162 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -7,14 +7,14 @@ Content-Type: text/plain; charset="utf-8"
bind_id: >1607<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
dav_owner_id: >1005<
parent_container: >/user4/base/<
bind_id: >1608<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
dav_owner_id: >1005<

View File

@ -8,28 +8,28 @@ Content-Type: text/plain; charset="utf-8"
bind_id: >1602<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
bind_id: >1603<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
bind_id: >1607<
bound_source_id: >10<
bound_source_id: >160<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
bind_id: >1608<
bound_source_id: >11<
bound_source_id: >161<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<

View File

@ -27,7 +27,7 @@
<prop>
<displayname>User 1's Calendaranza</displayname>
<resource-id>
<href>/caldav.php/.resources/10</href>
<href>/caldav.php/.resources/160</href>
</resource-id>
<parent-set>
<parent>
@ -59,7 +59,7 @@
<prop>
<displayname>User 2's Calendar, as uploaded by Admin</displayname>
<resource-id>
<href>/caldav.php/.resources/11</href>
<href>/caldav.php/.resources/161</href>
</resource-id>
<parent-set>
<parent>

View File

@ -28,7 +28,7 @@
<prop>
<displayname>User 1's Calendaranza</displayname>
<resource-id>
<href>/caldav.php/.resources/10</href>
<href>/caldav.php/.resources/160</href>
</resource-id>
<parent-set>
<parent>
@ -64,7 +64,7 @@
<prop>
<displayname>User 2's Calendar, as uploaded by Admin</displayname>
<resource-id>
<href>/caldav.php/.resources/11</href>
<href>/caldav.php/.resources/161</href>
</resource-id>
<parent-set>
<parent>

View File

@ -4,8 +4,8 @@ HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
ETag: "a96ee5986fc6ac00fe9ab7139329e7b9"
Content-Length: 29691
ETag: "0d402106016642ad338c60d037066e9d"
Content-Length: 29693
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -185,7 +185,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href>
</owner>
<resource-id>
<href>/caldav.php/.resources/10</href>
<href>/caldav.php/.resources/160</href>
</resource-id>
<resourcetype>
<collection/>
@ -324,7 +324,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/</href>
</owner>
<resource-id>
<href>/caldav.php/.resources/60</href>
<href>/caldav.php/.resources/460</href>
</resource-id>
<resourcetype>
<collection/>

View File

@ -6,9 +6,9 @@ Content-Length: 37
Content-Type: text/plain; charset="utf-8"
Destination collection does not exist
cd_collection: >10<
cd_collection: >160<
cd_user_no: >10<
ci_collection: >10<
ci_collection: >160<
ci_user_no: >10<
data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<

View File

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

View File

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

View File

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

View File

@ -6,7 +6,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
by_collection: >10<
by_collection: >160<
by_principal: >NULL<
displayname: >User 4<
privileges: >000000000000001000110001<

View File

@ -27,7 +27,7 @@ Content-Type: text/xml; charset="utf-8"
dav_owner_id: >1002<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
timeout: >01:00:00<

View File

@ -13,7 +13,7 @@ Content-Type: text/xml; charset="utf-8"
dav_owner_id: >1002<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
timeout: >01:00:00<

View File

@ -32,13 +32,13 @@ Content-Type: text/xml; charset="utf-8"
dav_owner_id: >1002<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
timeout: >01:00:00<
dav_owner_id: >1002<
privileges: >000000000001001011100111<
target_collection: >10<
target_collection: >160<
target_resource_i: >1530<
timeout: >1 day<

View File

@ -12,13 +12,13 @@
dav_owner_id: >1002<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
timeout: >01:00:00<
dav_owner_id: >1002<
privileges: >000000000001001011100111<
target_collection: >10<
target_collection: >160<
target_resource_i: >1530<
timeout: >24:00:00<

View File

@ -9,7 +9,7 @@ AUTH=user5:user5
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 10 AND target_resource_id is null;
WHERE target_collection_id = 160 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -8,7 +8,7 @@ Content-Type: text/plain; charset="utf-8"
dav_owner_id: >1002<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
timeout: >01:00:00<

View File

@ -9,7 +9,7 @@ HEAD
# Get the ticket we created earlier in 950...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 10 AND target_resource_id IS NOT NULL;
WHERE target_collection_id = 160 AND target_resource_id IS NOT NULL;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -10,7 +10,7 @@ NOAUTH
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 10 AND target_resource_id is null;
WHERE target_collection_id = 160 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -32,13 +32,13 @@ Content-Type: text/xml; charset="utf-8"
dav_owner_id: >1002<
privileges: >000000000001001000100001<
target_collection: >10<
target_collection: >160<
target_resource_i: >NULL<
timeout: >01:00:00<
dav_owner_id: >1003<
privileges: >000000000001001011100111<
target_collection: >11<
target_collection: >161<
target_resource_i: >NULL<
timeout: >NULL<

View File

@ -10,7 +10,7 @@ NOAUTH
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: Ticket Spec Tests

View File

@ -8,7 +8,7 @@ NOAUTH
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: DAViCalTester/public

View File

@ -9,7 +9,7 @@ NOAUTH
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: DAViCalTester/public

View File

@ -8,7 +8,7 @@ NOAUTH
# Get the ticket we created earlier in 948...
GETSQL=ticket
SELECT ticket_id FROM access_ticket
WHERE target_collection_id = 11 AND target_resource_id is null;
WHERE target_collection_id = 161 AND target_resource_id is null;
ENDSQL
HEADER=User-Agent: DAViCalTester/public