<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13562] CalendarServer/trunk/txdav/who</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13562">13562</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-05-29 12:18:54 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>add tests for GroupCacher.groupsToRefresh()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_group_attendeespy">CalendarServer/trunk/txdav/who/test/test_group_attendees.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13561 => 13562)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py 2014-05-29 19:06:07 UTC (rev 13561)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-05-29 19:18:54 UTC (rev 13562)
</span><span class="lines">@@ -391,10 +391,7 @@
</span><span class="cx"> "There are {count} group delegates", count=len(delegatedUIDs)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- attendeeGroupUIDs = set()
-
</del><span class="cx"> # Get groupUIDs for aoo group attendees
</span><del>- # FIXME: this query does not have a unit test!
</del><span class="cx"> groupAttendee = schema.GROUP_ATTENDEE
</span><span class="cx"> gr = schema.GROUPS
</span><span class="cx"> rows = yield Select(
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_group_attendeespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_attendees.py (13561 => 13562)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-05-29 19:06:07 UTC (rev 13561)
+++ CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2014-05-29 19:18:54 UTC (rev 13562)
</span><span class="lines">@@ -486,6 +486,9 @@
</span><span class="cx"> self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
</span><span class="cx">
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 0)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="cx">
</span><span class="lines">@@ -502,7 +505,10 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
</span><del>-
</del><ins>+
+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 1)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -618,6 +624,9 @@
</span><span class="cx"> self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
</span><span class="cx">
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 0)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="cx">
</span><span class="lines">@@ -638,6 +647,9 @@
</span><span class="cx">
</span><span class="cx"> self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
</span><span class="cx">
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 1)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), len(userRange))
</span><span class="lines">@@ -717,6 +729,9 @@
</span><span class="cx"> yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 0)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> if len(wps): # This is needed because the test currently fails and does actually create job items we have to wait for
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -816,6 +831,9 @@
</span><span class="cx"> yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 1)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -946,6 +964,9 @@
</span><span class="cx"> yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 1)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -1104,6 +1125,9 @@
</span><span class="cx">
</span><span class="cx"> # cache group
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 3)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span><span class="lines">@@ -1113,7 +1137,7 @@
</span><span class="cx"> vcalendar = yield cobj.component()
</span><span class="cx"> self._assertICalStrEqual(vcalendar, data_get_1)
</span><span class="cx">
</span><del>- # remove group run cacher again
</del><ins>+ # remove group members run cacher again
</ins><span class="cx"> self.patch(DirectoryService, "recordWithUID", recordWithUID)
</span><span class="cx">
</span><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
</span><span class="lines">@@ -1132,7 +1156,7 @@
</span><span class="cx"> self.assertTrue("STATUS:CANCELLED" in str(comp))
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><del>- # add group back, run cacher
</del><ins>+ # add group members back, run cacher
</ins><span class="cx"> self.patch(DirectoryService, "recordWithUID", unpatchedRecordWithUID)
</span><span class="cx">
</span><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
</span><span class="lines">@@ -1260,6 +1284,9 @@
</span><span class="cx">
</span><span class="cx"> # cache groups
</span><span class="cx"> groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
</span><ins>+ groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
+ self.assertEqual(len(groupsToRefresh), 2)
+
</ins><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertEqual(len(wps), 1)
</span></span></pre>
</div>
</div>
</body>
</html>