<!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>[11979] 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/11979">11979</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-19 17:24:56 -0800 (Tue, 19 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>More test refactoring.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhotesttest_aggregatepy">CalendarServer/trunk/twext/who/test/test_aggregate.py</a></li>
<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>
<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="CalendarServertrunktwextwhotesttest_aggregatepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_aggregate.py (11978 => 11979)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_aggregate.py 2013-11-20 01:24:20 UTC (rev 11978)
+++ CalendarServer/trunk/twext/who/test/test_aggregate.py 2013-11-20 01:24:56 UTC (rev 11979)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class BaseTest(object):
</span><del>- def service(self, services=None):
</del><ins>+ def service(self, subClass=None, 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,14 +45,21 @@
</span><span class="cx"> for s in services
</span><span class="cx"> ))
</span><span class="cx">
</span><del>- class TestService(DirectoryService, QueryMixIn):
</del><ins>+ if subClass is None:
+ subClass = DirectoryService
+
+ class TestService(subClass, QueryMixIn):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> return TestService(u"xyzzy", services)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def xmlService(self, xmlData=None, serviceClass=None):
</span><del>- return xmlService(self.mktemp(), xmlData, serviceClass)
</del><ins>+ return xmlService(
+ self.mktemp(),
+ xmlData=xmlData,
+ serviceClass=serviceClass
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -81,7 +88,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class AggregatedBaseTest(BaseTest):
</span><del>- def service(self):
</del><ins>+ def service(self, subClass=None):
</ins><span class="cx"> class UsersDirectoryService(XMLTestService):
</span><span class="cx"> recordType = ConstantsContainer((XMLTestService.recordType.user,))
</span><span class="cx">
</span><span class="lines">@@ -89,15 +96,19 @@
</span><span class="cx"> recordType = ConstantsContainer((XMLTestService.recordType.group,))
</span><span class="cx">
</span><span class="cx"> usersService = self.xmlService(
</span><del>- testXMLConfigUsers,
- UsersDirectoryService
</del><ins>+ xmlData=testXMLConfigUsers,
+ serviceClass=UsersDirectoryService
</ins><span class="cx"> )
</span><span class="cx"> groupsService = self.xmlService(
</span><del>- testXMLConfigGroups,
- GroupsDirectoryService
</del><ins>+ xmlData=testXMLConfigGroups,
+ serviceClass=GroupsDirectoryService
</ins><span class="cx"> )
</span><span class="cx">
</span><del>- return BaseTest.service(self, (usersService, groupsService))
</del><ins>+ return BaseTest.service(
+ self,
+ subClass=None,
+ services=(usersService, groupsService)
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -129,8 +140,8 @@
</span><span class="cx"> def test_conflictingRecordTypes(self):
</span><span class="cx"> self.assertRaises(
</span><span class="cx"> DirectoryConfigurationError,
</span><del>- BaseTest.service, self,
- (self.xmlService(), self.xmlService(testXMLConfigUsers)),
</del><ins>+ self.service,
+ services=(self.xmlService(), self.xmlService(testXMLConfigUsers)),
</ins><span class="cx"> )
</span><span class="cx">
</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 (11978 => 11979)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-20 01:24:20 UTC (rev 11978)
+++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-20 01:24:56 UTC (rev 11979)
</span><span class="lines">@@ -92,9 +92,11 @@
</span><span class="cx"> realmName = u"xyzzy"
</span><span class="cx">
</span><span class="cx">
</span><del>- def service(self):
</del><ins>+ def service(self, subClass=None):
</ins><span class="cx"> if not hasattr(self, "_service"):
</span><del>- self._service = self.serviceClass(self.realmName)
</del><ins>+ if subClass is None:
+ subClass = self.serviceClass
+ self._service = subClass(self.realmName)
</ins><span class="cx"> return self._service
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_indexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_index.py (11978 => 11979)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_index.py 2013-11-20 01:24:20 UTC (rev 11978)
+++ CalendarServer/trunk/twext/who/test/test_index.py 2013-11-20 01:24:56 UTC (rev 11979)
</span><span class="lines">@@ -27,10 +27,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class NoLoadDirectoryService(DirectoryService):
- def loadRecords(self):
- pass
</del><ins>+def noLoadDirectoryService(superClass):
+ class NoLoadDirectoryService(superClass):
+ def loadRecords(self):
+ pass
</ins><span class="cx">
</span><ins>+ return NoLoadDirectoryService
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # class StubDirectoryService(DirectoryService):
</span><span class="lines">@@ -55,7 +57,9 @@
</span><span class="cx"> L{DirectoryService.indexRecords} ensures all record data is in the
</span><span class="cx"> index.
</span><span class="cx"> """
</span><del>- service = NoLoadDirectoryService(u"")
</del><ins>+ service = self.service(
+ subClass=noLoadDirectoryService(self.serviceClass)
+ )
</ins><span class="cx"> records = RecordStorage(service, DirectoryRecord)
</span><span class="cx">
</span><span class="cx"> service.indexRecords(records)
</span><span class="lines">@@ -85,7 +89,9 @@
</span><span class="cx"> """
</span><span class="cx"> L{DirectoryService.indexRecords} does not have extra data in the index.
</span><span class="cx"> """
</span><del>- service = NoLoadDirectoryService(u"")
</del><ins>+ service = self.service(
+ subClass=noLoadDirectoryService(self.serviceClass)
+ )
</ins><span class="cx"> records = RecordStorage(service, DirectoryRecord)
</span><span class="cx">
</span><span class="cx"> service.indexRecords(records)
</span><span class="lines">@@ -149,7 +155,9 @@
</span><span class="cx"> """
</span><span class="cx"> C{flush} sets the index to C{None}.
</span><span class="cx"> """
</span><del>- service = NoLoadDirectoryService(u"")
</del><ins>+ service = self.service(
+ subClass=noLoadDirectoryService(self.serviceClass)
+ )
</ins><span class="cx"> service._index = {}
</span><span class="cx"> service.flush()
</span><span class="cx"> self.assertTrue(emptyIndex(service._index))
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_xml.py (11978 => 11979)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-20 01:24:20 UTC (rev 11978)
+++ CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-20 01:24:56 UTC (rev 11979)
</span><span class="lines">@@ -36,8 +36,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class BaseTest(object):
</span><del>- def service(self, xmlData=None):
- return xmlService(self.mktemp(), xmlData)
</del><ins>+ def service(self, subClass=None, xmlData=None):
+ return xmlService(
+ self.mktemp(),
+ xmlData=xmlData,
+ serviceClass=subClass
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def assertRecords(self, records, uids):
</span><span class="lines">@@ -842,7 +846,13 @@
</span><span class="cx"> filePath = FilePath(tmp)
</span><span class="cx"> filePath.setContent(xmlData)
</span><span class="cx">
</span><del>- return serviceClass(filePath)
</del><ins>+ try:
+ return serviceClass(filePath)
+ except Exception as e:
+ raise AssertionError(
+ "Unable to instantiate XML service {0}: {1}"
+ .format(serviceClass, e)
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>