<!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>[11987] 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/11987">11987</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-20 12:57:12 -0800 (Wed, 20 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix aggregate tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhoaggregatepy">CalendarServer/trunk/twext/who/aggregate.py</a></li>
<li><a href="#CalendarServertrunktwextwhotesttest_aggregatepy">CalendarServer/trunk/twext/who/test/test_aggregate.py</a></li>
<li><a href="#CalendarServertrunktwextwhotesttest_xmlpy">CalendarServer/trunk/twext/who/test/test_xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextwhoaggregatepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/aggregate.py (11986 => 11987)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/aggregate.py 2013-11-20 19:05:25 UTC (rev 11986)
+++ CalendarServer/trunk/twext/who/aggregate.py 2013-11-20 20:57:12 UTC (rev 11987)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> from twext.who.idirectory import DirectoryConfigurationError
</span><span class="cx"> from twext.who.idirectory import IDirectoryService
</span><del>-from twext.who.index import DirectoryService as BaseDirectoryService
-from twext.who.index import DirectoryRecord
</del><ins>+from twext.who.directory import DirectoryService as BaseDirectoryService
+from twext.who.directory import DirectoryRecord
</ins><span class="cx"> from twext.who.util import ConstantsContainer
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -68,10 +68,6 @@
</span><span class="cx"> return self._services
</span><span class="cx">
</span><span class="cx">
</span><del>- def loadRecords(self):
- pass
-
-
</del><span class="cx"> @property
</span><span class="cx"> def recordType(self):
</span><span class="cx"> if not hasattr(self, "_recordType"):
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_aggregatepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_aggregate.py (11986 => 11987)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_aggregate.py 2013-11-20 19:05:25 UTC (rev 11986)
+++ CalendarServer/trunk/twext/who/test/test_aggregate.py 2013-11-20 20:57:12 UTC (rev 11987)
</span><span class="lines">@@ -25,13 +25,15 @@
</span><span class="cx"> from twext.who.aggregate import DirectoryService, DirectoryRecord
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><span class="cx"> from twext.who.test import test_directory, test_xml
</span><del>-from twext.who.test.test_xml import QueryMixIn, xmlService
-from twext.who.test.test_xml import TestService as XMLTestService
</del><ins>+from twext.who.test.test_xml import (
+ QueryMixIn, xmlService,
+ TestService as XMLTestService,
+ DirectoryServiceConvenienceTestMixIn
+)
</ins><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class BaseTest(object):
</span><del>- def service(self, subClass=None, services=None):
</del><ins>+ def service(self, services=None):
</ins><span class="cx"> if services is None:
</span><span class="cx"> services = (self.xmlService(),)
</span><span class="cx">
</span><span class="lines">@@ -45,10 +47,7 @@
</span><span class="cx"> for s in services
</span><span class="cx"> ))
</span><span class="cx">
</span><del>- if subClass is None:
- subClass = DirectoryService
-
- class TestService(subClass, QueryMixIn):
</del><ins>+ class TestService(DirectoryService, QueryMixIn):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> return TestService(u"xyzzy", services)
</span><span class="lines">@@ -63,7 +62,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceTest(BaseTest, test_xml.DirectoryServiceTest):
</del><ins>+class DirectoryServiceTest(
+ unittest.TestCase,
+ BaseTest,
+ DirectoryServiceConvenienceTestMixIn,
+ test_directory.BaseDirectoryServiceTest
+):
</ins><span class="cx"> serviceClass = DirectoryService
</span><span class="cx"> directoryRecordClass = DirectoryRecord
</span><span class="cx">
</span><span class="lines">@@ -88,7 +92,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class AggregatedBaseTest(BaseTest):
</span><del>- def service(self, subClass=None):
</del><ins>+ def service(self):
</ins><span class="cx"> class UsersDirectoryService(XMLTestService):
</span><span class="cx"> recordType = ConstantsContainer((XMLTestService.recordType.user,))
</span><span class="cx">
</span><span class="lines">@@ -106,7 +110,6 @@
</span><span class="cx">
</span><span class="cx"> return BaseTest.service(
</span><span class="cx"> self,
</span><del>- subClass=None,
</del><span class="cx"> services=(usersService, groupsService)
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_xml.py (11986 => 11987)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-20 19:05:25 UTC (rev 11986)
+++ CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-20 20:57:12 UTC (rev 11987)
</span><span class="lines">@@ -52,22 +52,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceTest(
- unittest.TestCase,
- BaseTest,
- test_index.BaseDirectoryServiceTest,
-):
- serviceClass = DirectoryService
- directoryRecordClass = DirectoryRecord
-
- def test_repr(self):
- service = self.service()
-
- self.assertEquals(repr(service), "<TestService (not loaded)>")
- service.loadRecords()
- self.assertEquals(repr(service), "<TestService u'xyzzy'>")
-
-
</del><ins>+class DirectoryServiceConvenienceTestMixIn(BaseTest):
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_recordWithUID(self):
</span><span class="cx"> service = self.service()
</span><span class="lines">@@ -183,6 +168,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class DirectoryServiceTest(
+ unittest.TestCase,
+ DirectoryServiceConvenienceTestMixIn,
+ test_index.BaseDirectoryServiceTest,
+):
+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
+
+ def test_repr(self):
+ service = self.service()
+
+ self.assertEquals(repr(service), "<TestService (not loaded)>")
+ service.loadRecords()
+ self.assertEquals(repr(service), "<TestService u'xyzzy'>")
+
+
+
</ins><span class="cx"> class DirectoryServiceRealmTest(unittest.TestCase, BaseTest):
</span><span class="cx"> def test_realmNameImmutable(self):
</span><span class="cx"> def setRealmName():
</span></span></pre>
</div>
</div>
</body>
</html>