<!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>[12492] twext/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/12492">12492</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 16:21:09 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add tests for unknown field elements.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkbintest">twext/trunk/bin/test</a></li>
<li><a href="#twexttrunktwextwhotesttest_xmlpy">twext/trunk/twext/who/test/test_xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunkbintest"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/test (12491 => 12492)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/test        2014-01-31 00:20:06 UTC (rev 12491)
+++ twext/trunk/bin/test        2014-01-31 00:21:09 UTC (rev 12492)
</span><span class="lines">@@ -19,6 +19,10 @@
</span><span class="cx"> set -e;
</span><span class="cx"> set -u;
</span><span class="cx">
</span><ins>+#
+# Initialize build support
+#
+
</ins><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd -L)";
</span><span class="cx">
</span><span class="cx"> export TWEXT_DEVELOP="true";
</span><span class="lines">@@ -26,22 +30,22 @@
</span><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span><del>-c_dependencies >> "${dev_home}/setup.log";
-py_dependencies >> "${dev_home}/setup.log";
</del><span class="cx">
</span><del>-##
</del><ins>+
+
+#
</ins><span class="cx"> # Options
</span><del>-##
</del><ins>+#
</ins><span class="cx">
</span><span class="cx"> do_setup="false";
</span><del>-do_get="false";
</del><ins>+ do_get="false";
</ins><span class="cx">
</span><del>-random="--random=$(date "+%s")";
-no_color="";
</del><ins>+ random="--random=$(date "+%s")";
+ no_color="";
</ins><span class="cx"> until_fail="";
</span><del>-coverage="";
-numjobs="";
-reactor="";
</del><ins>+ coverage="";
+ numjobs="";
+ reactor="";
</ins><span class="cx">
</span><span class="cx"> if [ "$(uname -s)" == "Darwin" ]; then
</span><span class="cx"> reactor="--reactor=kqueue";
</span><span class="lines">@@ -87,16 +91,28 @@
</span><span class="cx"> lint="false";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>-##
</del><ins>+
+
+#
+# Dependencies
+#
+
+c_dependencies >> "${dev_home}/setup.log";
+py_dependencies >> "${dev_home}/setup.log";
+
+
+
+#
</ins><span class="cx"> # Clean up
</span><del>-##
</del><ins>+#
</ins><span class="cx">
</span><span class="cx"> find "${wd}" -name \*.pyc -print0 | xargs -0 rm;
</span><span class="cx">
</span><span class="cx">
</span><del>-##
</del><ins>+
+#
</ins><span class="cx"> # Unit tests
</span><del>-##
</del><ins>+#
</ins><span class="cx">
</span><span class="cx"> cd "${wd}" && "${wd}/bin/trial" \
</span><span class="cx"> --temp-directory="${dev_home}/trial" \
</span><span class="lines">@@ -115,9 +131,10 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx">
</span><del>-##
</del><ins>+
+#
</ins><span class="cx"> # Linting
</span><del>-##
</del><ins>+#
</ins><span class="cx">
</span><span class="cx"> echo "";
</span><span class="cx"> echo "Running pyflakes...";
</span><span class="lines">@@ -132,9 +149,10 @@
</span><span class="cx"> rm -f "${tmp}";
</span><span class="cx">
</span><span class="cx">
</span><del>-##
</del><ins>+
+#
</ins><span class="cx"> # Empty files
</span><del>-##
</del><ins>+#
</ins><span class="cx">
</span><span class="cx"> echo "";
</span><span class="cx"> echo "Checking for empty files...";
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_xml.py (12491 => 12492)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_xml.py        2014-01-31 00:20:06 UTC (rev 12491)
+++ twext/trunk/twext/who/test/test_xml.py        2014-01-31 00:21:09 UTC (rev 12492)
</span><span class="lines">@@ -780,10 +780,46 @@
</span><span class="cx"> </directory>
</span><span class="cx"> """[1:]
</span><span class="cx"> )))
</span><ins>+
</ins><span class="cx"> self.assertEquals(set(service.unknownRecordTypes), set((u"camera",)))
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_unknownFieldElementClean(self):
+ service = self.service()
+ self.assertEquals(set(service.unknownFieldElements), set())
</ins><span class="cx">
</span><ins>+
+ @inlineCallbacks
+ def test_unknownFieldElementDirty(self):
+ service = self.service(xmlData=(dedent(
+ b"""
+ <?xml version="1.0" encoding="utf-8"?>
+
+ <directory realm="Unknown Record Types">
+ <record type="user">
+ <uid>__wsanchez__</uid>
+ <short-name>wsanchez</short-name>
+ <nickname>Larry</nickname>
+ </record>
+ </directory>
+ """[1:]
+ )))
+
+ self.assertEquals(
+ set(service.unknownFieldElements),
+ set((u"nickname",))
+ )
+
+ # Make sure that the 'short-name', which was parsed prior to nickname
+ # is correct. That is, make sure that we continue as soon as we
+ # notice the unknown field name and don't populate the previous field.
+
+ record = yield service.recordWithUID(u"__wsanchez__")
+
+ self.assertEquals(set(record.shortNames), set((u"wsanchez",)))
+
+
+
</ins><span class="cx"> class DirectoryRecordTest(
</span><span class="cx"> unittest.TestCase,
</span><span class="cx"> BaseTest,
</span></span></pre>
</div>
</div>
</body>
</html>