<!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>[12532] CalendarServer/trunk/txdav/who/test/test_xml.py</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/12532">12532</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 17:48:51 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test record types</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavwhotesttest_xmlpy">CalendarServer/trunk/txdav/who/test/test_xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_xml.py (12531 => 12532)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_xml.py 2014-02-01 01:38:50 UTC (rev 12531)
+++ CalendarServer/trunk/txdav/who/test/test_xml.py 2014-02-01 01:48:51 UTC (rev 12532)
</span><span class="lines">@@ -40,7 +40,9 @@
</span><span class="cx"> Tests for calendar and contacts schema extensions.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def makeRecord(self, elementName, value):
</del><ins>+ def makeRecord(
+ self, typeValue=u"user", elementName=u"password", elementValue=u"123"
+ ):
</ins><span class="cx"> uid = u"id"
</span><span class="cx">
</span><span class="cx"> xmlData = dedent(
</span><span class="lines">@@ -48,7 +50,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx">
</span><span class="cx"> <directory realm="Test Realm">
</span><del>- <record type="user">
</del><ins>+ <record type="{type}">
</ins><span class="cx"> <uid>{uid}</uid>
</span><span class="cx"> <short-name>{uid}</short-name>
</span><span class="cx"> <{element}>{value}</{element}>
</span><span class="lines">@@ -56,9 +58,10 @@
</span><span class="cx"> </directory>
</span><span class="cx"> """[1:]
</span><span class="cx"> .format(
</span><ins>+ type=typeValue.encode("utf-8"),
</ins><span class="cx"> uid=uid.encode("utf-8"),
</span><span class="cx"> element=elementName.encode("utf-8"),
</span><del>- value=value.encode("utf-8"),
</del><ins>+ value=elementValue.encode("utf-8"),
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -82,7 +85,9 @@
</span><span class="cx"> (FieldName.serviceNodeUID, u"service-node"),
</span><span class="cx"> (FieldName.autoAcceptGroup, u"auto-accept-group"),
</span><span class="cx"> ):
</span><del>- record = yield self.makeRecord(element, u"xyzzy")
</del><ins>+ record = yield self.makeRecord(
+ elementName=element, elementValue=u"xyzzy"
+ )
</ins><span class="cx"> self.assertEquals(record.fields[field], u"xyzzy")
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -93,7 +98,9 @@
</span><span class="cx"> (FieldName.hasCalendars, u"has-calendars"),
</span><span class="cx"> (FieldName.hasContacts, u"has-contacts"),
</span><span class="cx"> ):
</span><del>- record = yield self.makeRecord(element, u"<true />")
</del><ins>+ record = yield self.makeRecord(
+ elementName=element, elementValue=u"<true />"
+ )
</ins><span class="cx"> self.assertIdentical(record.fields[field], True, field)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -112,12 +119,18 @@
</span><span class="cx"> ):
</span><span class="cx"> field = FieldName.autoScheduleMode
</span><span class="cx"> record = yield self.makeRecord(
</span><del>- u"auto-schedule-mode", u"<{0} />".format(value)
</del><ins>+ elementName=u"auto-schedule-mode",
+ elementValue=u"<{0} />".format(value),
</ins><span class="cx"> )
</span><span class="cx"> self.assertIdentical(record.fields[field], mode)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def test_recordTypes(self):
</span><del>- raise NotImplementedError(RecordType)
-
- test_recordTypes.todo = "unimplemented"
</del><ins>+ for recordType, value in (
+ (RecordType.location, u"location"),
+ (RecordType.resource, u"resource"),
+ (RecordType.address, u"address"),
+ ):
+ record = yield self.makeRecord(typeValue=value)
+ self.assertIdentical(record.recordType, recordType)
</ins></span></pre>
</div>
</div>
</body>
</html>