<!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>[11911] CalendarServer/trunk/twext/who</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/11911">11911</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-07 18:59:43 -0800 (Thu, 07 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>test docs</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhodirectorypy">CalendarServer/trunk/twext/who/directory.py</a></li>
<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="CalendarServertrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/directory.py (11910 => 11911)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/directory.py        2013-11-08 02:19:57 UTC (rev 11910)
+++ CalendarServer/trunk/twext/who/directory.py        2013-11-08 02:59:43 UTC (rev 11911)
</span><span class="lines">@@ -132,6 +132,11 @@
</span><span class="cx"> 
</span><span class="cx">         @param records: a set of records to limit the search to. C{None} if
</span><span class="cx">             the whole directory should be searched.
</span><ins>+            This is provided by L{recordsFromExpression} when it has already
+            narrowed down results to a set of records.
+            That is, it's a performance optimization; ignoring this and
+            searching the entire directory will also work.
+
</ins><span class="cx">         @type records: L{set} or L{frozenset}
</span><span class="cx"> 
</span><span class="cx">         @return: The matching records.
</span><span class="lines">@@ -140,6 +145,12 @@
</span><span class="cx">         @raises: L{QueryNotSupportedError} if the expression is not
</span><span class="cx">             supported by this directory service.
</span><span class="cx">         &quot;&quot;&quot;
</span><ins>+        if records is not None:
+            for record in records:
+                break
+            else:
+                return succeed(())
+
</ins><span class="cx">         return fail(QueryNotSupportedError(
</span><span class="cx">             &quot;Unknown expression: {0}&quot;.format(expression)
</span><span class="cx">         ))
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_directory.py (11910 => 11911)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py        2013-11-08 02:19:57 UTC (rev 11910)
+++ CalendarServer/trunk/twext/who/test/test_directory.py        2013-11-08 02:59:43 UTC (rev 11911)
</span><span class="lines">@@ -27,11 +27,15 @@
</span><span class="cx"> from twext.who.idirectory import QueryNotSupportedError, NotAllowedError
</span><span class="cx"> from twext.who.idirectory import RecordType, FieldName
</span><span class="cx"> from twext.who.idirectory import IDirectoryService, IDirectoryRecord
</span><ins>+from twext.who.idirectory import Operand
</ins><span class="cx"> from twext.who.expression import CompoundExpression
</span><span class="cx"> from twext.who.directory import DirectoryService, DirectoryRecord
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ServiceMixIn(object):
</span><ins>+    &quot;&quot;&quot;
+    MixIn that sets up a service appropriate for testing.
+    &quot;&quot;&quot;
</ins><span class="cx">     realmName = u&quot;xyzzy&quot;
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -43,7 +47,14 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class BaseDirectoryServiceTest(ServiceMixIn):
</span><ins>+    &quot;&quot;&quot;
+    Tests for directory services.
+    &quot;&quot;&quot;
+
</ins><span class="cx">     def test_interface(self):
</span><ins>+        &quot;&quot;&quot;
+        Service instance conforms to L{IDirectoryService}.
+        &quot;&quot;&quot;
</ins><span class="cx">         service = self.service()
</span><span class="cx">         try:
</span><span class="cx">             verifyObject(IDirectoryService, service)
</span><span class="lines">@@ -52,16 +63,27 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def test_init(self):
</span><ins>+        &quot;&quot;&quot;
+        Test initialization.
+        &quot;&quot;&quot;
</ins><span class="cx">         service = self.service()
</span><span class="cx">         self.assertEquals(service.realmName, self.realmName)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def test_repr(self):
</span><ins>+        &quot;&quot;&quot;
+        C{repr()} returns the expected string.
+        &quot;&quot;&quot;
</ins><span class="cx">         service = self.service()
</span><span class="cx">         self.assertEquals(repr(service), &quot;&lt;DirectoryService u'xyzzy'&gt;&quot;)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def test_recordTypes(self):
</span><ins>+        &quot;&quot;&quot;
+        C{recordTypes} returns the supported set of record types.
+        For L{DirectoryService}, that's the set of constants in the
+        C{recordType} attribute.
+        &quot;&quot;&quot;
</ins><span class="cx">         service = self.service()
</span><span class="cx">         self.assertEquals(
</span><span class="cx">             set(service.recordTypes()),
</span><span class="lines">@@ -69,22 +91,58 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    # @inlineCallbacks
-    # def test_recordsFromExpressionNone(self):
-    #     service = self.service()
-    #     records = (yield service.recordsFromExpression(CompoundExpression()))
-    #     for record in records:
-    #         self.failTest(&quot;No records expected&quot;)
</del><ins>+    def test_recordsFromNonCompoundExpression_unknown(self):
+        &quot;&quot;&quot;
+        C{recordsFromNonCompoundExpression} with an unknown expression type
+        fails with L{QueryNotSupportedError}.
+        &quot;&quot;&quot;
+        service = self.service()
+        self.assertFailure(
+            service.recordsFromNonCompoundExpression(object()),
+            QueryNotSupportedError
+        )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-    # def test_recordsFromExpressionBogus(self):
-    #     service = self.service()
-    #     self.assertFailure(
-    #         service.recordsFromQuery(CompoundExpression(object(),)),
-    #         QueryNotSupportedError
-    #     )
</del><ins>+    @inlineCallbacks
+    def test_recordsFromNonCompoundExpression_unknown_empty(self):
+        &quot;&quot;&quot;
+        C{recordsFromNonCompoundExpression} with an unknown expression type
+        and an empty C{records} set returns an empty result.
+        &quot;&quot;&quot;
+        service = self.service()
+        result = (
+            yield service.recordsFromNonCompoundExpression(
+                object(), records=()
+            )
+        )
+        self.assertEquals(set(result), set(()))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    def test_recordsFromExpression_unknown(self):
+        &quot;&quot;&quot;
+        C{recordsFromExpression} with an unknown expression type fails with
+        L{QueryNotSupportedError}.
+        &quot;&quot;&quot;
+        service = self.service()
+        result = yield(service.recordsFromExpression(object()))
+        self.assertFailure(result, QueryNotSupportedError)
+
+
+    @inlineCallbacks
+    def test_recordsFromExpression_empty(self):
+        &quot;&quot;&quot;
+        C{recordsFromExpression} with an unknown expression type and an empty
+        C{records} set returns an empty result.
+        &quot;&quot;&quot;
+        service = self.service()
+
+        for operand in Operand.iterconstants():
+            result = yield(service.recordsFromExpression(
+                CompoundExpression((), operand)
+            ))
+            self.assertEquals(set(result), set(()))
+
+
</ins><span class="cx">     def test_recordWithUID(self):
</span><span class="cx">         raise SkipTest(&quot;Subclasses should implement this test.&quot;)
</span><span class="cx"> 
</span><span class="lines">@@ -107,12 +165,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class DirectoryServiceTest(unittest.TestCase, BaseDirectoryServiceTest):
</span><del>-    def test_recordsFromExpression(self):
-        service = self.service()
-        result = yield(service.recordsFromExpression(None))
-        self.assertFailure(result, QueryNotSupportedError)
-
-
</del><span class="cx">     def test_recordWithUID(self):
</span><span class="cx">         service = self.service()
</span><span class="cx">         self.assertFailure(
</span></span></pre>
</div>
</div>

</body>
</html>