<!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>[11872] CalendarServer/trunk/twext/who/test/test_directory.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/11872">11872</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-01 16:21:53 -0700 (Fri, 01 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>cosmetic</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhotesttest_directorypy">CalendarServer/trunk/twext/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_directory.py (11871 => 11872)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-01 22:25:30 UTC (rev 11871)
+++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-01 23:21:53 UTC (rev 11872)
</span><span class="lines">@@ -69,6 +69,13 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ # @inlineCallbacks
+ # def test_recordsFromExpression(self):
+ # service = self.service()
+ # result = yield(service.recordsFromExpression(None))
+ # self.assertIsInstance(result, QueryNotSupportedError)
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromQueryNone(self):
</span><span class="cx"> service = self.service()
</span><span class="lines">@@ -79,7 +86,10 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsFromQueryBogus(self):
</span><span class="cx"> service = self.service()
</span><del>- self.assertFailure(service.recordsFromQuery((object(),)), QueryNotSupportedError)
</del><ins>+ self.assertFailure(
+ service.recordsFromQuery((object(),)),
+ QueryNotSupportedError
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_recordWithUID(self):
</span><span class="lines">@@ -109,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> newRecord = DirectoryRecord(
</span><span class="cx"> service,
</span><del>- fields = {
</del><ins>+ fields={
</ins><span class="cx"> service.fieldName.uid: "__plugh__",
</span><span class="cx"> service.fieldName.recordType: service.recordType.user,
</span><span class="cx"> service.fieldName.shortNames: ("plugh",),
</span><span class="lines">@@ -140,26 +150,32 @@
</span><span class="cx">
</span><span class="cx"> class DirectoryRecordTest(BaseTest):
</span><span class="cx"> fields_wsanchez = {
</span><del>- FieldName.uid: "UID:wsanchez",
- FieldName.recordType: RecordType.user,
- FieldName.shortNames: ("wsanchez", "wilfredo_sanchez"),
- FieldName.fullNames: ("Wilfredo Sanchez", "Wilfredo Sanchez Vega"),
- FieldName.emailAddresses: ("wsanchez@calendarserver.org", "wsanchez@example.com")
</del><ins>+ FieldName.uid: "UID:wsanchez",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: ("wsanchez", "wilfredo_sanchez"),
+ FieldName.fullNames: (
+ "Wilfredo Sanchez",
+ "Wilfredo Sanchez Vega",
+ ),
+ FieldName.emailAddresses: (
+ "wsanchez@calendarserver.org",
+ "wsanchez@example.com",
+ )
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fields_glyph = {
</span><del>- FieldName.uid: "UID:glyph",
- FieldName.recordType: RecordType.user,
- FieldName.shortNames: ("glyph",),
- FieldName.fullNames: ("Glyph Lefkowitz",),
</del><ins>+ FieldName.uid: "UID:glyph",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: ("glyph",),
+ FieldName.fullNames: ("Glyph Lefkowitz",),
</ins><span class="cx"> FieldName.emailAddresses: ("glyph@calendarserver.org",)
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fields_sagen = {
</span><del>- FieldName.uid: "UID:sagen",
- FieldName.recordType: RecordType.user,
- FieldName.shortNames: ("sagen",),
- FieldName.fullNames: ("Morgen Sagen",),
</del><ins>+ FieldName.uid: "UID:sagen",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: ("sagen",),
+ FieldName.fullNames: ("Morgen Sagen",),
</ins><span class="cx"> FieldName.emailAddresses: ("sagen@CalendarServer.org",)
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -185,7 +201,7 @@
</span><span class="cx"> wsanchez = self._testRecord(self.fields_wsanchez, service=service)
</span><span class="cx">
</span><span class="cx"> self.assertEquals(wsanchez.service, service)
</span><del>- self.assertEquals(wsanchez.fields , self.fields_wsanchez)
</del><ins>+ self.assertEquals(wsanchez.fields, self.fields_wsanchez)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_initWithNoUID(self):
</span><span class="lines">@@ -245,25 +261,39 @@
</span><span class="cx"> fields_glyphmod = self.fields_glyph.copy()
</span><span class="cx"> del fields_glyphmod[FieldName.emailAddresses]
</span><span class="cx">
</span><ins>+ plugh = DirectoryService("plugh")
+
</ins><span class="cx"> wsanchez = self._testRecord(self.fields_wsanchez)
</span><del>- wsanchezmod = self._testRecord(self.fields_wsanchez, DirectoryService("plugh"))
</del><ins>+ wsanchezmod = self._testRecord(self.fields_wsanchez, plugh)
</ins><span class="cx"> glyph = self._testRecord(self.fields_glyph)
</span><span class="cx"> glyphmod = self._testRecord(fields_glyphmod)
</span><span class="cx">
</span><span class="cx"> self.assertEquals(wsanchez, wsanchez)
</span><span class="cx"> self.assertNotEqual(wsanchez, glyph)
</span><del>- self.assertNotEqual(glyph, glyphmod) # UID matches, other fields do not
</del><ins>+ self.assertNotEqual(glyph, glyphmod) # UID matches, other fields don't
</ins><span class="cx"> self.assertNotEqual(glyphmod, wsanchez)
</span><del>- self.assertNotEqual(wsanchez, wsanchezmod) # Different service
</del><ins>+ self.assertNotEqual(wsanchez, wsanchezmod) # Different service
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_attributeAccess(self):
</span><span class="cx"> wsanchez = self._testRecord(self.fields_wsanchez)
</span><span class="cx">
</span><del>- self.assertEquals(wsanchez.recordType , wsanchez.fields[FieldName.recordType ])
- self.assertEquals(wsanchez.uid , wsanchez.fields[FieldName.uid ])
- self.assertEquals(wsanchez.shortNames , wsanchez.fields[FieldName.shortNames ])
- self.assertEquals(wsanchez.emailAddresses, wsanchez.fields[FieldName.emailAddresses])
</del><ins>+ self.assertEquals(
+ wsanchez.recordType,
+ wsanchez.fields[FieldName.recordType]
+ )
+ self.assertEquals(
+ wsanchez.uid,
+ wsanchez.fields[FieldName.uid]
+ )
+ self.assertEquals(
+ wsanchez.shortNames,
+ wsanchez.fields[FieldName.shortNames]
+ )
+ self.assertEquals(
+ wsanchez.emailAddresses,
+ wsanchez.fields[FieldName.emailAddresses]
+ )
</ins><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_members(self):
</span></span></pre>
</div>
</div>
</body>
</html>