[CalendarServer-changes] [672] CalendarServer/trunk/twistedcaldav/directory/test

[source_changes at macosforge.org]

Revision: 672
          http://trac.macosforge.org/projects/calendarserver/changeset/672
Author:   wsanchez at apple.com
Date:     2006-12-04 23:57:03 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Check more record data

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
    CalendarServer/trunk/twistedcaldav/directory/test/util.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py	2006-12-05 07:35:49 UTC (rev 671)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py	2006-12-05 07:57:03 UTC (rev 672)
@@ -33,10 +33,10 @@
     users = {
         "admin"   : { "password": "nimda",    "guid": None, "addresses": () },
         "proxy"   : { "password": "yxorp",    "guid": None, "addresses": () },
-        "wsanchez": { "password": "zehcnasw", "guid": None, "addresses": () },
-        "cdaboo"  : { "password": "oobadc",   "guid": None, "addresses": () },
-        "lecroy"  : { "password": "yorcel",   "guid": None, "addresses": () },
-        "dreid"   : { "password": "dierd",    "guid": None, "addresses": () },
+        "wsanchez": { "password": "zehcnasw", "guid": None, "addresses": ("mailto:wsanchez at example.com",) },
+        "cdaboo"  : { "password": "oobadc",   "guid": None, "addresses": ("mailto:cdaboo at example.com",) },
+        "lecroy"  : { "password": "yorcel",   "guid": None, "addresses": ("mailto:lecroy at example.com",) },
+        "dreid"   : { "password": "dierd",    "guid": None, "addresses": ("mailto:dreid at example.com",) },
         "user01"  : { "password": "01user",   "guid": None, "addresses": () },
         "user02"  : { "password": "02user",   "guid": None, "addresses": () },
     }
@@ -49,9 +49,9 @@
     }
 
     resources = {
-        "mercury": { "password": "mercury", "guid": None, "addresses": () },
-        "gemini" : { "password": "gemini",  "guid": None, "addresses": () },
-        "apollo" : { "password": "apollo",  "guid": None, "addresses": () },
+        "mercury": { "password": "mercury", "guid": None, "addresses": ("mailto:mercury at example.com",) },
+        "gemini" : { "password": "gemini",  "guid": None, "addresses": ("mailto:gemini at example.com",) },
+        "apollo" : { "password": "apollo",  "guid": None, "addresses": ("mailto:apollo at example.com",) },
     }
 
     def xmlFile(self):

Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/util.py	2006-12-05 07:35:49 UTC (rev 671)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py	2006-12-05 07:57:03 UTC (rev 672)
@@ -91,9 +91,9 @@
             raise SkipTest("No users")
 
         service = self.service()
-        for user in self.users:
-            record = service.recordWithShortName("user", user)
-            self.assertEquals(record.shortName, user)
+        for shortName in self.users:
+            record = service.recordWithShortName("user", shortName)
+            self.compare(record, shortName, self.users[shortName])
         self.assertEquals(service.recordWithShortName("user", "IDunnoWhoThisIsIReallyDont"), None)
 
     def test_recordWithShortName_group(self):
@@ -104,9 +104,9 @@
             raise SkipTest("No groups")
 
         service = self.service()
-        for group in self.groups:
-            groupRecord = service.recordWithShortName("group", group)
-            self.assertEquals(groupRecord.shortName, group)
+        for shortName in self.groups:
+            record = service.recordWithShortName("group", shortName)
+            self.compare(record, shortName, self.groups[shortName])
         self.assertEquals(service.recordWithShortName("group", "IDunnoWhoThisIsIReallyDont"), None)
 
     def test_recordWithShortName_resource(self):
@@ -117,9 +117,9 @@
             raise SkipTest("No resources")
 
         service = self.service()
-        for resource in self.resources:
-            resourceRecord = service.recordWithShortName("resource", resource)
-            self.assertEquals(resourceRecord.shortName, resource)
+        for shortName in self.resources:
+            record = service.recordWithShortName("resource", shortName)
+            self.compare(record, shortName, self.resources[shortName])
 
     def test_groupMembers(self):
         """
@@ -156,6 +156,18 @@
     def recordNames(self, recordType):
         return set(r.shortName for r in self.service().listRecords(recordType))
 
+    def compare(self, record, shortName, data):
+        def value(key):
+            if key in data:
+                return data[key]
+            else:
+                return None
+
+        self.assertEquals(record.shortName, shortName)
+        self.assertEquals(record.guid, value("guid"))
+        self.assertEquals(set(record.calendarUserAddresses), set(value("addresses")))
+        #self.assertEquals(record.fullName, value("name")) # FIXME
+
 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/20061204/d98b23f4/attachment.html