<!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>[12393] twext/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/12393">12393</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-18 11:44:32 -0800 (Sat, 18 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More MixIns in XML tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdaptesttest_servicepy">twext/trunk/twext/who/ldap/test/test_service.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_aggregatepy">twext/trunk/twext/who/test/test_aggregate.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_xmlpy">twext/trunk/twext/who/test/test_xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12392 => 12393)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py 2014-01-18 03:16:29 UTC (rev 12392)
+++ twext/trunk/twext/who/ldap/test/test_service.py 2014-01-18 19:44:32 UTC (rev 12393)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> from ...test import test_directory
</span><span class="cx"> from ...test.test_xml import (
</span><span class="cx"> xmlService,
</span><ins>+ BaseTest as XMLBaseTest,
</ins><span class="cx"> DirectoryServiceConvenienceTestMixIn
</span><span class="cx"> as BaseDirectoryServiceConvenienceTestMixIn,
</span><span class="cx"> )
</span><span class="lines">@@ -52,7 +53,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class BaseTestCase(object):
</del><ins>+class BaseTestCase(XMLBaseTest):
</ins><span class="cx"> """
</span><span class="cx"> Tests for L{DirectoryService}.
</span><span class="cx"> """
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_aggregatepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_aggregate.py (12392 => 12393)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_aggregate.py 2014-01-18 03:16:29 UTC (rev 12392)
+++ twext/trunk/twext/who/test/test_aggregate.py 2014-01-18 19:44:32 UTC (rev 12393)
</span><span class="lines">@@ -27,12 +27,13 @@
</span><span class="cx"> from ..util import ConstantsContainer
</span><span class="cx"> from . import test_directory, test_xml
</span><span class="cx"> from .test_xml import (
</span><ins>+ BaseTest as XMLBaseTest,
</ins><span class="cx"> QueryMixIn, xmlService, TestService as XMLTestService,
</span><span class="cx"> DirectoryServiceConvenienceTestMixIn
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>-class BaseTest(object):
</del><ins>+class BaseTest(XMLBaseTest):
</ins><span class="cx"> def service(self, services=None):
</span><span class="cx"> if services is None:
</span><span class="cx"> services = (self.xmlService(),)
</span><span class="lines">@@ -77,7 +78,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceQueryTest(BaseTest, test_xml.DirectoryServiceQueryTest):
</del><ins>+class DirectoryServiceQueryTest(
+ unittest.TestCase,
+ BaseTest,
+ test_xml.DirectoryServiceQueryTestMixIn
+):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -124,8 +129,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DirectoryServiceAggregatedQueryTest(
</span><ins>+ unittest.TestCase,
</ins><span class="cx"> AggregatedBaseTest,
</span><del>- test_xml.DirectoryServiceQueryTest,
</del><ins>+ test_xml.DirectoryServiceQueryTestMixIn,
</ins><span class="cx"> ):
</span><span class="cx"> pass
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_xml.py (12392 => 12393)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_xml.py 2014-01-18 03:16:29 UTC (rev 12392)
+++ twext/trunk/twext/who/test/test_xml.py 2014-01-18 19:44:32 UTC (rev 12393)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceConvenienceTestMixIn(BaseTest):
</del><ins>+class DirectoryServiceConvenienceTestMixIn(object):
</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,24 +183,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-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'>")
-
-
-
-class DirectoryServiceRealmTest(unittest.TestCase, BaseTest):
</del><ins>+class DirectoryServiceRealmTestMixIn(object):
</ins><span class="cx"> def test_realmNameImmutable(self):
</span><span class="cx"> def setRealmName():
</span><span class="cx"> service = self.service()
</span><span class="lines">@@ -210,122 +193,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceParsingTest(unittest.TestCase, BaseTest):
- def test_reloadInterval(self):
- service = self.service()
-
- service.loadRecords(stat=False)
- lastRefresh = service._lastRefresh
- self.assertTrue(service._lastRefresh)
-
- sleep(1)
- service.loadRecords(stat=False)
- self.assertEquals(lastRefresh, service._lastRefresh)
-
-
- def test_reloadStat(self):
- service = self.service()
-
- service.loadRecords(loadNow=True)
- lastRefresh = service._lastRefresh
- self.assertTrue(service._lastRefresh)
-
- sleep(1)
- service.loadRecords(loadNow=True)
- self.assertEquals(lastRefresh, service._lastRefresh)
-
-
- def test_badXML(self):
- service = self.service(xmlData="Hello")
-
- self.assertRaises(ParseError, service.loadRecords)
-
-
- def test_badRootElement(self):
- service = self.service(xmlData=(dedent(
- b"""
- <?xml version="1.0" encoding="utf-8"?>
-
- <frobnitz />
- """[1:]
- )))
-
- self.assertRaises(ParseError, service.loadRecords)
- try:
- service.loadRecords()
- except ParseError as e:
- self.assertTrue(str(e).startswith("Incorrect root element"), e)
- else:
- raise AssertionError("Expected ParseError")
-
-
- def test_noRealmName(self):
- service = self.service(xmlData=(dedent(
- b"""
- <?xml version="1.0" encoding="utf-8"?>
-
- <directory />
- """[1:]
- )))
-
- self.assertRaises(ParseError, service.loadRecords)
- try:
- service.loadRecords()
- except ParseError as e:
- self.assertTrue(str(e).startswith("No realm name"), e)
- else:
- raise AssertionError("Expected ParseError")
-
-
- def test_unknownFieldElementsClean(self):
- service = self.service()
- self.assertEquals(set(service.unknownFieldElements), set())
-
-
- def test_unknownFieldElementsDirty(self):
- service = self.service(xmlData=(dedent(
- b"""
- <?xml version="1.0" encoding="utf-8"?>
-
- <directory realm="Unknown Record Types">
- <record type="user">
- <uid>__wsanchez__</uid>
- <short-name>wsanchez</short-name>
- <political-affiliation>Community and Freedom Party</political-affiliation>
- </record>
- </directory>
- """[1:]
- )))
- self.assertEquals(
- set(service.unknownFieldElements),
- set((u"political-affiliation",))
- )
-
-
- def test_unknownRecordTypesClean(self):
- service = self.service()
- self.assertEquals(set(service.unknownRecordTypes), set())
-
-
- def test_unknownRecordTypesDirty(self):
- service = self.service(xmlData=(dedent(
- b"""
- <?xml version="1.0" encoding="utf-8"?>
-
- <directory realm="Unknown Record Types">
- <record type="camera">
- <uid>__d600__</uid>
- <short-name>d600</short-name>
- <full-name>Nikon D600</full-name>
- </record>
- </directory>
- """[1:]
- )))
- self.assertEquals(set(service.unknownRecordTypes), set((u"camera",)))
-
-
-
-class DirectoryServiceQueryTest(unittest.TestCase, BaseTest):
</del><ins>+class DirectoryServiceQueryTestMixIn(object):
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_queryAnd(self):
</span><span class="cx"> service = self.service()
</span><span class="lines">@@ -687,7 +555,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class DirectoryServiceMutableTest(unittest.TestCase, BaseTest):
</del><ins>+class DirectoryServiceMutableTestMixIn(object):
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_updateRecord(self):
</span><span class="cx"> service = self.service()
</span><span class="lines">@@ -780,6 +648,142 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class DirectoryServiceTest(
+ unittest.TestCase,
+ BaseTest,
+ DirectoryServiceConvenienceTestMixIn,
+ DirectoryServiceRealmTestMixIn,
+ DirectoryServiceQueryTestMixIn,
+ DirectoryServiceMutableTestMixIn,
+ 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'>")
+
+
+
+class DirectoryServiceParsingTest(unittest.TestCase, BaseTest):
+ def test_reloadInterval(self):
+ service = self.service()
+
+ service.loadRecords(stat=False)
+ lastRefresh = service._lastRefresh
+ self.assertTrue(service._lastRefresh)
+
+ sleep(1)
+ service.loadRecords(stat=False)
+ self.assertEquals(lastRefresh, service._lastRefresh)
+
+
+ def test_reloadStat(self):
+ service = self.service()
+
+ service.loadRecords(loadNow=True)
+ lastRefresh = service._lastRefresh
+ self.assertTrue(service._lastRefresh)
+
+ sleep(1)
+ service.loadRecords(loadNow=True)
+ self.assertEquals(lastRefresh, service._lastRefresh)
+
+
+ def test_badXML(self):
+ service = self.service(xmlData="Hello")
+
+ self.assertRaises(ParseError, service.loadRecords)
+
+
+ def test_badRootElement(self):
+ service = self.service(xmlData=(dedent(
+ b"""
+ <?xml version="1.0" encoding="utf-8"?>
+
+ <frobnitz />
+ """[1:]
+ )))
+
+ self.assertRaises(ParseError, service.loadRecords)
+ try:
+ service.loadRecords()
+ except ParseError as e:
+ self.assertTrue(str(e).startswith("Incorrect root element"), e)
+ else:
+ raise AssertionError("Expected ParseError")
+
+
+ def test_noRealmName(self):
+ service = self.service(xmlData=(dedent(
+ b"""
+ <?xml version="1.0" encoding="utf-8"?>
+
+ <directory />
+ """[1:]
+ )))
+
+ self.assertRaises(ParseError, service.loadRecords)
+ try:
+ service.loadRecords()
+ except ParseError as e:
+ self.assertTrue(str(e).startswith("No realm name"), e)
+ else:
+ raise AssertionError("Expected ParseError")
+
+
+ def test_unknownFieldElementsClean(self):
+ service = self.service()
+ self.assertEquals(set(service.unknownFieldElements), set())
+
+
+ def test_unknownFieldElementsDirty(self):
+ service = self.service(xmlData=(dedent(
+ b"""
+ <?xml version="1.0" encoding="utf-8"?>
+
+ <directory realm="Unknown Record Types">
+ <record type="user">
+ <uid>__wsanchez__</uid>
+ <short-name>wsanchez</short-name>
+ <political-affiliation>Community and Freedom Party</political-affiliation>
+ </record>
+ </directory>
+ """[1:]
+ )))
+ self.assertEquals(
+ set(service.unknownFieldElements),
+ set((u"political-affiliation",))
+ )
+
+
+ def test_unknownRecordTypesClean(self):
+ service = self.service()
+ self.assertEquals(set(service.unknownRecordTypes), set())
+
+
+ def test_unknownRecordTypesDirty(self):
+ service = self.service(xmlData=(dedent(
+ b"""
+ <?xml version="1.0" encoding="utf-8"?>
+
+ <directory realm="Unknown Record Types">
+ <record type="camera">
+ <uid>__d600__</uid>
+ <short-name>d600</short-name>
+ <full-name>Nikon D600</full-name>
+ </record>
+ </directory>
+ """[1:]
+ )))
+ self.assertEquals(set(service.unknownRecordTypes), set((u"camera",)))
+
+
+
</ins><span class="cx"> class DirectoryRecordTest(
</span><span class="cx"> unittest.TestCase,
</span><span class="cx"> BaseTest,
</span></span></pre>
</div>
</div>
</body>
</html>