fix caldav tests

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
index 334fa561aecb4b7a3a5c76f1601d4cb9321b0ca4..6c15a79322687b62c725378710eb7ccd5d5c029e 100644 (file)
--- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
+++ b/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
@@ -73,7 +73,7 @@
                        <description>Shared calendar exists</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PROPFIND</method>
-                               <ruri>$calendarhome1:/shared/</ruri>
+                               <ruri>$calendarhome2:/shared_shared_by_user01/</ruri>
                                <header>
                                        <name>Depth</name>
                                        <value>0</value>
@@ -193,7 +193,7 @@
                        <description>Sharee creates event</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PUT</method>
-                               <ruri>$calendarhome1:/shared/1.ics</ruri>
+                               <ruri>$calendarhome2:/shared_shared_by_user01/1.ics</ruri>
                                <data>
                                        <content-type>text/calendar; charset=utf-8</content-type>
                                        <filepath>Resource/CalDAV/sharing/calendars/read-write/5.ics</filepath>
@@ -235,7 +235,7 @@
                        <description>Sharee sees changed event</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>GET</method>
-                               <ruri>$calendarhome1:/shared/1.ics</ruri>
+                               <ruri>$calendarhome2:/shared_shared_by_user01/1.ics</ruri>
                                <verify>
                                        <callback>calendarDataMatch</callback>
                                        <arg>
@@ -263,7 +263,7 @@
                        <description>Sharee sees new event</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>GET</method>
-                               <ruri>$calendarhome1:/shared/2.ics</ruri>
+                               <ruri>$calendarhome2:/shared_shared_by_user01/2.ics</ruri>
                                <verify>
                                        <callback>calendarDataMatch</callback>
                                        <arg>
@@ -277,7 +277,7 @@
                        <description>Sharee changes event</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PUT</method>
-                               <ruri>$calendarhome1:/shared/2.ics</ruri>
+                               <ruri>$calendarhome2:/shared_shared_by_user01/2.ics</ruri>
                                <data>
                                        <content-type>text/calendar; charset=utf-8</content-type>
                                        <filepath>Resource/CalDAV/sharing/calendars/read-write/8.ics</filepath>

diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml b/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
index 84ee62650174ab0c4ae483a2ab6f6d5fee037892..99e40f5c68cecce4862393df2ae3851cfa440341 100644 (file)
--- a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
+++ b/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
@@ -17,7 +17,7 @@
                        <description>POST invitation</description>
                        <request>
                                <method>POST</method>
-                               <ruri>$addressbookpath1:</ruri>
+                               <ruri>$addressbookhome1:/addressbook/</ruri>
                                <data>
                                        <content-type>text/xml; charset=utf-8</content-type>
                                        <filepath>Resource/CardDAV/sharing/read-write/1.xml</filepath>
@@ -31,7 +31,7 @@
                        <description>Shared addressbook exists</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PROPFIND</method>
-                               <ruri>$addressbookpath1:/</ruri>
+                               <ruri>$addressbookhome2:/addressbook_shared_by_user01/</ruri>
                                <header>
                                        <name>Depth</name>
                                        <value>0</value>
@@ -62,7 +62,7 @@
                </test>
 
                <test name='4a'>
-                       <description>Shared calendar exists Depth:1</description>
+                       <description>Shared addressbook exists Depth:1</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PROPFIND</method>
                                <ruri>$addressbookhome2:/</ruri>
@@ -100,7 +100,7 @@
                </test>
 
                <test name='5'>
-                       <description>Original calendar unchanged</description>
+                       <description>Original addressbook unchanged</description>
                        <request>
                                <method>PROPFIND</method>
                                <ruri>$addressbookpath1:</ruri>
@@ -126,7 +126,7 @@
                        <description>Sharee creates contact</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PUT</method>
-                               <ruri>$addressbookpath1:/1.vcf</ruri>
+                               <ruri>$addressbookhome2:/addressbook_shared_by_user01/1.vcf</ruri>
                                <data>
                                        <content-type>text/vcard; charset=utf-8</content-type>
                                        <filepath>Resource/CardDAV/sharing/read-write/6.vcf</filepath>
@@ -171,7 +171,7 @@
                        <description>Sharee sees changed contact</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>GET</method>
-                               <ruri>$addressbookpath1:/1.vcf</ruri>
+                               <ruri>$addressbookhome2:/addressbook_shared_by_user01/1.vcf</ruri>
                                <verify>
                                        <callback>addressDataMatch</callback>
                                        <arg>
@@ -183,7 +183,7 @@
                </test>
 
                <test name='10'>
-                       <description>Sharer creates event</description>
+                       <description>Sharer creates contact</description>
                        <request>
                                <method>PUT</method>
                                <ruri>$addressbookpath1:/2.vcf</ruri>
@@ -197,10 +197,10 @@
                        </request>
                </test>
                <test name='11'>
-                       <description>Sharee sees new event</description>
+                       <description>Sharee sees new contact</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>GET</method>
-                               <ruri>$addressbookpath1:/2.vcf</ruri>
+                               <ruri>$addressbookhome2:/addressbook_shared_by_user01/2.vcf</ruri>
                                <verify>
                                        <callback>addressDataMatch</callback>
                                        <arg>
@@ -211,10 +211,10 @@
                        </request>
                </test>
                <test name='12'>
-                       <description>Sharee changes event</description>
+                       <description>Sharee changes contact</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PUT</method>
-                               <ruri>$addressbookpath1:/2.vcf</ruri>
+                               <ruri>$addressbookhome2:/addressbook_shared_by_user01/2.vcf</ruri>
                                <data>
                                        <content-type>text/vcard; charset=utf-8</content-type>
                                        <filepath>Resource/CardDAV/sharing/read-write/9.vcf</filepath>
@@ -225,7 +225,7 @@
                        </request>
                </test>
                <test name='13'>
-                       <description>Sharer sees changed event</description>
+                       <description>Sharer sees changed contact</description>
                        <request>
                                <method>GET</method>
                                <ruri>$addressbookpath1:/2.vcf</ruri>
@@ -281,7 +281,7 @@
                                </verify>                       </request>
                </test>
                <test name='16'>
-                       <description>Shared calendar no longer exists Depth:1</description>
+                       <description>Shared addressbook no longer exists Depth:1</description>
                        <request user="$userid2:" pswd="$pswd2:">
                                <method>PROPFIND</method>
                                <ruri>$addressbookhome2:</ruri>