<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14033] CalDAVTester/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14033">14033</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-10-01 03:18:32 -0700 (Wed, 01 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes for previous XML match changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkREADMEtxt">CalDAVTester/trunk/README.txt</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVcalendaruserproxyxml">CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml</a></li>
<li><a href="#CalDAVTestertrunkverifiersxmlElementMatchpy">CalDAVTester/trunk/verifiers/xmlElementMatch.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkREADMEtxt"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/README.txt (14032 => 14033)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/README.txt 2014-09-30 16:48:38 UTC (rev 14032)
+++ CalDAVTester/trunk/README.txt 2014-10-01 10:18:32 UTC (rev 14033)
</span><span class="lines">@@ -827,6 +827,7 @@
</span><span class="cx"> [^tag] - node has child element "tag".
</span><span class="cx"> [^tag=text] - node has child element "tag" with text "text".
</span><span class="cx"> [|] - node is empty.
</span><ins>+ [||] - node is not empty.
</ins><span class="cx"> [json] - node contains valid JSON data.
</span><span class="cx"> [icalendar] - node contains valid iCalendare data.
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVcalendaruserproxyxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml (14032 => 14033)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2014-09-30 16:48:38 UTC (rev 14032)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml 2014-10-01 10:18:32 UTC (rev 14033)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> <test-suite name='Group membership'>
</span><span class="cx"> <test name='1'>
</span><del>- <description>Verify no group memberships right now</description>
</del><ins>+ <description>Verify some group memberships right now</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
</span><del>- <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{DAV:}group-membership[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5'>
</span><del>- <description>Verify no group memberships right now</description>
</del><ins>+ <description>Verify some group memberships right now</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
</span><del>- <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{DAV:}group-membership[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='10'>
</span><del>- <description>Verify no group memberships right now</description>
</del><ins>+ <description>Verify some group memberships right now</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
</span><del>- <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{DAV:}group-membership[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='14'>
</span><del>- <description>Verify no group memberships right now</description>
</del><ins>+ <description>Verify some group memberships right now</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
</span><del>- <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{DAV:}group-membership[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='21'>
</span><del>- <description>Verify no group memberships right now</description>
</del><ins>+ <description>Verify some group memberships right now</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$principal1:</ruri>
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{DAV:}group-member-set[|]</value>
</span><del>- <value>$verify-property-prefix:/{DAV:}group-membership[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{DAV:}group-membership[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for[|]</value>
</span><del>- <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -985,7 +985,7 @@
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-read-for[|]</value>
</span><del>- <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[|]</value>
</del><ins>+ <value>$verify-property-prefix:/{http://calendarserver.org/ns/}calendar-proxy-write-for[||]</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersxmlElementMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/xmlElementMatch.py (14032 => 14033)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/xmlElementMatch.py 2014-09-30 16:48:38 UTC (rev 14032)
+++ CalDAVTester/trunk/verifiers/xmlElementMatch.py 2014-10-01 10:18:32 UTC (rev 14033)
</span><span class="lines">@@ -111,42 +111,9 @@
</span><span class="cx"> tests = [item[:-1] for item in tests.split('[')]
</span><span class="cx"> for test in tests:
</span><span class="cx"> for node in nodes:
</span><del>- if test[0] == '@':
- if '=' in test:
- attr, value = test[1:].split('=')
- value = value[1:-1]
- else:
- attr = test[1:]
- value = None
- if attr in node.keys() and (value is None or node.get(attr) == value):
- results.append(node)
- elif test[0] == '=':
- if node.text == test[1:]:
- results.append(node)
- elif test[0] == '!':
- if node.text != test[1:]:
- results.append(node)
- elif test[0] == '*':
- if node.text is not None and node.text.find(test[1:]) != -1:
- results.append(node)
- elif test[0] == '$':
- if node.text is not None and node.text.find(test[1:]) == -1:
- results.append(node)
- elif test[0] == '+':
- if node.text is not None and node.text.startswith(test[1:]):
- results.append(node)
- elif test[0] == '^':
- if "=" in test:
- element, value = test[1:].split("=", 1)
- else:
- element = test[1:]
- value = None
- for child in node.getchildren():
- if child.tag == element and (value is None or child.text == value):
- results.append(node)
- elif test[0] == '|':
- if node.text is None and len(node.getchildren()) == 0:
- results.append(node)
</del><ins>+ testresult = self.testNode(node, path, test)
+ if testresult is None:
+ results.append(node)
</ins><span class="cx"> else:
</span><span class="cx"> results = nodes
</span><span class="cx">
</span><span class="lines">@@ -193,6 +160,13 @@
</span><span class="cx"> break
</span><span class="cx"> else:
</span><span class="cx"> result = " Missing child returned in XML for %s\n" % (node_path,)
</span><ins>+ elif test[0] == '|':
+ if len(test) == 2 and test[1] == "|":
+ if node.text is None and len(node.getchildren()) == 0:
+ result = " Empty element returned in XML for %s\n" % (node_path,)
+ else:
+ if node.text is not None or len(node.getchildren()) != 0:
+ result = " Non-empty element returned in XML for %s\n" % (node_path,)
</ins><span class="cx">
</span><span class="cx"> # Try to parse as iCalendar
</span><span class="cx"> elif test == 'icalendar':
</span><span class="lines">@@ -234,11 +208,11 @@
</span><span class="cx"> actual_xpath = "./" + actual_xpath[3:]
</span><span class="cx">
</span><span class="cx"> # Handle absolute root element and find all matching nodes
</span><del>- r = re.search("(/\{[^\}]+\}[^/]+|\.)(.*)", actual_xpath)
</del><ins>+ r = re.search("(/?\{[^\}]+\}[^/]+|\.)(.*)", actual_xpath)
</ins><span class="cx"> if r.group(2):
</span><span class="cx"> root_path = r.group(1)
</span><span class="cx"> child_path = r.group(2)[1:]
</span><del>- if root_path != "." and root.tag != root_path[1:]:
</del><ins>+ if root_path != "." and root.tag != root_path.lstrip("/"):
</ins><span class="cx"> resulttxt += " Items not returned in XML for %s\n" % (title,)
</span><span class="cx"> result = False
</span><span class="cx"> return result, resulttxt
</span></span></pre>
</div>
</div>
</body>
</html>