[CalendarServer-changes] [13764] CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/ datastore/test/test_sql_sharing.py

[source_changes at macosforge.org]

Revision: 13764
          http://trac.calendarserver.org//changeset/13764
Author:   gaya at apple.com
Date:     2014-07-16 12:40:51 -0700 (Wed, 16 Jul 2014)
Log Message:
-----------
use calendar.shareeView() to find shareeView

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py

Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py	2014-07-16 16:07:54 UTC (rev 13763)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py	2014-07-16 19:40:51 UTC (rev 13764)
@@ -1256,8 +1256,9 @@
         invites = yield calendar.sharingInvites()
         self.assertEqual(len(invites), 3)
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
             self.assertNotEqual(shareeView, None)
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.ownerUID, "user01")
             self.assertEqual(invite.mode, _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
@@ -1328,10 +1329,11 @@
         self.assertEqual(len(invites), 1)
 
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            print("invite = %s" % (invite,))
+            shareeView = yield calendar.shareeView(invite.shareeUID)
             self.assertNotEqual(shareeView, None)
             self.assertEqual(invite.ownerUID, "user01")
-            self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.mode, _BIND_MODE_READ)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
             self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
@@ -1404,10 +1406,10 @@
         invites = yield calendar.sharingInvites()
         self.assertEqual(len(invites), 4)
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
             self.assertNotEqual(shareeView, None)
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.ownerUID, "user01")
-            self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
             self.assertEqual(invite.mode, _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
             self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
@@ -1421,10 +1423,10 @@
         self.assertEqual(len(invites), 3)
 
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
             self.assertNotEqual(shareeView, None)
             self.assertEqual(invite.ownerUID, "user01")
-            self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.mode, _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
             self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
@@ -1500,7 +1502,9 @@
         self.assertEqual(len(invites), 4)
 
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
+            self.assertNotEqual(shareeView, None)
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.mode, _BIND_MODE_GROUP_READ if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE if shareeView in shareeViewsGroup02 else _BIND_MODE_READ)
             yield self._check_notifications(invite.shareeUID, [invite.uid, ])
@@ -1518,7 +1522,9 @@
         self.assertEqual(len(invites), 4)
 
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
+            self.assertNotEqual(shareeView, None)
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.mode, _BIND_MODE_GROUP_WRITE if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE if shareeView in shareeViewsGroup03 else _BIND_MODE_READ)
             yield self._check_notifications(invite.shareeUID, [invite.uid, ])
@@ -1531,8 +1537,9 @@
         invites = yield calendar.sharingInvites()
         self.assertEqual(len(invites), 4)
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
             self.assertNotEqual(shareeView, None)
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.ownerUID, "user01")
             self.assertEqual(invite.mode, _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ if invite.shareeUID == "user06" else _BIND_MODE_WRITE)
@@ -1547,8 +1554,9 @@
         self.assertEqual(len(invites), 3)
 
         for invite in invites:
-            shareeView = yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)
+            shareeView = yield calendar.shareeView(invite.shareeUID)
             self.assertNotEqual(shareeView, None)
+            self.assertEqual(invite.uid, shareeView.shareName())
             self.assertEqual(invite.ownerUID, "user01")
             self.assertEqual(invite.mode, _BIND_MODE_GROUP)
             self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_WRITE)
@@ -1567,7 +1575,6 @@
 
 
 
-
 class SharingRevisions(BaseSharingTests):
     """
     Test store-based sharing and interaction with revision table.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140716/76edb762/attachment.html>