<!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>[11986] CalendarServer/trunk/twext/who/test/test_index.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/11986">11986</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-20 11:05:25 -0800 (Wed, 20 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add test_recordsFromNonCompoundExpression_*</pre>
<h3>Modified Paths</h3>
<ul>
<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_indexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_index.py (11985 => 11986)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_index.py 2013-11-20 08:56:17 UTC (rev 11985)
+++ CalendarServer/trunk/twext/who/test/test_index.py 2013-11-20 19:05:25 UTC (rev 11986)
</span><span class="lines">@@ -19,9 +19,10 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</ins><span class="cx">
</span><span class="cx"> from twext.who.idirectory import FieldName as BaseFieldName
</span><ins>+from twext.who.idirectory import QueryNotSupportedError
</ins><span class="cx"> from twext.who.expression import MatchExpression, MatchType
</span><span class="cx"> from twext.who.index import DirectoryService, DirectoryRecord
</span><span class="cx"> from twext.who.test import test_directory
</span><span class="lines">@@ -30,26 +31,37 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def noLoadDirectoryService(superClass):
</span><ins>+ """
+ Creates an indexed directory service that has a no-op implementation of
+ L{DirectoryService.loadRecords}.
+
+ @param superClass: The superclass of the new service.
+ @type superClass: subclass of L{DirectoryService}
+
+ @return: A new directory service class.
+ @rtype: subclass of C{superClass}
+ """
+ assert issubclass(superClass, DirectoryService)
+
</ins><span class="cx"> class NoLoadDirectoryService(superClass):
</span><span class="cx"> def loadRecords(self):
</span><span class="cx"> pass
</span><span class="cx">
</span><del>- return NoLoadDirectoryService
</del><ins>+ def indexedRecordsFromMatchExpression(self, *args, **kwargs):
+ self._calledIndexed = True
+ return superClass.indexedRecordsFromMatchExpression(
+ self, *args, **kwargs
+ )
</ins><span class="cx">
</span><ins>+ def unIndexedRecordsFromMatchExpression(self, *args, **kwargs):
+ self._calledUnindexed = True
+ return superClass.unIndexedRecordsFromMatchExpression(
+ self, *args, **kwargs
+ )
</ins><span class="cx">
</span><del>-# class StubDirectoryService(DirectoryService):
-# """
-# Stub directory service with some built-in records and an implementation
-# of C{recordsFromNonCompoundExpression}.
-# """
</del><ins>+ return NoLoadDirectoryService
</ins><span class="cx">
</span><del>-# def __init__(self):
-# DirectoryService.__init__(self, u"Stub")
</del><span class="cx">
</span><del>-# self.records = RecordStorage(self, DirectoryRecord)
-
-
-
</del><span class="cx"> class BaseDirectoryServiceTest(test_directory.BaseDirectoryServiceTest):
</span><span class="cx"> """
</span><span class="cx"> Tests for indexed directory services.
</span><span class="lines">@@ -128,9 +140,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _test_indexedRecordsFromMatchExpression(
</span><del>- self,
- inOut, matchType,
- fieldName=BaseFieldName.shortNames,
</del><ins>+ self, inOut, matchType, fieldName=BaseFieldName.shortNames,
</ins><span class="cx"> ):
</span><span class="cx"> service = self.noLoadServicePopulated()
</span><span class="cx">
</span><span class="lines">@@ -222,9 +232,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _test_unIndexedRecordsFromMatchExpression(
</span><del>- self,
- inOut, matchType,
- fieldName=BaseFieldName.fullNames,
</del><ins>+ self, inOut, matchType, fieldName=BaseFieldName.fullNames,
</ins><span class="cx"> ):
</span><span class="cx"> service = self.noLoadServicePopulated()
</span><span class="cx">
</span><span class="lines">@@ -313,16 +321,52 @@
</span><span class="cx"> self.assertFailure(result, NotImplementedError)
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_recordsFromNonCompoundExpression(self):
</del><ins>+ @inlineCallbacks
+ def _test_recordsFromNonCompoundExpression(self, expression):
+ service = self.noLoadServicePopulated()
+ yield service.recordsFromNonCompoundExpression(expression)
+ returnValue(service)
+
+
+ @inlineCallbacks
+ def test_recordsFromNonCompoundExpression_match_indexed(self):
</ins><span class="cx"> """
</span><del>- L{DirectoryService.recordsFromNonCompoundExpression} ...
</del><ins>+ L{DirectoryService.recordsFromNonCompoundExpression} with a
+ L{MatchExpression} for an indexed field calls
+ L{DirectoryRecord.indexedRecordsFromMatchExpression}.
</ins><span class="cx"> """
</span><del>- raise NotImplementedError()
</del><ins>+ service = yield self._test_recordsFromNonCompoundExpression(
+ MatchExpression(BaseFieldName.shortNames, u"...")
+ )
+ self.assertTrue(getattr(service, "_calledIndexed", False))
+ self.assertFalse(getattr(service, "_calledUnindexed", False))
</ins><span class="cx">
</span><del>- test_recordsFromNonCompoundExpression.todo = "Unimplemented"
</del><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_recordsFromNonCompoundExpression_match_unindexed(self):
+ """
+ L{DirectoryService.recordsFromNonCompoundExpression} with a
+ L{MatchExpression} for an unindexed field calls
+ L{DirectoryRecord.unIndexedRecordsFromMatchExpression}.
+ """
+ service = yield self._test_recordsFromNonCompoundExpression(
+ MatchExpression(BaseFieldName.password, u"...")
+ )
+ self.assertFalse(getattr(service, "_calledIndexed", False))
+ self.assertTrue(getattr(service, "_calledUnindexed", False))
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def test_recordsFromNonCompoundExpression_unknown(self):
+ """
+ L{DirectoryService.recordsFromNonCompoundExpression} with a
+ an unknown expression calls superclass, which will result in a
+ L{QueryNotSupportedError}.
+ """
+ result = self._test_recordsFromNonCompoundExpression(object())
+ self.assertFailure(result, QueryNotSupportedError)
+
+
+
</ins><span class="cx"> class DirectoryServiceTest(unittest.TestCase, BaseDirectoryServiceTest):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{DirectoryService}.
</span></span></pre>
</div>
</div>
</body>
</html>