[CalendarServer-changes] [12393] twext/trunk/twext/who
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:21:00 PDT 2014
Revision: 12393
http://trac.calendarserver.org//changeset/12393
Author: wsanchez at apple.com
Date: 2014-01-18 11:44:32 -0800 (Sat, 18 Jan 2014)
Log Message:
-----------
More MixIns in XML tests.
Modified Paths:
--------------
twext/trunk/twext/who/ldap/test/test_service.py
twext/trunk/twext/who/test/test_aggregate.py
twext/trunk/twext/who/test/test_xml.py
Modified: twext/trunk/twext/who/ldap/test/test_service.py
===================================================================
--- 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)
@@ -41,6 +41,7 @@
from ...test import test_directory
from ...test.test_xml import (
xmlService,
+ BaseTest as XMLBaseTest,
DirectoryServiceConvenienceTestMixIn
as BaseDirectoryServiceConvenienceTestMixIn,
)
@@ -52,7 +53,7 @@
-class BaseTestCase(object):
+class BaseTestCase(XMLBaseTest):
"""
Tests for L{DirectoryService}.
"""
Modified: twext/trunk/twext/who/test/test_aggregate.py
===================================================================
--- 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)
@@ -27,12 +27,13 @@
from ..util import ConstantsContainer
from . import test_directory, test_xml
from .test_xml import (
+ BaseTest as XMLBaseTest,
QueryMixIn, xmlService, TestService as XMLTestService,
DirectoryServiceConvenienceTestMixIn
)
-class BaseTest(object):
+class BaseTest(XMLBaseTest):
def service(self, services=None):
if services is None:
services = (self.xmlService(),)
@@ -77,7 +78,11 @@
-class DirectoryServiceQueryTest(BaseTest, test_xml.DirectoryServiceQueryTest):
+class DirectoryServiceQueryTest(
+ unittest.TestCase,
+ BaseTest,
+ test_xml.DirectoryServiceQueryTestMixIn
+):
pass
@@ -124,8 +129,9 @@
class DirectoryServiceAggregatedQueryTest(
+ unittest.TestCase,
AggregatedBaseTest,
- test_xml.DirectoryServiceQueryTest,
+ test_xml.DirectoryServiceQueryTestMixIn,
):
pass
Modified: twext/trunk/twext/who/test/test_xml.py
===================================================================
--- 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)
@@ -53,7 +53,7 @@
-class DirectoryServiceConvenienceTestMixIn(BaseTest):
+class DirectoryServiceConvenienceTestMixIn(object):
@inlineCallbacks
def test_recordWithUID(self):
service = self.service()
@@ -183,24 +183,7 @@
-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):
+class DirectoryServiceRealmTestMixIn(object):
def test_realmNameImmutable(self):
def setRealmName():
service = self.service()
@@ -210,122 +193,7 @@
-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):
+class DirectoryServiceQueryTestMixIn(object):
@inlineCallbacks
def test_queryAnd(self):
service = self.service()
@@ -687,7 +555,7 @@
-class DirectoryServiceMutableTest(unittest.TestCase, BaseTest):
+class DirectoryServiceMutableTestMixIn(object):
@inlineCallbacks
def test_updateRecord(self):
service = self.service()
@@ -780,6 +648,142 @@
+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",)))
+
+
+
class DirectoryRecordTest(
unittest.TestCase,
BaseTest,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/6da009f4/attachment.html>
More information about the calendarserver-changes
mailing list