[CalendarServer-changes] [7222] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 7222
          http://trac.macosforge.org/projects/calendarserver/changeset/7222
Author:   cdaboo at apple.com
Date:     2011-03-18 12:14:17 -0700 (Fri, 18 Mar 2011)
Log Message:
-----------
Allow more element value testing options.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
    CalDAVTester/trunk/verifiers/xmlElementMatch.py

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml	2011-03-18 18:48:21 UTC (rev 7221)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml	2011-03-18 19:14:17 UTC (rev 7222)
@@ -119,6 +119,7 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+						<value>$verify-property-prefix:/{DAV:}sync-token[+data:,]</value>
 					</arg>
 				</verify>
 				<verify>
@@ -149,6 +150,7 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+						<value>$verify-property-prefix:/{DAV:}sync-token[+data:,]</value>
 					</arg>
 				</verify>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml	2011-03-18 18:48:21 UTC (rev 7221)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml	2011-03-18 19:14:17 UTC (rev 7222)
@@ -127,6 +127,7 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+						<value>$verify-property-prefix:/{DAV:}sync-token[+data:,]</value>
 					</arg>
 				</verify>
 				<verify>
@@ -157,6 +158,7 @@
 					<arg>
 						<name>exists</name>
 						<value>$verify-property-prefix:/{DAV:}supported-report-set/{DAV:}supported-report/{DAV:}report/{DAV:}sync-collection</value>
+						<value>$verify-property-prefix:/{DAV:}sync-token[+data:,]</value>
 					</arg>
 				</verify>
 				<verify>

Modified: CalDAVTester/trunk/verifiers/xmlElementMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/xmlElementMatch.py	2011-03-18 18:48:21 UTC (rev 7221)
+++ CalDAVTester/trunk/verifiers/xmlElementMatch.py	2011-03-18 19:14:17 UTC (rev 7222)
@@ -97,9 +97,15 @@
                             elif test[0] == '=':
                                 if node.text != test[1:]:
                                     result = "        Incorrect value returned in XML for %s\n" % (path,)
+                            elif test[0] == '!':
+                                if node.text == test[1:]:
+                                    result = "        Incorrect value returned in XML for %s\n" % (path,)
                             elif test[0] == '*':
                                 if node.text.find(test[1:]) == -1:
                                     result = "        Incorrect value returned in XML for %s\n" % (path,)
+                            elif test[0] == '+':
+                                if not node.text.startswith(test[1:]):
+                                    result = "        Incorrect value returned in XML for %s\n" % (path,)
                             return result
                         
                         testresult = _doTest()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110318/b814e6d7/attachment.html>