<!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>[11918] 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/11918">11918</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-08 14:12:54 -0800 (Fri, 08 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add test_recordsFromNonCompoundExpression_nonEmptyRecords.
Add StubDirectoryService.</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 (11917 => 11918)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-08 21:59:31 UTC (rev 11917)
+++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-08 22:12:54 UTC (rev 11918)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> def test_repr(self):
</span><span class="cx"> """
</span><del>- C{repr()} returns the expected string.
</del><ins>+ C{repr} returns the expected string.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx"> self.assertEquals(repr(service), "<DirectoryService u'xyzzy'>")
</span><span class="lines">@@ -120,6 +120,30 @@
</span><span class="cx"> self.assertEquals(set(result), set(()))
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_recordsFromNonCompoundExpression_nonEmptyRecords(self):
+ """
+ C{recordsFromNonCompoundExpression} with an unknown expression type
+ and a non-empty C{records} fails with L{QueryNotSupportedError}.
+ """
+ service = self.service()
+
+ wsanchez = DirectoryRecord(
+ service,
+ {
+ service.fieldName.recordType: service.recordType.user,
+ service.fieldName.uid: u"__wsanchez__",
+ service.fieldName.shortNames: [u"wsanchez"],
+ }
+ )
+
+ self.assertFailure(
+ service.recordsFromNonCompoundExpression(
+ object(), records=((wsanchez,))
+ ),
+ QueryNotSupportedError
+ )
+
+
</ins><span class="cx"> def test_recordsFromExpression_unknownExpression(self):
</span><span class="cx"> """
</span><span class="cx"> C{recordsFromExpression} with an unknown expression type fails with
</span><span class="lines">@@ -434,3 +458,106 @@
</span><span class="cx"> def test_groups(self):
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx"> self.assertFailure(wsanchez.groups(), NotImplementedError)
</span><ins>+
+
+
+class StubDirectoryService(DirectoryService):
+ def __init__(self):
+ DirectoryService.__init__(self, self.realmName)
+
+ self.records = []
+ self._addRecords()
+
+
+ def _addRecords(self):
+ self._addUser(
+ shortNames=[u"wsanchez", u"wilfredo_sanchez"],
+ fullNames=[u"Wilfredo S\xe1nchez Vega"],
+ emailAddresses=[
+ u"wsanchez@bitbucket.calendarserver.org",
+ u"wsanchez@devnull.twistedmatrix.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"glyph"],
+ fullNames=[u"Glyph Lefkowitz"],
+ emailAddresses=[
+ u"glyph@bitbucket.calendarserver.org",
+ u"glyph@devnull.twistedmatrix.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"sagen"],
+ fullNames=[u"Morgen Sagen"],
+ emailAddresses=[
+ u"sagen@bitbucket.calendarserver.org",
+ u"shared@example.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"cdaboo"],
+ fullNames=[u"Cyrus Daboo"],
+ emailAddresses=[
+ u"cdaboo@bitbucket.calendarserver.org",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"dre"],
+ fullNames=[u"Andre LaBranche"],
+ emailAddresses=[
+ u"dre@bitbucket.calendarserver.org",
+ u"shared@example.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"exarkun"],
+ fullNames=[u"Jean-Paul Calderone"],
+ emailAddresses=[
+ u"exarkun@devnull.twistedmatrix.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"dreid"],
+ fullNames=[u"David Reid"],
+ emailAddresses=[
+ u"dreid@devnull.twistedmatrix.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"joe"],
+ fullNames=[u"Joe Schmoe"],
+ emailAddresses=[
+ u"joe@example.com",
+ ],
+ )
+
+ self._addUser(
+ shortNames=[u"alyssa"],
+ fullNames=[u"Alyssa P. Hacker"],
+ emailAddresses=[
+ u"alyssa@example.com",
+ ],
+ )
+
+
+ def _addUser(self, shortNames, fullNames, emailAddresses=[]):
+ self.records.append(DirectoryRecord(self, {
+ self.fieldName.recordType: self.recordType.user,
+ self.fieldName.uid: u"__{0}__".format(shortNames[0]),
+ self.fieldName.shortNames: shortNames,
+ self.fieldName.fullNames: fullNames,
+ self.fieldName.password: u"".join(reversed(shortNames[0])),
+ self.fieldName.emailAddresses: emailAddresses,
+ }))
+
+
+ def recordsFromNonCompoundExpression(expression, records=None):
+ if expression == "":
+ pass
</ins></span></pre>
</div>
</div>
</body>
</html>