[CalendarServer-changes] [609] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ directory/test/test_principal.py

[source_changes at macosforge.org]

Revision: 609
          http://trac.macosforge.org/projects/calendarserver/changeset/609
Author:   wsanchez at apple.com
Date:     2006-11-27 19:18:06 -0800 (Mon, 27 Nov 2006)

Log Message:
-----------
Test principalCollections()

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

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_principal.py	2006-11-28 03:17:50 UTC (rev 608)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/test/test_principal.py	2006-11-28 03:18:06 UTC (rev 609)
@@ -25,6 +25,7 @@
 
 import os
 
+from twisted.internet.defer import deferredGenerator, waitForDeferred
 from twisted.web2.dav.fileop import rmdir
 
 from twistedcaldav.directory.apache import BasicDirectoryService, DigestDirectoryService
@@ -64,9 +65,10 @@
 
             self.principalRootResources[directory.__class__.__name__] = provisioningResource
 
+    @deferredGenerator
     def test_hierarchy(self):
         """
-        listChildren(), getChildren(), principalCollectionURL()
+        listChildren(), getChildren(), principalCollectionURL(), principalURL(), principalCollections()
         """
         for directory in directoryServices:
             #print "\n -> %s" % (directory.__class__.__name__,)
@@ -75,6 +77,11 @@
             provisioningURL = "/" + directory.__class__.__name__ + "/"
             self.assertEquals(provisioningURL, provisioningResource.principalCollectionURL())
 
+            principalCollections = waitForDeferred(provisioningResource.principalCollections(None))
+            yield principalCollections
+            principalCollections = principalCollections.getResult()
+            self.assertEquals(set((provisioningURL,)), set(principalCollections))
+
             recordTypes = set(provisioningResource.listChildren())
             self.assertEquals(recordTypes, set(directory.recordTypes()))
 
@@ -86,6 +93,11 @@
                 typeURL = provisioningURL + recordType + "/"
                 self.assertEquals(typeURL, typeResource.principalCollectionURL())
 
+                principalCollections = waitForDeferred(typeResource.principalCollections(None))
+                yield principalCollections
+                principalCollections = principalCollections.getResult()
+                self.assertEquals(set((provisioningURL,)), set(principalCollections))
+
                 shortNames = set(typeResource.listChildren())
                 self.assertEquals(shortNames, set(r.shortName for r in directory.listRecords(recordType)))
                 
@@ -96,3 +108,8 @@
 
                     recordURL = typeURL + shortName
                     self.assertEquals(recordURL, recordResource.principalURL())
+
+                    principalCollections = waitForDeferred(recordResource.principalCollections(None))
+                    yield principalCollections
+                    principalCollections = principalCollections.getResult()
+                    self.assertEquals(set((provisioningURL,)), set(principalCollections))

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