From ec234cda640d085eb1e873096c125c30e17bb3a9 Mon Sep 17 00:00:00 2001
From: Florian Schlichting <fsfs@debian.org>
Date: Thu, 4 Feb 2021 22:28:15 +0800
Subject: [PATCH] correct test results after AWL merges of
 mstilkerich/awl-fix_abookquery_paramnotdef and
 mstilkerich/awl-fix_support_anyof_propfilter

---
 ...T-carddavclient-ParamNotDefinedSome.result | 24 +---------
 ...REPORT-carddavclient-HasEmailAndIMP.result | 43 -----------------
 ...-carddavclient-TwoEmailConditionsOr.result | 46 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 67 deletions(-)

diff --git a/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result b/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result
index 07e5e293..28dabef6 100644
--- a/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result
+++ b/testing/tests/carddav/2051-REPORT-carddavclient-ParamNotDefinedSome.result
@@ -1,24 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
- <response>
-  <href>/caldav.php/user5/addresses/sabre-vobject-41956788-1273-449e-bfb7-716850c91ec6.vcf</href>
-  <propstat>
-   <prop>
-    <getetag>some valid etag</getetag>
-    <VC:address-data>BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 4.3.3//EN
-UID:sabre-vobject-41956788-1273-449e-bfb7-716850c91ec6
-FN:CardDavClient Test879489908
-N:Test879489908;CardDavClient;;;
-NICKNAME:Jonny2
-TEL;TYPE=HOME:12345
-TEL:555
-REV:date
-END:VCARD
-</VC:address-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
-</multistatus>
+<multistatus xmlns="DAV:"/>
diff --git a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result
index 772afcc8..6c0b17e8 100644
--- a/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result
+++ b/testing/tests/carddav/2052-REPORT-carddavclient-HasEmailAndIMP.result
@@ -1,48 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
- <response>
-  <href>/caldav.php/user5/addresses/sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13.vcf</href>
-  <propstat>
-   <prop>
-    <getetag>some valid etag</getetag>
-    <VC:address-data>BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 4.3.3//EN
-UID:sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13
-FN:CardDavClient Test212420682
-N:Test212420682;CardDavClient;;;
-NICKNAME:Jonny0
-EMAIL;TYPE=HOME:john6doe@example.com
-EMAIL;TYPE=WORK:doe6@example.com
-X-CUSTOMPROP;X-CUSTOMPARAM=WORK:foobar
-REV:date
-END:VCARD
-</VC:address-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user5/addresses/sabre-vobject-8121cd7a-8251-4b74-a952-ca91fdc21e36.vcf</href>
-  <propstat>
-   <prop>
-    <getetag>some valid etag</getetag>
-    <VC:address-data>BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 4.3.3//EN
-UID:sabre-vobject-8121cd7a-8251-4b74-a952-ca91fdc21e36
-FN:CardDavClient Test913043917
-N:Test913043917;CardDavClient;;;
-NICKNAME:Jonny1
-EMAIL:maxmu@abcd.com
-X-CUSTOMPROP;X-CUSTOMPARAM=HOME,WORK:foobar
-REV:date
-END:VCARD
-</VC:address-data>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>/caldav.php/user5/addresses/sabre-vobject-34cd55a8-330f-47cd-8b69-6fbd16a0880b.vcf</href>
   <propstat>
diff --git a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result
index 28dabef6..5b808e6f 100644
--- a/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result
+++ b/testing/tests/carddav/2053-REPORT-carddavclient-TwoEmailConditionsOr.result
@@ -1,2 +1,46 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:"/>
+<multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
+ <response>
+  <href>/caldav.php/user5/addresses/sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:4.0
+PRODID:-//Sabre//Sabre VObject 4.3.3//EN
+UID:sabre-vobject-131cdf91-5460-423b-a836-e420e5affe13
+FN:CardDavClient Test212420682
+N:Test212420682;CardDavClient;;;
+NICKNAME:Jonny0
+EMAIL;TYPE=HOME:john6doe@example.com
+EMAIL;TYPE=WORK:doe6@example.com
+X-CUSTOMPROP;X-CUSTOMPARAM=WORK:foobar
+REV:date
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user5/addresses/sabre-vobject-8121cd7a-8251-4b74-a952-ca91fdc21e36.vcf</href>
+  <propstat>
+   <prop>
+    <getetag>some valid etag</getetag>
+    <VC:address-data>BEGIN:VCARD
+VERSION:4.0
+PRODID:-//Sabre//Sabre VObject 4.3.3//EN
+UID:sabre-vobject-8121cd7a-8251-4b74-a952-ca91fdc21e36
+FN:CardDavClient Test913043917
+N:Test913043917;CardDavClient;;;
+NICKNAME:Jonny1
+EMAIL:maxmu@abcd.com
+X-CUSTOMPROP;X-CUSTOMPARAM=HOME,WORK:foobar
+REV:date
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>