<!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>[12333] CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py</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/12333">12333</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-13 22:07:17 -0800 (Mon, 13 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>add test_calendarObjectRevisions</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py (12332 => 12333)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-14 01:26:24 UTC (rev 12332)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-14 06:07:17 UTC (rev 12333)
</span><span class="lines">@@ -23,8 +23,9 @@
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.vcard import Component as VCard
</span><ins>+from txdav.caldav.datastore.test.util import buildCalendarStore
</ins><span class="cx"> from txdav.common.datastore.sql_tables import  schema
</span><del>-from txdav.common.datastore.test.util import buildStore, CommonCommonTests
</del><ins>+from txdav.common.datastore.test.util import CommonCommonTests, populateCalendarsFrom
</ins><span class="cx"> from txdav.common.datastore.work.revision_cleanup import FindMinValidRevisionWork, RevisionCleanupWork
</span><span class="cx"> from txdav.common.icommondatastore import SyncTokenValidException
</span><span class="cx"> import datetime
</span><span class="lines">@@ -39,7 +40,7 @@
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def setUp(self):
</span><span class="cx">         yield super(RevisionCleanupTests, self).setUp()
</span><del>-        self._sqlStore = yield buildStore(self, self.notifierFactory)
</del><ins>+        self._sqlStore = yield buildCalendarStore(self, self.notifierFactory)
</ins><span class="cx">         yield self.populate()
</span><span class="cx"> 
</span><span class="cx">         class FakeWork(WorkItem):
</span><span class="lines">@@ -55,8 +56,9 @@
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def populate(self):
</span><span class="cx">         populateTxn = self.storeUnderTest().newTransaction()
</span><del>-        for homeUID in self.requirements:
-            addressbooks = self.requirements[homeUID]
</del><ins>+        addressookRequirements = self.requirements[&quot;addressbook&quot;]
+        for homeUID in addressookRequirements:
+            addressbooks = addressookRequirements[homeUID]
</ins><span class="cx">             if addressbooks is not None:
</span><span class="cx">                 home = yield populateTxn.addressbookHomeWithUID(homeUID, True)
</span><span class="cx">                 addressbook = home.addressbook()
</span><span class="lines">@@ -70,8 +72,57 @@
</span><span class="cx">                         )
</span><span class="cx"> 
</span><span class="cx">         yield populateTxn.commit()
</span><ins>+
+        calendarRequirements = self.requirements[&quot;calendar&quot;]
+        yield populateCalendarsFrom(calendarRequirements, self.storeUnderTest())
+
</ins><span class="cx">         self.notifierFactory.reset()
</span><span class="cx"> 
</span><ins>+    cal1 = &quot;&quot;&quot;BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:uid1
+DTSTART:20131122T140000
+DURATION:PT1H
+CREATED:20060102T190000Z
+DTSTAMP:20051222T210507Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
+&quot;&quot;&quot;
+
+    cal2 = &quot;&quot;&quot;BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:uid2
+DTSTART:20131122T140000
+DURATION:PT1H
+CREATED:20060102T190000Z
+DTSTAMP:20051222T210507Z
+SUMMARY:event 2
+END:VEVENT
+END:VCALENDAR
+&quot;&quot;&quot;
+
+    cal3 = &quot;&quot;&quot;BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:uid3
+DTSTART:20131122T140000
+DURATION:PT1H
+CREATED:20060102T190000Z
+DTSTAMP:20051222T210507Z
+SUMMARY:event 3
+END:VEVENT
+END:VCALENDAR
+&quot;&quot;&quot;
+
</ins><span class="cx">     # Data to populate
</span><span class="cx">     card1 = &quot;&quot;&quot;BEGIN:VCARD
</span><span class="cx"> VERSION:3.0
</span><span class="lines">@@ -139,20 +190,46 @@
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="cx"> 
</span><span class="cx">     @classproperty(cache=False)
</span><del>-    def requirements(cls): #@NoSelf
</del><ins>+    def calRequirements(cls): #@NoSelf
</ins><span class="cx">         return {
</span><span class="cx">         &quot;user01&quot;: {
</span><del>-            &quot;addressbook&quot;: {
-                &quot;card1.vcf&quot;: cls.card1,
-                &quot;card2.vcf&quot;: cls.card2,
-                &quot;card3.vcf&quot;: cls.card3,
-                &quot;group1.vcf&quot;: cls.group1,
-                &quot;group2.vcf&quot;: cls.group2,
</del><ins>+            &quot;calendar&quot;: {
+                &quot;cal1.ics&quot;: (cls.cal1, None,),
+                &quot;cal2.ics&quot;: (cls.cal2, None,),
+                &quot;cal3.ics&quot;: (cls.cal3, None,),
</ins><span class="cx">             },
</span><ins>+            &quot;inbox&quot;: {
+            },
</ins><span class="cx">         },
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @classproperty(cache=False)
+    def requirements(cls): #@NoSelf
+        return {
+            &quot;addressbook&quot;: {
+                &quot;user01&quot;: {
+                    &quot;addressbook&quot;: {
+                        &quot;card1.vcf&quot;: cls.card1,
+                        &quot;card2.vcf&quot;: cls.card2,
+                        &quot;card3.vcf&quot;: cls.card3,
+                        &quot;group1.vcf&quot;: cls.group1,
+                        &quot;group2.vcf&quot;: cls.group2,
+                    },
+                },
+            }, &quot;calendar&quot;: {
+                &quot;user01&quot;: {
+                    &quot;calendar&quot;: {
+                        &quot;cal1.ics&quot;: (cls.cal1, None,),
+                        &quot;cal2.ics&quot;: (cls.cal2, None,),
+                    },
+                    &quot;inbox&quot;: {
+                    },
+                },
+            }
+        }
+
+
</ins><span class="cx">     def storeUnderTest(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Create and return a L{CalendarStore} for testing.
</span><span class="lines">@@ -160,10 +237,62 @@
</span><span class="cx">         return self._sqlStore
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @inlineCallbacks
</ins><span class="cx">     def test_calendarObjectRevisions(self):
</span><del>-        pass
</del><ins>+        &quot;&quot;&quot;
+        Verify that all extra addressbook object revisions are deleted by the cleaning work items
+        &quot;&quot;&quot;
</ins><span class="cx"> 
</span><ins>+        # get sync token
+        calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
+        token = yield calendar.syncToken()
</ins><span class="cx"> 
</span><ins>+        #make changes
+        cal1Object = yield self.calendarObjectUnderTest(self.transactionUnderTest(), name=&quot;cal1.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)
+        yield cal1Object.remove()
+        cal2Object = yield self.calendarObjectUnderTest(self.transactionUnderTest(), name=&quot;cal2.ics&quot;, calendar_name=&quot;calendar&quot;, home=&quot;user01&quot;)
+        yield cal2Object.remove()
+
+        # Get object revisions
+        rev = schema.CALENDAR_OBJECT_REVISIONS
+        revisionRows = yield Select(
+            [rev.REVISION],
+            From=rev,
+        ).on(self.transactionUnderTest())
+        self.assertNotEqual(len(revisionRows), 0)
+
+        # do FindMinValidRevisionWork
+        wp = yield self.transactionUnderTest().enqueue(FindMinValidRevisionWork, notBefore=datetime.datetime.utcnow())
+        yield self.commit()
+        yield wp.whenExecuted()
+
+        # Get the minimum valid revision and check it
+        cs = schema.CALENDARSERVER
+        minValidRevision = int((yield Select(
+            [cs.VALUE],
+            From=cs,
+            Where=(cs.NAME == &quot;MIN-VALID-REVISION&quot;)
+        ).on(self.transactionUnderTest()))[0][0])
+        self.assertEqual(minValidRevision, max([row[0] for row in revisionRows]))
+
+        # do RevisionCleanupWork
+        wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
+        yield self.commit()
+        yield wp.whenExecuted()
+
+        # Get group1 object revision
+        rev = schema.CALENDAR_OBJECT_REVISIONS
+        revisionRows = yield Select(
+            [rev.REVISION],
+            From=rev,
+        ).on(self.transactionUnderTest())
+        self.assertEqual(len(revisionRows), 1)  # deleteRevisionsBefore() leaves 1 revision behind
+
+        # old sync token fails
+        calendar = yield self.calendarUnderTest(home=&quot;user01&quot;, name=&quot;calendar&quot;)
+        self.failUnlessFailure(calendar.resourceNamesSinceToken(token), SyncTokenValidException)
+
+
</ins><span class="cx">     def test_notificationObjectRevisions(self):
</span><span class="cx">         pass
</span><span class="cx"> 
</span><span class="lines">@@ -217,7 +346,7 @@
</span><span class="cx">             [rev.REVISION],
</span><span class="cx">             From=rev,
</span><span class="cx">         ).on(self.transactionUnderTest())
</span><del>-        self.assertEqual(len(revisionRows), 1)  # current algo leaves 1 revision behind TOTAL, so what?
</del><ins>+        self.assertEqual(len(revisionRows), 1)  # deleteRevisionsBefore() leaves 1 revision behind
</ins><span class="cx"> 
</span><span class="cx">         # old sync token fails
</span><span class="cx">         addressbook = yield self.addressbookUnderTest(home=&quot;user01&quot;, name=&quot;addressbook&quot;)
</span><span class="lines">@@ -270,15 +399,6 @@
</span><span class="cx">         ).on(self.transactionUnderTest())
</span><span class="cx">         self.assertEqual(len(group2Rows), 4)  # 2 members x 2 revisions each
</span><span class="cx"> 
</span><del>-        # Get the minimum valid revision
-        cs = schema.CALENDARSERVER
-        minValidRevision = int((yield Select(
-            [cs.VALUE],
-            From=cs,
-            Where=(cs.NAME == &quot;MIN-VALID-REVISION&quot;)
-        ).on(self.transactionUnderTest()))[0][0])
-        self.assertEqual(minValidRevision, 1)
-
</del><span class="cx">         # do FindMinValidRevisionWork
</span><span class="cx">         wp = yield self.transactionUnderTest().enqueue(FindMinValidRevisionWork, notBefore=datetime.datetime.utcnow())
</span><span class="cx">         yield self.commit()
</span></span></pre>
</div>
</div>

</body>
</html>