<!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>[11975] 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/11975">11975</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-19 14:38:56 -0800 (Tue, 19 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>doc</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 (11974 => 11975)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-19 22:26:33 UTC (rev 11974)
+++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-19 22:38:56 UTC (rev 11975)
</span><span class="lines">@@ -77,7 +77,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>+ L{DirectoryService.repr} returns the expected string.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx"> self.assertEquals(
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx">
</span><span class="cx"> def test_recordTypes(self):
</span><span class="cx"> """
</span><del>- C{recordTypes} returns the supported set of record types.
- For L{DirectoryService}, that's the set of constants in the
- C{recordType} attribute.
</del><ins>+ L{DirectoryService.recordTypes} returns the supported set of record
+ types. For L{DirectoryService}, that's the set of constants in the
+ L{DirectoryService.recordType} attribute.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx"> self.assertEquals(
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsFromNonCompoundExpression_unknownExpression(self):
</span><span class="cx"> """
</span><del>- C{recordsFromNonCompoundExpression} with an unknown expression type
- fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordsFromNonCompoundExpression} with an unknown
+ expression type fails with L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx"> self.assertFailure(
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromNonCompoundExpression_emptyRecords(self):
</span><span class="cx"> """
</span><del>- C{recordsFromNonCompoundExpression} with an unknown expression type
- and an empty C{records} set returns an empty result.
</del><ins>+ L{DirectoryService.recordsFromNonCompoundExpression} with an unknown
+ expression type and an empty C{records} set returns an empty result.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx"> result = (
</span><span class="lines">@@ -128,8 +128,9 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsFromNonCompoundExpression_nonEmptyRecords(self):
</span><span class="cx"> """
</span><del>- C{recordsFromNonCompoundExpression} with an unknown expression type
- and a non-empty C{records} fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordsFromNonCompoundExpression} with an unknown
+ expression type and a non-empty C{records} fails with
+ L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -152,8 +153,8 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsFromExpression_unknownExpression(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} with an unknown expression type fails with
- L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordsFromExpression} with an unknown expression
+ type fails with L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx"> result = yield(service.recordsFromExpression(object()))
</span><span class="lines">@@ -163,8 +164,8 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromExpression_emptyExpression(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} with an unknown expression type and an empty
- L{CompoundExpression} returns an empty result.
</del><ins>+ L{DirectoryService.recordsFromExpression} with an unknown expression
+ type and an empty L{CompoundExpression} returns an empty result.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -208,9 +209,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceRecordsFromExpressionTest(unittest.TestCase):
</del><ins>+class DirectoryServiceRecordsFromExpressionTest(
+ unittest.TestCase,
+ ServiceMixIn
+):
</ins><span class="cx"> """
</span><del>- Tests for L{DirectoryService}.
</del><ins>+ Tests for L{DirectoryService.recordsFromExpression}.
</ins><span class="cx"> """
</span><span class="cx"> serviceClass = DirectoryService
</span><span class="cx"> directoryRecordClass = DirectoryRecord
</span><span class="lines">@@ -218,9 +222,9 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromExpression_single(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} handles a single expression
</del><ins>+ L{DirectoryService.recordsFromExpression} handles a single expression.
</ins><span class="cx"> """
</span><del>- service = StubDirectoryService()
</del><ins>+ service = self.service()
</ins><span class="cx">
</span><span class="cx"> result = yield service.recordsFromExpression("twistedmatrix.com")
</span><span class="cx">
</span><span class="lines">@@ -238,10 +242,10 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromExpression_OR(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} handles a L{CompoundExpression} with
- L{Operand.OR}.
</del><ins>+ L{DirectoryService.recordsFromExpression} handles a
+ L{CompoundExpression} with L{Operand.OR}.
</ins><span class="cx"> """
</span><del>- service = StubDirectoryService()
</del><ins>+ service = self.service()
</ins><span class="cx">
</span><span class="cx"> result = yield service.recordsFromExpression(
</span><span class="cx"> CompoundExpression(
</span><span class="lines">@@ -270,10 +274,10 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromExpression_AND(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} handles a L{CompoundExpression} with
- L{Operand.AND}.
</del><ins>+ L{DirectoryService.recordsFromExpression} handles a
+ L{CompoundExpression} with L{Operand.AND}.
</ins><span class="cx"> """
</span><del>- service = StubDirectoryService()
</del><ins>+ service = self.service()
</ins><span class="cx">
</span><span class="cx"> result = yield service.recordsFromExpression(
</span><span class="cx"> CompoundExpression(
</span><span class="lines">@@ -297,11 +301,11 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordsFromExpression_AND_optimized(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} handles a L{CompoundExpression} with
- L{Operand.AND}, and when one of the expression matches no records, the
- subsequent expressions are skipped.
</del><ins>+ L{DirectoryService.recordsFromExpression} handles a
+ L{CompoundExpression} with L{Operand.AND}, and when one of the
+ expression matches no records, the subsequent expressions are skipped.
</ins><span class="cx"> """
</span><del>- service = StubDirectoryService()
</del><ins>+ service = self.service()
</ins><span class="cx">
</span><span class="cx"> result = yield service.recordsFromExpression(
</span><span class="cx"> CompoundExpression(
</span><span class="lines">@@ -327,10 +331,11 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsFromExpression_unknownOperand(self):
</span><span class="cx"> """
</span><del>- C{recordsFromExpression} fails with L{QueryNotSupportedError} when
- given a L{CompoundExpression} with an unknown operand.
</del><ins>+ L{DirectoryService.recordsFromExpression} fails with
+ L{QueryNotSupportedError} when given a L{CompoundExpression} with an
+ unknown operand.
</ins><span class="cx"> """
</span><del>- service = StubDirectoryService()
</del><ins>+ service = self.service()
</ins><span class="cx">
</span><span class="cx"> results = service.recordsFromExpression(
</span><span class="cx"> CompoundExpression(
</span><span class="lines">@@ -359,7 +364,7 @@
</span><span class="cx">
</span><span class="cx"> def test_recordWithUID(self):
</span><span class="cx"> """
</span><del>- C{recordWithUID} fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordWithUID} fails with L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -371,7 +376,8 @@
</span><span class="cx">
</span><span class="cx"> def test_recordWithGUID(self):
</span><span class="cx"> """
</span><del>- C{recordWithGUID} fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordWithGUID} fails with
+ L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -383,7 +389,8 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsWithRecordType(self):
</span><span class="cx"> """
</span><del>- C{recordsWithRecordType} fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordsWithRecordType} fails with
+ L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -396,7 +403,8 @@
</span><span class="cx">
</span><span class="cx"> def test_recordWithShortName(self):
</span><span class="cx"> """
</span><del>- C{recordWithShortName} fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordWithShortName} fails with
+ L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -409,7 +417,8 @@
</span><span class="cx">
</span><span class="cx"> def test_recordsWithEmailAddress(self):
</span><span class="cx"> """
</span><del>- C{recordsWithEmailAddress} fails with L{QueryNotSupportedError}.
</del><ins>+ L{DirectoryService.recordsWithEmailAddress} fails with
+ L{QueryNotSupportedError}.
</ins><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="lines">@@ -634,7 +643,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>+ L{DirectoryRecord.repr} returns the expected string.
</ins><span class="cx"> """
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx">
</span><span class="lines">@@ -697,7 +706,7 @@
</span><span class="cx">
</span><span class="cx"> def test_description(self):
</span><span class="cx"> """
</span><del>- C{description} returns the expected string.
</del><ins>+ L{DirectoryRecord.description} returns the expected string.
</ins><span class="cx"> """
</span><span class="cx"> sagen = self.makeRecord(self.fields_sagen)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>