From baa4438c8244bc6cf1e6f2b710f975db3ff9e4f7 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 28 Jun 2010 08:38:15 +1200 Subject: [PATCH] Updated tests for various CardDAV functionality. --- .../carddav/2000-MKCOL-addressbook.result | 3 +- testing/tests/carddav/2001-PUT-fail.result | 3 +- .../tests/carddav/2002-PUT-arbitrary.result | 17 +- testing/tests/carddav/2003-PUT-vcard.result | 5 +- .../tests/carddav/2004-PUT-principal.result | 3 +- .../tests/carddav/2005-PUT-arbitrary.result | 17 +- testing/tests/carddav/2006-PUT-vcard.result | 5 +- .../tests/carddav/2007-GET-arbitrary.result | 18 +- testing/tests/carddav/2010-PROPFIND.result | 9 +- testing/tests/carddav/2011-PROPFIND.result | 26 +-- .../2012-REPORT-addressbook-multiget.result | 157 ++++++----------- testing/tests/carddav/2013-PUT-vcard.result | 5 +- testing/tests/carddav/2014-PUT-vcard.result | 5 +- testing/tests/carddav/2015-PUT-vcard.result | 69 ++++++++ testing/tests/carddav/2016-PUT-vcard.result | 43 +++++ testing/tests/carddav/2017-PUT-vcard.result | 159 ++++++++++++++++++ testing/tests/carddav/2018-PUT-vcard.result | 136 +++++++++++++++ testing/tests/carddav/2019-PUT-vcard.result | 63 +++++++ testing/tests/carddav/2020-PUT-vcard.result | 53 ++++++ .../2021-OPTIONS_well-known_carddav.result | 6 + ...2-OPTIONS_well-known_carddav_noauth.result | 6 + testing/tests/carddav/2023-PROPFIND.result | 22 +++ 22 files changed, 665 insertions(+), 165 deletions(-) create mode 100644 testing/tests/carddav/2015-PUT-vcard.result create mode 100644 testing/tests/carddav/2016-PUT-vcard.result create mode 100644 testing/tests/carddav/2017-PUT-vcard.result create mode 100644 testing/tests/carddav/2018-PUT-vcard.result create mode 100644 testing/tests/carddav/2019-PUT-vcard.result create mode 100644 testing/tests/carddav/2020-PUT-vcard.result create mode 100644 testing/tests/carddav/2021-OPTIONS_well-known_carddav.result create mode 100644 testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result create mode 100644 testing/tests/carddav/2023-PROPFIND.result diff --git a/testing/tests/carddav/2000-MKCOL-addressbook.result b/testing/tests/carddav/2000-MKCOL-addressbook.result index fd7d8a8b..28a356aa 100644 --- a/testing/tests/carddav/2000-MKCOL-addressbook.result +++ b/testing/tests/carddav/2000-MKCOL-addressbook.result @@ -1,6 +1,7 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Cache-Control: no-cache Content-Length: 0 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/carddav/2001-PUT-fail.result b/testing/tests/carddav/2001-PUT-fail.result index 3239da50..9869a3a9 100644 --- a/testing/tests/carddav/2001-PUT-fail.result +++ b/testing/tests/carddav/2001-PUT-fail.result @@ -1,6 +1,7 @@ HTTP/1.1 403 Forbidden Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Content-Length: 91 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/carddav/2002-PUT-arbitrary.result b/testing/tests/carddav/2002-PUT-arbitrary.result index 583ae504..561e00c0 100644 --- a/testing/tests/carddav/2002-PUT-arbitrary.result +++ b/testing/tests/carddav/2002-PUT-arbitrary.result @@ -1,10 +1,11 @@ -HTTP/1.1 201 Created +HTTP/1.1 412 Precondition Failed Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -Content-Length: 0 -Content-Type: text/plain; charset="utf-8" +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 178 +Content-Type: text/xml; charset="utf-8" - - dav_etag: >2ab202068a7ff020052f3d8bef7abc91< - dav_name: >/user1/addressbook/strumar_and_beren.txt< - + + + Incorrect content type for addressbook: text/plain + diff --git a/testing/tests/carddav/2003-PUT-vcard.result b/testing/tests/carddav/2003-PUT-vcard.result index 37a96692..7999f41b 100644 --- a/testing/tests/carddav/2003-PUT-vcard.result +++ b/testing/tests/carddav/2003-PUT-vcard.result @@ -2,14 +2,15 @@ HTTP/1.1 100 Continue HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Content-Length: 0 Content-Type: text/plain; charset="utf-8" caladruri: >mailto:andrew@morphoss.com< caluri: >https://dotcal.com/karora< - dav_etag: >cd185c7dd9bf18bcfcec4190442f2113< + dav_etag: >24bae2a7f81c0a79413a656c06d8326b< dav_name: >/user1/addressbook/andrew_mcmillan.vcf< fburl: >https://davical.morphoss.com/freebusy.php/andrew@morphoss.com< fn: >Andrew Watson McMillan< diff --git a/testing/tests/carddav/2004-PUT-principal.result b/testing/tests/carddav/2004-PUT-principal.result index 483ef740..40f6dea6 100644 --- a/testing/tests/carddav/2004-PUT-principal.result +++ b/testing/tests/carddav/2004-PUT-principal.result @@ -1,6 +1,7 @@ HTTP/1.1 403 Forbidden Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Content-Length: 59 Content-Type: text/plain; charset="utf-8" diff --git a/testing/tests/carddav/2005-PUT-arbitrary.result b/testing/tests/carddav/2005-PUT-arbitrary.result index 1e355e64..561e00c0 100644 --- a/testing/tests/carddav/2005-PUT-arbitrary.result +++ b/testing/tests/carddav/2005-PUT-arbitrary.result @@ -1,10 +1,11 @@ -HTTP/1.1 204 No Content +HTTP/1.1 412 Precondition Failed Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -Content-Length: 0 -Content-Type: text/plain; charset="utf-8" +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 178 +Content-Type: text/xml; charset="utf-8" - - dav_etag: >a83ff0ef143f108d2062c8534506d801< - dav_name: >/user1/addressbook/strumar_and_beren.txt< - + + + Incorrect content type for addressbook: text/plain + diff --git a/testing/tests/carddav/2006-PUT-vcard.result b/testing/tests/carddav/2006-PUT-vcard.result index 2f2e75c6..142a26f4 100644 --- a/testing/tests/carddav/2006-PUT-vcard.result +++ b/testing/tests/carddav/2006-PUT-vcard.result @@ -1,13 +1,14 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Content-Length: 0 Content-Type: text/plain; charset="utf-8" caladruri: >NULL< caluri: >NULL< - dav_etag: >593d82b1c3830ed3aaef2b8293452275< + dav_etag: >fada70a725708bce8521efb87acfa629< dav_name: >/user1/addressbook/donald_kelly.vcf< fburl: >NULL< fn: >Donald Kelly< diff --git a/testing/tests/carddav/2007-GET-arbitrary.result b/testing/tests/carddav/2007-GET-arbitrary.result index 828c467c..58076b3f 100644 --- a/testing/tests/carddav/2007-GET-arbitrary.result +++ b/testing/tests/carddav/2007-GET-arbitrary.result @@ -1,16 +1,8 @@ -HTTP/1.1 200 OK +HTTP/1.1 404 Not Found Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -Etag: "" -Content-Length: 320 +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 19 Content-Type: text/plain; charset="utf-8" -Once upon a time there was an old, old man who lived with a great -white wolf. As is often the habit with men, he had not always been -quite as old as he was now. Beren had not always been this white, -either, he thought, lying across the porch and looking out at all -the youthful energy visible in the springtime forest. - - dav_etag: >a83ff0ef143f108d2062c8534506d801< - dav_name: >/user1/addressbook/strumar_and_beren.txt< - +Resource Not Found. diff --git a/testing/tests/carddav/2010-PROPFIND.result b/testing/tests/carddav/2010-PROPFIND.result index 813a95af..5e91215a 100644 --- a/testing/tests/carddav/2010-PROPFIND.result +++ b/testing/tests/carddav/2010-PROPFIND.result @@ -1,7 +1,8 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "5693523c52feb458d900cd83d782dcc0" +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +ETag: "2f4943c1c351bb5b3509070dbd29fba8" Content-Length: 339 Content-Type: text/xml; charset="utf-8" @@ -11,12 +12,12 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/addressbook/ - "aeee1cdd38eb0169a612a8f83af55288" + "42a838808923a9df01aa11be345da1db" HTTP/1.1 200 OK - dav_etag: >aeee1cdd38eb0169a612a8f83af55288< + dav_etag: >42a838808923a9df01aa11be345da1db< diff --git a/testing/tests/carddav/2011-PROPFIND.result b/testing/tests/carddav/2011-PROPFIND.result index f14fcd36..e0a60a8b 100644 --- a/testing/tests/carddav/2011-PROPFIND.result +++ b/testing/tests/carddav/2011-PROPFIND.result @@ -1,8 +1,9 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "87c62dca0158f7c6765695ccdedfa628" -Content-Length: 1028 +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +ETag: "d65a1dbcd03e14e0d6a3102ba0f1876a" +Content-Length: 794 Content-Type: text/xml; charset="utf-8" @@ -20,20 +21,11 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 404 Not Found - - /caldav.php/user1/addressbook/strumar_and_beren.txt - - - "a83ff0ef143f108d2062c8534506d801" - - HTTP/1.1 200 OK - - /caldav.php/user1/addressbook/andrew_mcmillan.vcf - "cd185c7dd9bf18bcfcec4190442f2113" + "24bae2a7f81c0a79413a656c06d8326b" HTTP/1.1 200 OK @@ -42,16 +34,14 @@ Content-Type: text/xml; charset="utf-8" /caldav.php/user1/addressbook/donald_kelly.vcf - "593d82b1c3830ed3aaef2b8293452275" + "fada70a725708bce8521efb87acfa629" HTTP/1.1 200 OK - dav_etag: >a83ff0ef143f108d2062c8534506d801< + dav_etag: >24bae2a7f81c0a79413a656c06d8326b< - dav_etag: >cd185c7dd9bf18bcfcec4190442f2113< - - dav_etag: >593d82b1c3830ed3aaef2b8293452275< + dav_etag: >fada70a725708bce8521efb87acfa629< diff --git a/testing/tests/carddav/2012-REPORT-addressbook-multiget.result b/testing/tests/carddav/2012-REPORT-addressbook-multiget.result index a1dec685..fcfd913e 100644 --- a/testing/tests/carddav/2012-REPORT-addressbook-multiget.result +++ b/testing/tests/carddav/2012-REPORT-addressbook-multiget.result @@ -1,102 +1,53 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule -ETag: "9f618233815d1c8503830b64c28a36ae" -Content-Length: 5164 +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +ETag: "87ab9b65008470d67893424808e1c0b4" +Content-Length: 2266 Content-Type: text/xml; charset="utf-8" - - /caldav.php/user1/addressbook/strumar_and_beren.txt - - - "a83ff0ef143f108d2062c8534506d801" - - HTTP/1.1 200 OK - - - - - - HTTP/1.1 404 Not Found - - /caldav.php/user1/addressbook/andrew_mcmillan.vcf - "cd185c7dd9bf18bcfcec4190442f2113" - BEGIN:VCARD -VERSION:3.0 -REV:2010-03-29T09:23:34Z -UID:pas-id-4BB0719600000000 -X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__ -X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net -TEL;X-EVOLUTION-UI-SLOT=3;TYPE=CELL:+64 22 123 4567 -TEL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME,VOICE:+64 4 123 4567 -TEL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK,VOICE:+64 22 123 4567 -EMAIL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME:andrew@mcmillan.net.nz -EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:andrew@morphoss.com -PHOTO;BASE64;ENCODING=b;TYPE="X-EV-UNKNOWN":/9j/4AAQSkZJRgABAQEASABIAAD//gA - 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 - ug5Hqc7Lmwfc//Z -LABEL;TYPE=HOME:16 Kaka Place\nPorikana\n4173\nNew Zealand -ADR;TYPE=HOME:;;16 Kaka Place;Porikana;;4173;New Zealand -X-MOZILLA-HTML:FALSE -X-EVOLUTION-VIDEO-URL: -FBURL:https://davical.morphoss.com/freebusy.php/andrew@morphoss.com -CALADRURI:mailto:andrew@morphoss.com -CALURI:https://dotcal.com/karora -X-EVOLUTION-BLOG-URL:http://andrew.mcmillan.net.nz/ -CATEGORIES:Developer,Personal,Debian, -X-EVOLUTION-FILE-AS:McMillan\, Andrew -N:McMillan;Andrew;Watson;; -FN:Andrew Watson McMillan -NOTE:Primary author of DAViCal CalDAV Server. -X-EVOLUTION-SPOUSE:Heather Buchanan -X-EVOLUTION-ANNIVERSARY:1989-04-22 -BDAY:1958-07-26 -NICKNAME:karora -X-EVOLUTION-ASSISTANT: -X-EVOLUTION-MANAGER: -ROLE:Geek -ORG:dotCal;;Porirua -TITLE:Chief Technology Officer -URL:http://andrew.mcmillan.net.nz/ -END:VCARD + "24bae2a7f81c0a79413a656c06d8326b" + BEGIN:VCARD +VERSION:3.0 +REV:2010-03-29T09:23:34Z +UID:pas-id-4BB0719600000000 +X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__ +X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net +TEL;X-EVOLUTION-UI-SLOT=3;TYPE=CELL:+64 22 123 4567 +TEL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME,VOICE:+64 4 123 4567 +TEL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK,VOICE:+64 22 123 4567 +EMAIL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME:andrew@mcmillan.net.nz +EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:andrew@morphoss.com +LABEL;TYPE=HOME:16 Kaka Place\nPorikana\n4173\nNew Zealand +ADR;TYPE=HOME:;;16 Kaka Place;Porikana;;4173;New Zealand +X-MOZILLA-HTML:FALSE +X-EVOLUTION-VIDEO-URL: +FBURL:https://davical.morphoss.com/freebusy.php/andrew@morphoss.com +CALADRURI:mailto:andrew@morphoss.com +CALURI:https://dotcal.com/karora +X-EVOLUTION-BLOG-URL:http://andrew.mcmillan.net.nz/ +CATEGORIES:Developer,Personal,Debian, +X-EVOLUTION-FILE-AS:McMillan\, Andrew +N:McMillan;Andrew;Watson;; +FN:Andrew Watson McMillan +NOTE:Primary author of DAViCal CalDAV Server. +X-EVOLUTION-SPOUSE:Heather Buchanan +X-EVOLUTION-ANNIVERSARY:1989-04-22 +BDAY:1958-07-26 +NICKNAME:karora +X-EVOLUTION-ASSISTANT: +X-EVOLUTION-MANAGER: +ROLE:Geek +ORG:dotCal;;Porirua +TITLE:Chief Technology Officer +URL:http://andrew.mcmillan.net.nz/ +END:VCARD HTTP/1.1 200 OK @@ -106,20 +57,20 @@ END:VCARD /caldav.php/user1/addressbook/donald_kelly.vcf - "593d82b1c3830ed3aaef2b8293452275" - begin:vcard -fn:Donald Kelly -n:Kelly;Donald;;; -org:Esposo Designs Ltd -adr:;;25 Rintoul St;Newtown;Wellington;;New Zealand -email;type=internet:donald@example.co.nz -title:Proprietor -tel;type=work:+64 4 347 4747 -tel;type=cell:+64 2 1234-4321 -x-mozilla-html:TRUE -url:www.example.co.nz -version:2.1 -end:vcard + "fada70a725708bce8521efb87acfa629" + begin:vcard +fn:Donald Kelly +n:Kelly;Donald;;; +org:Esposo Designs Ltd +adr:;;25 Rintoul St;Newtown;Wellington;;New Zealand +email;type=internet:donald@example.co.nz +title:Proprietor +tel;type=work:+64 4 347 4747 +tel;type=cell:+64 2 1234-4321 +x-mozilla-html:TRUE +url:www.example.co.nz +version:2.1 +end:vcard HTTP/1.1 200 OK diff --git a/testing/tests/carddav/2013-PUT-vcard.result b/testing/tests/carddav/2013-PUT-vcard.result index 242c1f65..debc0931 100644 --- a/testing/tests/carddav/2013-PUT-vcard.result +++ b/testing/tests/carddav/2013-PUT-vcard.result @@ -1,13 +1,14 @@ HTTP/1.1 201 Created Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Content-Length: 0 Content-Type: text/plain; charset="utf-8" caladruri: >NULL< caluri: >NULL< - dav_etag: >1e88f301c87218b715a3d4be81a14337< + dav_etag: >3419498c6e5eae71dc1704f1787faf1c< dav_name: >/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf< fburl: >NULL< fn: >Morphoss Ltd< diff --git a/testing/tests/carddav/2014-PUT-vcard.result b/testing/tests/carddav/2014-PUT-vcard.result index 3541a2b0..bf79db96 100644 --- a/testing/tests/carddav/2014-PUT-vcard.result +++ b/testing/tests/carddav/2014-PUT-vcard.result @@ -2,14 +2,15 @@ HTTP/1.1 100 Continue HTTP/1.1 204 No Content Date: Dow, 01 Jan 2000 00:00:00 GMT -DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule Content-Length: 0 Content-Type: text/plain; charset="utf-8" caladruri: >NULL< caluri: >NULL< - dav_etag: >1c9f5623adf814e4f7a88367c54b06d3< + dav_etag: >0ea4d7759e103090c6494505b5da0f11< dav_name: >/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf< fburl: >NULL< fn: >Morphoss Ltd< diff --git a/testing/tests/carddav/2015-PUT-vcard.result b/testing/tests/carddav/2015-PUT-vcard.result new file mode 100644 index 00000000..fbf57725 --- /dev/null +++ b/testing/tests/carddav/2015-PUT-vcard.result @@ -0,0 +1,69 @@ +HTTP/1.1 200 OK +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 381 +Content-Type: text/html + + +Notice: Undefined offset: 6 in /home/andrew/projects/davical/inc/vcard.php on line 101 + +Notice: Undefined offset: 6 in /home/andrew/projects/davical/inc/vcard.php on line 101 + +Warning: Cannot modify header information - headers already sent by (output started at /home/andrew/projects/davical/inc/vcard.php:101) in /home/andrew/projects/davical/inc/CalDAVRequest.php on line 1151 + + caladruri: >NULL< + caluri: >NULL< + dav_etag: >d43780719361367f2d690f1f966e3da1< + dav_name: >/user1/addressbook/van_houtte.vcf< + fburl: >NULL< + fn: >Vincent VAN HOUTTE< + n: >VAN HOUTTE;Vincent;;Dhr.;< + nickname: >NULL< + note: >NULL< + org: >Advocatenkantoor Suy, Van Baeveghem & Van Houtte;;< + uid: >NULL< + url: >NULL< + version: >3.0< + + box_no: >< + country: >NULL< + locality: >DENDERMONDE< + postcode: >B-9200< + property: >ADR;TYPE=HOME:;;Brusselsestraat 108;DENDERMONDE;;B-9200< + region: >< + street_address: >Brusselsestraat 108< + type: >HOME< + unit_no: >< + + box_no: >< + country: >NULL< + locality: >DENDERMONDE< + postcode: >B-9200< + property: >ADR;TYPE=WORK:;;Brusselsestraat 108;DENDERMONDE;;B-9200< + region: >< + street_address: >Brusselsestraat 108< + type: >WORK< + unit_no: >< + + tel: >0486 11 22 33< + type: >CELL,VOICE< + + tel: >052 44 55 66< + type: >HOME,FAX< + + tel: >052 11 22 33< + type: >HOME,VOICE< + + tel: >052 44 55 66< + type: >WORK,FAX< + + tel: >052 11 22 33< + type: >WORK,VOICE< + + email: >vvh@gmail.no< + type: >HOME< + + email: >vvh@gmail.no< + type: >WORK< + diff --git a/testing/tests/carddav/2016-PUT-vcard.result b/testing/tests/carddav/2016-PUT-vcard.result new file mode 100644 index 00000000..1e2a67cc --- /dev/null +++ b/testing/tests/carddav/2016-PUT-vcard.result @@ -0,0 +1,43 @@ +HTTP/1.1 100 Continue + +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + caladruri: >NULL< + caluri: >NULL< + dav_etag: >e67537e9d473e93911eccd6e63e9ac3a< + dav_name: >/user1/addressbook/mustrmahn.vcf< + fburl: >NULL< + fn: >Überwerbung GmbH< + n: >Mustermann;Anton;Karl;Dr.;< + nickname: >Boss< + note: >Test vCard< + org: >Überwerbung GmbH;Marketing< + uid: >NULL< + url: >NULL< + version: >3.0< + + box_no: >NULL< + country: >NULL< + locality: >NULL< + postcode: >NULL< + property: >NULL< + region: >NULL< + street_address: >NULL< + type: >NULL< + unit_no: >NULL< + + tel: >+49 172 1234567< + type: >CELL< + + tel: >+49 30 1234567< + type: >pref< + + email: >karl@mustermann.de< + type: >pref< + diff --git a/testing/tests/carddav/2017-PUT-vcard.result b/testing/tests/carddav/2017-PUT-vcard.result new file mode 100644 index 00000000..892611b7 --- /dev/null +++ b/testing/tests/carddav/2017-PUT-vcard.result @@ -0,0 +1,159 @@ +HTTP/1.1 100 Continue + +HTTP/1.1 200 OK +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 381 +Content-Type: text/html + + +Notice: Undefined offset: 6 in /home/andrew/projects/davical/inc/vcard.php on line 101 + +Notice: Undefined offset: 6 in /home/andrew/projects/davical/inc/vcard.php on line 101 + +Warning: Cannot modify header information - headers already sent by (output started at /home/andrew/projects/davical/inc/vcard.php:101) in /home/andrew/projects/davical/inc/CalDAVRequest.php on line 1151 + + caladruri: >http://caldav.andresen.local/access< + caluri: >http://caldav.andresen.local/sja< + dav_etag: >f6ae02ec1b5612fe4737092734d062c7< + dav_name: >/user1/addressbook/andresenesq.vcf< + fburl: >http://caldav.andresen.local/freebusy< + fn: >Sven Joseph Klaus Michael Andresen, Esq.< + n: >Andresen,Esq.;Sven;Joseph,Klaus,Michael;;Dr.,Prof.;Esq.< + nickname: >Svenny,Sveny< + note: >Nur so ein Test!< + org: >andresen AG;R&D;;XXX, 033< + uid: >uid=andresenesq.1209158007,ou=Contacts,dc=andresen,dc=de< + url: >http://www.andresen.de< + version: >4.0< + + box_no: >< + country: >NULL< + locality: >Irgendwo< + postcode: >34332< + property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisenstraße 13\r;Irgendwo;;34332< + region: >< + street_address: >Weisenstraße 13\r< + type: >HOME< + unit_no: >< + + box_no: >6266 AA< + country: >NULL< + locality: >Irgendwo< + postcode: >34332< + property: >ADR;TYPE=WORK;CHARSET=utf-8:6266 AA\;andresen Holding\, + Geschäftsleitung\;Weisenstraße 13\;Irgendwo\;Niedersachsen\;34332< + region: >Niedersachsen< + street_address: >Weisenstraße 13< + type: >WORK< + unit_no: >andresen Holding, Geschäftsleitung< + + box_no: >PO 373< + country: >Deutschland< + locality: >Passau< + postcode: >94036< + property: >ADR;TYPE=WORK;CHARSET=utf-8:PO 373\;Andresen AG\, R&D\;Messegasse + 7\;Passau\;Bayern\;94036\;Deutschland< + region: >Bayern< + street_address: >Messegasse 7< + type: >WORK< + unit_no: >Andresen AG, R&D< + + box_no: >< + country: >Antarktis< + locality: >Nirgendwo< + postcode: >0< + property: >ADR;TYPE=X-OTHER:;;Irgendwo;Nirgendwo;Sonstwo;0000;Antarktis< + region: >Sonstwo< + street_address: >Irgendwo< + type: >X-OTHER< + unit_no: >< + + tel: >+49 8292 38 383< + type: >CAR,VOICE< + + tel: >+49 39292 82< + type: >CELL,VOICE< + + tel: >+49 7272 722< + type: >CELL,VOICE< + + tel: >+49 1010 1< + type: >HOME,FAX< + + tel: >+49 7272 7282< + type: >HOME,VOICE< + + tel: >+49 7327 272 727< + type: >HOME,VOICE< + + tel: >8797< + type: >ISDN< + + tel: >98732947234< + type: >ISDN< + + tel: >+49 6237 623 723 84 76< + type: >MAIN< + + tel: >+49 9324 32 479 234234< + type: >MAIN< + + tel: >+49 7363 6363< + type: >MODEM< + + tel: >+49 8383 73 723< + type: >MODEM< + + tel: >+49 160 073 727 272< + type: >PAGER< + + tel: >+49 2626 26< + type: >PAGER< + + tel: >+49 12 34 567< + type: >PREF,VOICE< + + tel: >+49 7373 73< + type: >WORK,FAX< + + tel: >+49 234 222 222< + type: >WORK,VOICE< + + tel: >+49 89 11 11 111< + type: >WORK,VOICE< + + tel: >+49 88 298 723 498 32< + type: >X-EVOLUTION-RADIO< + + tel: >+49 9872 394 872 34< + type: >X-EVOLUTION-RADIO< + + tel: >+49 2763 382 882 28 82< + type: >X-EVOLUTION-TELEX< + + tel: >+49 7722 88 28 282< + type: >X-EVOLUTION-TELEX< + + tel: >+49 7363 6363< + type: >voice< + + tel: >+49 8383 73 723< + type: >voice< + + tel: >+49 3377 37 373< + type: >voice< + + tel: >+49 8378 33< + type: >voice< + + tel: >13355< + type: >voice< + + email: >andresen@andresen.de< + type: >INTERNET< + + email: >sven@andresen.de< + type: >INTERNET< + diff --git a/testing/tests/carddav/2018-PUT-vcard.result b/testing/tests/carddav/2018-PUT-vcard.result new file mode 100644 index 00000000..5a3843f1 --- /dev/null +++ b/testing/tests/carddav/2018-PUT-vcard.result @@ -0,0 +1,136 @@ +HTTP/1.1 100 Continue + +HTTP/1.1 200 OK +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 643 +Content-Type: text/html + + +Notice: Undefined offset: 6 in /home/andrew/projects/davical/inc/vcard.php on line 101 + +Notice: Undefined offset: 3 in /home/andrew/projects/davical/inc/vcard.php on line 98 + +Notice: Undefined offset: 4 in /home/andrew/projects/davical/inc/vcard.php on line 99 + +Notice: Undefined offset: 5 in /home/andrew/projects/davical/inc/vcard.php on line 100 + +Notice: Undefined offset: 6 in /home/andrew/projects/davical/inc/vcard.php on line 101 + +Warning: Cannot modify header information - headers already sent by (output started at /home/andrew/projects/davical/inc/vcard.php:101) in /home/andrew/projects/davical/inc/CalDAVRequest.php on line 1151 + + caladruri: >http://davical.hadi-schmist.home/access< + caluri: >http://davical.hadi-schmist.home/hadi< + dav_etag: >db3e92c0ae37268c647949367e2030cc< + dav_name: >/user1/addressbook/hans_dieter.vcf< + fburl: >http://davical.hadi-schmist.home/freebusy< + fn: >Hans Dieter Schmidt< + n: >Schmidt;Hans Dieter;;Dr.;Esq.< + nickname: >HaWe< + note: >NULL< + org: >Uni Harburg;;;033< + uid: >uid=schmidt.1208717693,ou=Contacts,dc=andresen,dc=de< + url: >http://www.tu-hh.de< + version: >4.0< + + box_no: >< + country: >NULL< + locality: >Irgendwo< + postcode: >33443< + property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisestraße 13\r;Irgendwo;;33443< + region: >< + street_address: >Weisestraße 13\r< + type: >HOME< + unit_no: >< + + box_no: >< + country: >Deutschland< + locality: >Hamburg-Harburg< + postcode: >21373< + property: >ADR;TYPE=WORK;CHARSET=utf-8:\;Uni Harburg\, -\;Innstraße + 71\;Hamburg-Harburg\;Hamburg\;21373\;Deutschland< + region: >Hamburg< + street_address: >Innstraße 71< + type: >WORK< + unit_no: >Uni Harburg, -< + + box_no: >< + country: >NULL< + locality: >NULL< + postcode: >NULL< + property: >ADR;TYPE=X-OTHER:;;Nirgendwo< + region: >NULL< + street_address: >Nirgendwo< + type: >X-OTHER< + unit_no: >< + + tel: >+49 8292 38 383< + type: >CAR,VOICE< + + tel: >+49 7272 722< + type: >CELL,VOICE< + + tel: >+49 40 812 387 21< + type: >HOME,FAX< + + tel: >+49 7327 272 727< + type: >HOME,VOICE< + + tel: >4234234235< + type: >ISDN< + + tel: >98732947234< + type: >ISDN< + + tel: >+49 6237 623 723 84 76< + type: >MAIN< + + tel: >+49 9324 32 479 234234< + type: >MAIN< + + tel: >+49 8383 73 723< + type: >MODEM< + + tel: >+49 2626 26< + type: >PAGER< + + tel: >+49 12 34 567< + type: >PREF,VOICE< + + tel: >+49 7373 73< + type: >WORK,FAX< + + tel: >+49 234 234 234< + type: >WORK,VOICE< + + tel: >+49 9823 9084< + type: >WORK,VOICE< + + tel: >+49 9872 349 832< + type: >X-EVOLUTION-RADIO< + + tel: >+49 9872 394 872 34< + type: >X-EVOLUTION-RADIO< + + tel: >+49 38 288 228 82< + type: >X-EVOLUTION-TELEX< + + tel: >+49 7722 88 28 282< + type: >X-EVOLUTION-TELEX< + + tel: >+49 8383 73 723< + type: >voice< + + tel: >+49 7373 73< + type: >voice< + + tel: >+49 8378 33< + type: >voice< + + email: >hadi@telekom-d.de< + type: >INTERNET< + + email: >ich@hadi-schmidt.de< + type: >INTERNET< + diff --git a/testing/tests/carddav/2019-PUT-vcard.result b/testing/tests/carddav/2019-PUT-vcard.result new file mode 100644 index 00000000..9e2ba352 --- /dev/null +++ b/testing/tests/carddav/2019-PUT-vcard.result @@ -0,0 +1,63 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + caladruri: >NULL< + caluri: >NULL< + dav_etag: >feaa1a28c9942fc56403e2f97f75171b< + dav_name: >/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf< + fburl: >NULL< + fn: >Jörg Test-Roßdeutscher< + n: >Test-Roßdeutscher;Jörg;;;< + nickname: >NULL< + note: >Technik, Web, DTP, SysAdmin, €-Vermögensverwalter< + org: >Factor Design AG;< + uid: >NULL< + url: >www.gesindel.baz< + version: >2.1< + + box_no: >< + country: >Deutschland< + locality: >Hamburg< + postcode: >22761< + property: >ADR;HOME:;;Gayens Weg 9;Hamburg;;22761;Deutschland< + region: >< + street_address: >Gayens Weg 9< + type: >NULL< + unit_no: >< + + box_no: >< + country: >Deutschland< + locality: >Hamburg< + postcode: >20357< + property: >ADR;WORK;CHARSET=UTF-8:;;abcStraße 58;Hamburg;;20357;Deutschland< + region: >< + street_address: >abcStraße 58< + type: >NULL< + unit_no: >< + + tel: >17799999978200< + type: >voice< + + tel: >40999999793017< + type: >voice< + + tel: >040 999999432571-43< + type: >voice< + + email: >joerg.rossdeutscher@gesindel.foo< + type: >NULL< + + email: >raettchen@gmail.bar< + type: >NULL< + + email: >joerg@factordesign.foo< + type: >NULL< + + email: >joerg.rossdeutscher@factordesign.foo< + type: >NULL< + diff --git a/testing/tests/carddav/2020-PUT-vcard.result b/testing/tests/carddav/2020-PUT-vcard.result new file mode 100644 index 00000000..21da431f --- /dev/null +++ b/testing/tests/carddav/2020-PUT-vcard.result @@ -0,0 +1,53 @@ +HTTP/1.1 201 Created +Date: Dow, 01 Jan 2000 00:00:00 GMT +DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule +DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" + + + caladruri: >NULL< + caluri: >NULL< + dav_etag: >5a32961b9938a7d6a354a757a8a1ea36< + dav_name: >/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf< + fburl: >NULL< + fn: >Jörg Test-Roßdeutscher< + n: >Test-Roßdeutscher;Jörg;;;< + nickname: >NULL< + note: >Technik, Web, DTP, SysAdmin, €-Vermögensverwalter< + org: >Factor Design AG;< + uid: >NULL< + url: >NULL< + version: >3.0< + + box_no: >NULL< + country: >NULL< + locality: >NULL< + postcode: >NULL< + property: >NULL< + region: >NULL< + street_address: >NULL< + type: >NULL< + unit_no: >NULL< + + tel: >17799999978200< + type: >CELL< + + tel: >40999999793017< + type: >HOME< + + tel: >040 999999432571-43< + type: >pref< + + email: >joerg.rossdeutscher@gesindel.foo< + type: >HOME< + + email: >raettchen@gmail.bar< + type: >HOME< + + email: >joerg@factordesign.foo< + type: >WORK< + + email: >joerg.rossdeutscher@factordesign.foo< + type: >pref< + diff --git a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result new file mode 100644 index 00000000..31909d7d --- /dev/null +++ b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.result @@ -0,0 +1,6 @@ +HTTP/1.1 302 Found +Date: Dow, 01 Jan 2000 00:00:00 GMT +Location: /caldav.php/ +Content-Length: 0 +Content-Type: text/html + diff --git a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result new file mode 100644 index 00000000..31909d7d --- /dev/null +++ b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.result @@ -0,0 +1,6 @@ +HTTP/1.1 302 Found +Date: Dow, 01 Jan 2000 00:00:00 GMT +Location: /caldav.php/ +Content-Length: 0 +Content-Type: text/html + diff --git a/testing/tests/carddav/2023-PROPFIND.result b/testing/tests/carddav/2023-PROPFIND.result new file mode 100644 index 00000000..dd8fc62a --- /dev/null +++ b/testing/tests/carddav/2023-PROPFIND.result @@ -0,0 +1,22 @@ +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, calendar-proxy, bind, addressbook, calendar-auto-schedule +ETag: "7656abee424b0f6763c3851c78613769" +Content-Length: 362 +Content-Type: text/xml; charset="utf-8" + + + + + /caldav.php/user1/ + + + + /caldav.php/user1/ + + + HTTP/1.1 200 OK + + +