<!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>[11964] 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/11964">11964</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-18 17:56:11 -0800 (Mon, 18 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test structure cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhoindexpy">CalendarServer/trunk/twext/who/index.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="CalendarServertrunktwextwhoindexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/index.py (11963 => 11964)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/index.py 2013-11-18 21:59:19 UTC (rev 11963)
+++ CalendarServer/trunk/twext/who/index.py 2013-11-19 01:56:11 UTC (rev 11964)
</span><span class="lines">@@ -130,10 +130,10 @@
</span><span class="cx"> <FieldName=memberUIDs>: {
</span><span class="cx"> u'__sagen__': set([<DirectoryRecord (group)calendar-dev>]),
</span><span class="cx"> u'__wsanchez__': set([<DirectoryRecord (group)calendar-dev>])
</span><del>- },
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- The field names that are indexed are determined by the C{indexedFields}
</del><ins>+ The field names that are indexed are defined by the C{indexedFields}
</ins><span class="cx"> attribute of the service.
</span><span class="cx">
</span><span class="cx"> A subclass must override L{loadRecords}, which populates the index.
</span><span class="lines">@@ -187,7 +187,8 @@
</span><span class="cx"> """
</span><span class="cx"> Load records. This must be implemented by subclasses.
</span><span class="cx">
</span><del>- The implementation should set the index with current data.
</del><ins>+ The implementation should set the index property with current index
+ data.
</ins><span class="cx"> """
</span><span class="cx"> raise NotImplementedError("Subclasses must implement loadRecords().")
</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 (11963 => 11964)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-18 21:59:19 UTC (rev 11963)
+++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-19 01:56:11 UTC (rev 11964)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twisted.trial.unittest import SkipTest
</del><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx">
</span><span class="lines">@@ -46,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> def service(self):
</span><span class="cx"> if not hasattr(self, "_service"):
</span><del>- self._service = DirectoryService(self.realmName)
</del><ins>+ self._service = self.serviceClass(self.realmName)
</ins><span class="cx"> return self._service
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -55,7 +54,10 @@
</span><span class="cx"> """
</span><span class="cx"> Tests for directory services.
</span><span class="cx"> """
</span><ins>+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_interface(self):
</span><span class="cx"> """
</span><span class="cx"> Service instance conforms to L{IDirectoryService}.
</span><span class="lines">@@ -130,7 +132,7 @@
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><del>- wsanchez = DirectoryRecord(
</del><ins>+ wsanchez = self.directoryRecordClass(
</ins><span class="cx"> service,
</span><span class="cx"> {
</span><span class="cx"> service.fieldName.recordType: service.recordType.user,
</span><span class="lines">@@ -403,14 +405,17 @@
</span><span class="cx"> """
</span><span class="cx"> Tests for immutable directory services.
</span><span class="cx"> """
</span><ins>+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_updateRecordsNotAllowed(self):
</span><span class="cx"> """
</span><span class="cx"> Updating records is not allowed.
</span><span class="cx"> """
</span><span class="cx"> service = self.service()
</span><span class="cx">
</span><del>- newRecord = DirectoryRecord(
</del><ins>+ newRecord = self.directoryRecordClass(
</ins><span class="cx"> service,
</span><span class="cx"> fields={
</span><span class="cx"> service.fieldName.uid: u"__plugh__",
</span><span class="lines">@@ -451,7 +456,10 @@
</span><span class="cx"> """
</span><span class="cx"> Tests for directory records.
</span><span class="cx"> """
</span><ins>+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> fields_wsanchez = {
</span><span class="cx"> FieldName.uid: u"UID:wsanchez",
</span><span class="cx"> FieldName.recordType: RecordType.user,
</span><span class="lines">@@ -695,15 +703,15 @@
</span><span class="cx">
</span><span class="cx"> def test_members_group(self):
</span><span class="cx"> """
</span><del>- Group members.
</del><ins>+ Group members for group records.
</ins><span class="cx"> """
</span><del>- raise SkipTest("Subclasses should implement this test.")
</del><ins>+ raise NotImplementedError("Subclasses should implement this test.")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_members_nonGroup(self):
</span><span class="cx"> """
</span><del>- Non-groups have no members.
</del><ins>+ Group members for non-group records. Non-groups have no members.
</ins><span class="cx"> """
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx">
</span><span class="lines">@@ -713,11 +721,11 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_groups(self):
</del><ins>+ def test_memberships(self):
</ins><span class="cx"> """
</span><span class="cx"> Group memberships.
</span><span class="cx"> """
</span><del>- raise SkipTest("Subclasses should implement this test.")
</del><ins>+ raise NotImplementedError("Subclasses should implement this test.")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -728,7 +736,7 @@
</span><span class="cx"> self.assertFailure(staff.members(), NotImplementedError)
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_groups(self):
</del><ins>+ def test_memberships(self):
</ins><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx">
</span><span class="cx"> self.assertFailure(wsanchez.groups(), NotImplementedError)
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_indexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_index.py (11963 => 11964)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_index.py 2013-11-18 21:59:19 UTC (rev 11963)
+++ CalendarServer/trunk/twext/who/test/test_index.py 2013-11-19 01:56:11 UTC (rev 11964)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><ins>+from twext.who.directory import DirectoryService, DirectoryRecord
+
</ins><span class="cx"> from twext.who.test import test_directory
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -28,15 +30,20 @@
</span><span class="cx"> """
</span><span class="cx"> Tests for indexed directory services.
</span><span class="cx"> """
</span><ins>+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DirectoryServiceTest(unittest.TestCase, BaseDirectoryServiceTest):
</span><span class="cx"> def _noop(self):
</span><span class="cx"> """
</span><del>- Does nothing.
</del><ins>+ Does nothing for this class.
</ins><span class="cx"> """
</span><ins>+ if self.__class__ is not DirectoryServiceTest:
+ raise NotImplementedError("Subclasses should implement this test.")
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> test_recordWithUID = _noop
</span><span class="cx"> test_recordWithGUID = _noop
</span><span class="cx"> test_recordsWithRecordType = _noop
</span><span class="lines">@@ -51,6 +58,8 @@
</span><span class="cx"> """
</span><span class="cx"> Tests for immutable indexed directory services.
</span><span class="cx"> """
</span><ins>+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -65,8 +74,19 @@
</span><span class="cx"> """
</span><span class="cx"> Tests for indexed directory records.
</span><span class="cx"> """
</span><ins>+ serviceClass = DirectoryService
+ directoryRecordClass = DirectoryRecord
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DirectoryRecordTest(unittest.TestCase, BaseDirectoryRecordTest):
</span><del>- pass
</del><ins>+ def _noop(self):
+ """
+ Does nothing for this class.
+ """
+ if self.__class__ is not DirectoryRecordTest:
+ raise NotImplementedError("Subclasses should implement this test.")
+
+
+ test_members_group = _noop
+ test_memberships = _noop
</ins></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_xml.py (11963 => 11964)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-18 21:59:19 UTC (rev 11963)
+++ CalendarServer/trunk/twext/who/test/test_xml.py 2013-11-19 01:56:11 UTC (rev 11964)
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> newRecord = DirectoryRecord(
</span><span class="cx"> service,
</span><span class="cx"> fields={
</span><del>- service.fieldName.uid: u"__plugh__",
</del><ins>+ service.fieldName.uid: u"__plugh__",
</ins><span class="cx"> service.fieldName.recordType: service.recordType.user,
</span><span class="cx"> service.fieldName.shortNames: (u"plugh",),
</span><span class="cx"> }
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> newRecord = DirectoryRecord(
</span><span class="cx"> service,
</span><span class="cx"> fields={
</span><del>- service.fieldName.uid: u"__plugh__",
</del><ins>+ service.fieldName.uid: u"__plugh__",
</ins><span class="cx"> service.fieldName.recordType: service.recordType.user,
</span><span class="cx"> service.fieldName.shortNames: (u"plugh",),
</span><span class="cx"> }
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx">
</span><span class="cx"> class DirectoryRecordTest(BaseTest, test_index.BaseDirectoryRecordTest):
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_members(self):
</del><ins>+ def test_members_group(self):
</ins><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="cx"> record = (yield service.recordWithUID(u"__wsanchez__"))
</span><span class="lines">@@ -790,7 +790,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_groups(self):
</del><ins>+ def test_memberships(self):
</ins><span class="cx"> service = self.service()
</span><span class="cx">
</span><span class="cx"> record = (yield service.recordWithUID(u"__wsanchez__"))
</span></span></pre>
</div>
</div>
</body>
</html>