[CalendarServer-changes] [13762] CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/ datastore/test/test_sql_sharing.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 15 19:27:00 PDT 2014
Revision: 13762
http://trac.calendarserver.org//changeset/13762
Author: gaya at apple.com
Date: 2014-07-15 19:27:00 -0700 (Tue, 15 Jul 2014)
Log Message:
-----------
simplify compare loops
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 01:11:29 UTC (rev 13761)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-16 02:27:00 UTC (rev 13762)
@@ -694,17 +694,16 @@
self.assertEqual(len(shareeViews), 3)
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 3)
- shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
- invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
- for i in range(len(invites)):
- self.assertEqual(invites[i].uid, shareeViews[i].shareUID())
- self.assertEqual(invites[i].ownerUID, "user01")
- self.assertEqual(invites[i].shareeUID, shareeViews[i].viewerHome().uid())
- self.assertEqual(invites[i].mode, _BIND_MODE_GROUP)
- self.assertEqual((yield shareeViews[i].effectiveShareMode()), _BIND_MODE_READ)
- self.assertEqual(invites[i].status, _BIND_STATUS_INVITED)
- self.assertEqual(invites[i].summary, "summary")
- yield self._check_notifications(invites[i].shareeUID, [invites[i].uid, ])
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViews])
+ for invite in invites:
+ shareeView = shareeViewsDict[invite.uid]
+ 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_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
self.assertTrue(calendar.isShared())
@@ -721,8 +720,8 @@
self.assertEqual(len(uninvites), 0)
self.assertTrue(calendar.isShared())
- for i in range(len(invites)):
- yield self._check_notifications(invites[i].shareeUID, [])
+ for invite in invites:
+ yield self._check_notifications(invite.shareeUID, [])
yield self.commit()
@@ -748,17 +747,16 @@
self.assertEqual(len(shareeViews), 3)
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 3)
- shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
- invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
- for i in range(len(invites)):
- self.assertEqual(invites[i].uid, shareeViews[i].shareUID())
- self.assertEqual(invites[i].ownerUID, "user01")
- self.assertEqual(invites[i].shareeUID, shareeViews[i].viewerHome().uid())
- self.assertEqual(invites[i].mode, _BIND_MODE_GROUP)
- self.assertEqual((yield shareeViews[i].effectiveShareMode()), _BIND_MODE_READ)
- self.assertEqual(invites[i].status, _BIND_STATUS_INVITED)
- self.assertEqual(invites[i].summary, "summary")
- yield self._check_notifications(invites[i].shareeUID, [invites[i].uid, ])
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViews])
+ for invite in invites:
+ shareeView = shareeViewsDict[invite.uid]
+ 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_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
self.assertTrue(calendar.isShared())
@@ -803,17 +801,16 @@
self.assertEqual(len(shareeViews), 3)
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 3)
- shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
- invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
- for i in range(len(invites)):
- self.assertEqual(invites[i].uid, shareeViews[i].shareUID())
- self.assertEqual(invites[i].ownerUID, "user01")
- self.assertEqual(invites[i].shareeUID, shareeViews[i].viewerHome().uid())
- self.assertEqual(invites[i].mode, _BIND_MODE_GROUP)
- self.assertEqual((yield shareeViews[i].effectiveShareMode()), _BIND_MODE_READ)
- self.assertEqual(invites[i].status, _BIND_STATUS_INVITED)
- self.assertEqual(invites[i].summary, "summary")
- yield self._check_notifications(invites[i].shareeUID, [invites[i].uid, ])
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViews])
+ for invite in invites:
+ shareeView = shareeViewsDict[invite.uid]
+ 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_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
self.assertTrue(calendar.isShared())
@@ -858,17 +855,16 @@
self.assertEqual(len(shareeViews), 3)
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 3)
- shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
- invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
- for i in range(len(invites)):
- self.assertEqual(invites[i].uid, shareeViews[i].shareUID())
- self.assertEqual(invites[i].ownerUID, "user01")
- self.assertEqual(invites[i].shareeUID, shareeViews[i].viewerHome().uid())
- self.assertEqual(invites[i].mode, _BIND_MODE_GROUP)
- self.assertEqual((yield shareeViews[i].effectiveShareMode()), _BIND_MODE_READ)
- self.assertEqual(invites[i].status, _BIND_STATUS_INVITED)
- self.assertEqual(invites[i].summary, "summary")
- yield self._check_notifications(invites[i].shareeUID, [invites[i].uid, ])
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViews])
+ for invite in invites:
+ shareeView = shareeViewsDict[invite.uid]
+ 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_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
self.assertTrue(calendar.isShared())
@@ -913,17 +909,16 @@
self.assertEqual(len(shareeViews), 3)
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 3)
- shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
- invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
- for i in range(len(invites)):
- self.assertEqual(invites[i].uid, shareeViews[i].shareUID())
- self.assertEqual(invites[i].ownerUID, "user01")
- self.assertEqual(invites[i].shareeUID, shareeViews[i].viewerHome().uid())
- self.assertEqual(invites[i].mode, _BIND_MODE_GROUP)
- self.assertEqual((yield shareeViews[i].effectiveShareMode()), _BIND_MODE_READ)
- self.assertEqual(invites[i].status, _BIND_STATUS_INVITED)
- self.assertEqual(invites[i].summary, "summary")
- yield self._check_notifications(invites[i].shareeUID, [invites[i].uid, ])
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViews])
+ for invite in invites:
+ shareeView = shareeViewsDict[invite.uid]
+ 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_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
self.assertTrue(calendar.isShared())
@@ -968,17 +963,16 @@
self.assertEqual(len(shareeViews), 3)
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 3)
- shareeViews = sorted(shareeViews, key=lambda shareeView: shareeView.viewerHome().uid())
- invites = sorted(invites, key=lambda invitee: invitee.shareeUID)
- for i in range(len(invites)):
- self.assertEqual(invites[i].uid, shareeViews[i].shareUID())
- self.assertEqual(invites[i].ownerUID, "user01")
- self.assertEqual(invites[i].shareeUID, shareeViews[i].viewerHome().uid())
- self.assertEqual(invites[i].mode, _BIND_MODE_GROUP)
- self.assertEqual((yield shareeViews[i].effectiveShareMode()), _BIND_MODE_READ)
- self.assertEqual(invites[i].status, _BIND_STATUS_INVITED)
- self.assertEqual(invites[i].summary, "summary")
- yield self._check_notifications(invites[i].shareeUID, [invites[i].uid, ])
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViews])
+ for invite in invites:
+ shareeView = shareeViewsDict[invite.uid]
+ 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_INVITED)
+ self.assertEqual(invite.summary, "summary")
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
self.assertTrue(calendar.isShared())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140715/129aecd0/attachment-0001.html>
More information about the calendarserver-changes
mailing list