Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Commit

Permalink
Improve testing of xml elements by using xmlElementMatch.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@12050 e27351fd-9f3e-4f54-a53b-843176b1656c
  • Loading branch information
@cyrusdaboo
cyrusdaboo committed Dec 11, 2013
1 parent 4a2fb90 commit 98134da
Showing 1 changed file with 89 additions and 97 deletions.
186 changes: 89 additions & 97 deletions scripts/tests/CalDAV/calendaruserproxy.xml
View file
Expand Up @@ -148,11 +148,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -171,11 +171,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -223,11 +223,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri2:</D:href>]]></value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -246,11 +246,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -269,11 +269,10 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value><![CDATA[{DAV:}group-membership$<D:href xmlns:D="DAV:">$principaluri1:calendar-proxy-read/</D:href>]]></value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$principaluri1:calendar-proxy-read/]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -339,11 +338,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -362,11 +361,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -385,11 +384,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -437,11 +436,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri2:</D:href>]]></value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -460,11 +459,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -483,11 +482,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value><![CDATA[{DAV:}group-membership$<D:href xmlns:D="DAV:">$principaluri1:calendar-proxy-write/</D:href>]]></value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[$principaluri1:calendar-proxy-write/]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -581,11 +580,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -604,11 +603,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -627,11 +626,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set$</value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -700,11 +699,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri1:</D:href>]]></value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[$principaluri1:]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -723,10 +722,10 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>dataString</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>contains</name>
<value>&lt;href&gt;$rprincipaluri1:calendar-proxy-write/&lt;/href&gt;</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[$rprincipaluri1:calendar-proxy-write/]</value>
</arg>
</verify>
</request>
Expand All @@ -745,11 +744,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value><![CDATA[{DAV:}group-member-set$<D:href xmlns:D="DAV:">$principaluri3:</D:href>]]></value>
<value>{DAV:}group-membership$</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri3:]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand All @@ -768,10 +767,10 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>dataString</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>contains</name>
<value>&lt;href&gt;$rprincipaluri1:calendar-proxy-read/&lt;/href&gt;</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-membership/{DAV:}href[=$rprincipaluri1:calendar-proxy-read/]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -808,19 +807,12 @@
<filepath>Resource/CalDAV/calendaruserproxy/2.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
<value>{DAV:}group-member-set</value>
<value>{DAV:}group-membership$</value>
</arg>
</verify>
<verify>
<callback>dataString</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>contains</name>
<value>&lt;href&gt;$principaluri2:&lt;/href&gt;</value>
<value>&lt;href&gt;$principaluri3:&lt;/href&gt;</value>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri2:]</value>
<value>$verify-property-prefix:/{DAV:}group-member-set/{DAV:}href[=$principaluri3:]</value>
<value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -873,7 +865,7 @@
<description>Default setup</description>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$principal1:/</ruri>
<ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
Expand All @@ -883,11 +875,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/10.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{http://calendarserver.org/ns/}calendar-proxy-read-for$</value>
<value>{http://calendarserver.org/ns/}calendar-proxy-write-for$</value>
<name>exists</name>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for[|]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[|]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -926,7 +918,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$principal1:/</ruri>
<ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
Expand All @@ -936,11 +928,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/10.xml</filepath>
</data>
<verify>
<callback>propfindValues</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value><![CDATA[{http://calendarserver.org/ns/}calendar-proxy-read-for$<D:href xmlns:D="DAV:">$principaluri2:</D:href>]]></value>
<value><![CDATA[{http://calendarserver.org/ns/}calendar-proxy-write-for$<D:href xmlns:D="DAV:">$principaluri3:</D:href>]]></value>
<name>exists</name>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for/{DAV:}href[=$principaluri2:]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for/{DAV:}href[=$principaluri3:]</value>
</arg>
</verify>
</request>
Expand Down Expand Up @@ -979,7 +971,7 @@
</request>
<request print-response="no">
<method>PROPFIND</method>
<ruri>$principal1:/</ruri>
<ruri>$principal1:</ruri>
<header>
<name>Depth</name>
<value>0</value>
Expand All @@ -989,11 +981,11 @@
<filepath>Resource/CalDAV/calendaruserproxy/10.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
<callback>xmlElementMatch</callback>
<arg>
<name>okprops</name>
<value>{http://calendarserver.org/ns/}calendar-proxy-read-for$</value>
<value>{http://calendarserver.org/ns/}calendar-proxy-write-for$</value>
<name>exists</name>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for[|]</value>
<value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[|]</value>
</arg>
</verify>
</request>
Expand Down

0 comments on commit 98134da

Please sign in to comment.