[CalendarServer-changes] [7941] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin/test/test_resource.py
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 11 21:47:47 PDT 2011
Revision: 7941
http://trac.macosforge.org/projects/calendarserver/changeset/7941
Author: glyph at apple.com
Date: 2011-08-11 21:47:47 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
move FakePrincipalResource to module scope so it can be used in other tests
Modified Paths:
--------------
CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py 2011-08-12 04:47:36 UTC (rev 7940)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py 2011-08-12 04:47:47 UTC (rev 7941)
@@ -17,6 +17,7 @@
"""
Tests for L{calendarserver.webadmin.resource}.
"""
+from functools import partial
from twisted.trial.unittest import TestCase
@@ -158,33 +159,7 @@
"""
When a resource is selected by a 'resourceId' parameter,
"""
- test = self
- class FakePrincipalResource(object):
- def __init__(self, req, resid):
- test.assertEquals(resid, "qux")
-
- @property
- def record(self):
- authIds = ['fake auth id']
- emails = ['fake email']
- shortNames = ['fake short name']
- fullName = 'nobody'
- return DirectoryRecord(
- service=test, recordType='users', guid=None,
- authIDs=authIds, emailAddresses=tuple(emails),
- shortNames=tuple(shortNames), fullName=fullName
- )
-
- def __str__(self):
- return 'Hello Fake Resource'
-
- def getChild(self, name):
- return self
-
- def readProperty(self, name, request):
- return GroupMemberSet()
-
- self.resource.getResourceById = FakePrincipalResource
+ self.resource.getResourceById = partial(FakePrincipalResource, self)
document = yield self.renderPage(dict(resourceId=["qux"]))
[detailsTitle] = getElementsByTagName(document, 'h3')
detailString = gatherTextNodes(detailsTitle)
@@ -200,6 +175,35 @@
guid = '28c57671-2bf8-4ebd-bc45-fda5ffcee1e8'
+
+class FakePrincipalResource(object):
+ def __init__(self, test, req, resid):
+ self.test = test
+ test.assertEquals(resid, "qux")
+
+ @property
+ def record(self):
+ authIds = ['fake auth id']
+ emails = ['fake email']
+ shortNames = ['fake short name']
+ fullName = 'nobody'
+ return DirectoryRecord(
+ service=self.test, recordType='users', guid=None,
+ authIDs=authIds, emailAddresses=tuple(emails),
+ shortNames=tuple(shortNames), fullName=fullName
+ )
+
+ def __str__(self):
+ return 'Hello Fake Resource'
+
+ def getChild(self, name):
+ return self
+
+ def readProperty(self, name, request):
+ return GroupMemberSet()
+
+
+
class NewRenderingTests(RenderingTests):
"""
Tests for new L{WebAdminPage} renderer.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/f5fa4190/attachment.html>
More information about the calendarserver-changes
mailing list