<!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>[11985] CalendarServer/trunk/twext/who/test</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/11985">11985</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-20 00:56:17 -0800 (Wed, 20 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add test_unIndexedRecordsFromMatchExpression_*</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhotesttest_directorypy">CalendarServer/trunk/twext/who/test/test_directory.py</a></li>
<li><a href="#CalendarServertrunktwextwhotesttest_indexpy">CalendarServer/trunk/twext/who/test/test_index.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 (11984 => 11985)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py        2013-11-20 08:34:59 UTC (rev 11984)
+++ CalendarServer/trunk/twext/who/test/test_directory.py        2013-11-20 08:56:17 UTC (rev 11985)
</span><span class="lines">@@ -841,7 +841,11 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         self.addUser(
</span><span class="cx">             shortNames=[u&quot;wsanchez&quot;, u&quot;wilfredo_sanchez&quot;],
</span><del>-            fullNames=[u&quot;Wilfredo S\xe1nchez Vega&quot;],
</del><ins>+            fullNames=[
+                u&quot;Wilfredo S\xe1nchez Vega&quot;,
+                u&quot;Wilfredo Sanchez Vega&quot;,
+                u&quot;Wilfredo Sanchez&quot;,
+            ],
</ins><span class="cx">             emailAddresses=[
</span><span class="cx">                 u&quot;wsanchez@bitbucket.calendarserver.org&quot;,
</span><span class="cx">                 u&quot;wsanchez@devnull.twistedmatrix.com&quot;,
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_indexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_index.py (11984 => 11985)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_index.py        2013-11-20 08:34:59 UTC (rev 11984)
+++ CalendarServer/trunk/twext/who/test/test_index.py        2013-11-20 08:56:17 UTC (rev 11985)
</span><span class="lines">@@ -220,15 +220,99 @@
</span><span class="cx">         self.assertFailure(result, NotImplementedError)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def test_unIndexedRecordsFromMatchExpression(self):
</del><ins>+    @inlineCallbacks
+    def _test_unIndexedRecordsFromMatchExpression(
+        self,
+        inOut, matchType,
+        fieldName=BaseFieldName.fullNames,
+    ):
+        service = self.noLoadServicePopulated()
+
+        for subString, uids in (inOut):
+            records = yield service.unIndexedRecordsFromMatchExpression(
+                MatchExpression(
+                    fieldName, subString,
+                    matchType
+                )
+            )
+            self.assertEquals(
+                set((record.uid for record in records)),
+                set(uids)
+            )
+
+
+    def test_unIndexedRecordsFromMatchExpression_startsWith(self):
</ins><span class="cx">         &quot;&quot;&quot;
</span><del>-        L{DirectoryService.unIndexedRecordsFromMatchExpression} ...
</del><ins>+        L{DirectoryService.unIndexedRecordsFromMatchExpression} with a
+        startsWith expression.
</ins><span class="cx">         &quot;&quot;&quot;
</span><del>-        raise NotImplementedError()
</del><ins>+        return self._test_unIndexedRecordsFromMatchExpression(
+            (
+                (u&quot;Wilfredo&quot;, (u&quot;__wsanchez__&quot;,)),    # Duplicates
+                (u&quot;A&quot;, (u&quot;__alyssa__&quot;, u&quot;__dre__&quot;)),  # Multiple
+                (u&quot;Andre&quot;, (u&quot;__dre__&quot;,)),            # Single
+            ),
+            MatchType.startsWith
+        )
</ins><span class="cx"> 
</span><del>-    test_unIndexedRecordsFromMatchExpression.todo = &quot;Unimplemented&quot;
</del><span class="cx"> 
</span><ins>+    def test_unIndexedRecordsFromMatchExpression_contains(self):
+        &quot;&quot;&quot;
+        L{DirectoryService.unIndexedRecordsFromMatchExpression} with a contains
+        expression.
+        &quot;&quot;&quot;
+        return self._test_unIndexedRecordsFromMatchExpression(
+            (
+                (u&quot;Sanchez&quot;, (u&quot;__wsanchez__&quot;,)),     # Duplicates
+                (u&quot;A&quot;, (u&quot;__alyssa__&quot;, u&quot;__dre__&quot;)),  # Multiple
+                (u&quot;LaBra&quot;, (u&quot;__dre__&quot;,)),            # Single
+            ),
+            MatchType.contains
+        )
</ins><span class="cx"> 
</span><ins>+
+    def test_unIndexedRecordsFromMatchExpression_equals(self):
+        &quot;&quot;&quot;
+        L{DirectoryService.unIndexedRecordsFromMatchExpression} with an equals
+        expression.
+        &quot;&quot;&quot;
+        return self._test_unIndexedRecordsFromMatchExpression(
+            (
+                (u&quot;Wilfredo Sanchez&quot;, (u&quot;__wsanchez__&quot;,)),  # MultiValue
+                (u&quot;Andre LaBranche&quot;, (u&quot;__dre__&quot;,)),        # Single value
+            ),
+            MatchType.equals
+        )
+
+
+    def test_unIndexedRecordsFromMatchExpression_indexed(self):
+        &quot;&quot;&quot;
+        L{DirectoryService.unIndexedRecordsFromMatchExpression} with an
+        indexed field name.
+        &quot;&quot;&quot;
+        self._test_unIndexedRecordsFromMatchExpression(
+            (
+                (u&quot;wsanchez&quot;, (u&quot;__wsanchez__&quot;,)),
+            ),
+            MatchType.equals,
+            fieldName=BaseFieldName.shortNames
+        )
+
+
+    def test_unIndexedRecordsFromMatchExpression_notMatchExpression(self):
+        &quot;&quot;&quot;
+        L{DirectoryService.unIndexedRecordsFromMatchExpression} with a
+        non-match expression.
+        &quot;&quot;&quot;
+        result = self._test_unIndexedRecordsFromMatchExpression(
+            (
+                (u&quot;zehcnasw&quot;, (u&quot;__wsanchez__&quot;,)),
+            ),
+            &quot;Not a match type we know about&quot;
+        )
+        self.assertFailure(result, NotImplementedError)
+
+
</ins><span class="cx">     def test_recordsFromNonCompoundExpression(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         L{DirectoryService.recordsFromNonCompoundExpression} ...
</span></span></pre>
</div>
</div>

</body>
</html>