[CalendarServer-changes] [567] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ directory/test

[source_changes at macosforge.org]

Revision: 567
          http://trac.macosforge.org/projects/calendarserver/changeset/567
Author:   wsanchez at apple.com
Date:     2006-11-22 14:55:55 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Update tests to check for records, not record short names, from listRecords()

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_apache.py
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_xmlfile.py
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/util.py

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_apache.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_apache.py	2006-11-22 22:55:04 UTC (rev 566)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_apache.py	2006-11-22 22:55:55 UTC (rev 567)
@@ -74,8 +74,8 @@
 
     def test_changedUserFile(self):
         self.basicUserFile().open("w").write("wsanchez:Cytm0Bwm7CPJs\n")
-        self.assertEquals(set(self.service().listRecords("user")), set(("wsanchez",)))
+        self.assertEquals(self.recordNames("user"), set(("wsanchez",)))
 
     def test_changedGroupFile(self):
         self.groupFile().open("w").write("grunts: wsanchez\n")
-        self.assertEquals(set(self.service().listRecords("group")), set(("grunts",)))
+        self.assertEquals(self.recordNames("group"), set(("grunts",)))

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_xmlfile.py	2006-11-22 22:55:04 UTC (rev 566)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_xmlfile.py	2006-11-22 22:55:55 UTC (rev 567)
@@ -79,6 +79,12 @@
 </accounts>
 """
         )
-        self.assertEquals(set(self.service().listRecords("user")), set(("admin",)))
-        self.assertEquals(set(self.service().listRecords("group")), set())
-        self.assertEquals(set(self.service().listRecords("resource")), set())
+        for recordType, expectedRecords in (
+            ( "user"     , ("admin",) ),
+            ( "group"    , ()         ),
+            ( "resource" , ()         ),
+        ):
+            self.assertEquals(
+                set(r.shortName for r in self.service().listRecords(recordType)),
+                set(expectedRecords)
+            )

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/util.py	2006-11-22 22:55:04 UTC (rev 566)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/util.py	2006-11-22 22:55:55 UTC (rev 567)
@@ -56,20 +56,20 @@
         """
         IDirectoryService.listRecords("user")
         """
-        self.assertEquals(set(self.service().listRecords("user")), set(self.users.keys()))
+        self.assertEquals(self.recordNames("user"), set(self.users.keys()))
 
     def test_listRecords_group(self):
         """
         IDirectoryService.listRecords("group")
         """
-        self.assertEquals(set(self.service().listRecords("group")), set(self.groups.keys()))
+        self.assertEquals(self.recordNames("group"), set(self.groups.keys()))
 
     def test_listRecords_resources(self):
         """
         IDirectoryService.listRecords("resources")
         """
         if len(self.resources):
-            self.assertEquals(set(self.service().listRecords("resource")), self.resources)
+            self.assertEquals(self.recordNames("resource"), self.resources)
 
     def test_recordWithShortName_user(self):
         """
@@ -107,7 +107,10 @@
         service = self.service()
         for group in self.groups:
             groupRecord = service.recordWithShortName("group", group)
-            self.assertEquals(set(m.shortName for m in groupRecord.members()), set(self.groups[group]))
+            self.assertEquals(
+                set(m.shortName for m in groupRecord.members()),
+                set(self.groups[group])
+            )
 
     def test_groupMemberships(self):
         """
@@ -116,8 +119,14 @@
         service = self.service()
         for user in self.users:
             userRecord = service.recordWithShortName("user", user)
-            self.assertEquals(set(g.shortName for g in userRecord.groups()), set(g for g in self.groups if user in self.groups[g]))
+            self.assertEquals(
+                set(g.shortName for g in userRecord.groups()),
+                set(g for g in self.groups if user in self.groups[g])
+            )
 
+    def recordNames(self, recordType):
+        return set(r.shortName for r in self.service().listRecords(recordType))
+
 class BasicTestCase (DirectoryTestCase):
     """
     Tests a directory implementation with basic auth.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061122/ad89599c/attachment.html