<!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>[14466] CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.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/14466">14466</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-23 09:56:13 -0800 (Mon, 23 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update test</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan4txdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan4txdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py (14465 => 14466)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py 2015-02-21 00:59:44 UTC (rev 14465)
+++ CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py 2015-02-23 17:56:13 UTC (rev 14466)
</span><span class="lines">@@ -563,6 +563,8 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _getResourceData(self, txn, userName, collectionName, resourceName):
</span><span class="cx"> resource = yield self._getResource(txn, userName, collectionName, resourceName)
</span><ins>+ if resource is None:
+ returnValue(None)
</ins><span class="cx"> component = yield resource.component()
</span><span class="cx"> returnValue(str(component).replace("\r\n ", ""))
</span><span class="cx">
</span><span class="lines">@@ -644,13 +646,10 @@
</span><span class="cx">
</span><span class="cx"> # One object in trash
</span><span class="cx"> objects = yield trash.listObjectResources()
</span><del>- print("OBJECT LIST", objects)
</del><span class="cx"> self.assertEquals(len(objects), 1)
</span><span class="cx">
</span><span class="cx"> # Put back from trash
</span><del>- print("FETCHING FROM TRASH USING", objects[0])
</del><span class="cx"> resource = yield self._getResource(txn, "user01", "trash", objects[0])
</span><del>- print("OBJECT NAME", resource._name)
</del><span class="cx"> yield resource.fromTrash()
</span><span class="cx">
</span><span class="cx"> # Not in trash
</span><span class="lines">@@ -783,7 +782,6 @@
</span><span class="cx"> """ % subs
</span><span class="cx">
</span><span class="cx"> # user01 invites user02
</span><del>- print("TEST: user01 creates resource START")
</del><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> yield self._createResource(
</span><span class="cx"> txn, "user01", "calendar", "test.ics", data1
</span><span class="lines">@@ -791,7 +789,6 @@
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</span><del>- print("TEST: user01 creates resource END")
</del><span class="cx">
</span><span class="cx"> # user01's copy has SCHEDULE-STATUS update
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="lines">@@ -803,12 +800,10 @@
</span><span class="cx"> self.assertEqual(len(resourceNames), 1)
</span><span class="cx">
</span><span class="cx"> # user02 accepts
</span><del>- print("TEST: user02 accepts START")
</del><span class="cx"> yield self._updateResource(txn, "user02", "calendar", "", data2)
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</span><del>- print("TEST: user02 accepts END")
</del><span class="cx">
</span><span class="cx"> # user01 has an inbox item
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="lines">@@ -825,14 +820,12 @@
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> # user01 trashes event
</span><del>- print("TEST: user01 trashes event START")
</del><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "calendar", "test.ics")
</span><span class="cx"> yield resource.remove()
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</span><del>- print("TEST: user01 trashes event END")
</del><span class="cx">
</span><span class="cx"> # user01's copy is in the trash, still with user02 accepted
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="lines">@@ -849,41 +842,28 @@
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "calendar", "")
</span><span class="cx"> self.assertTrue("STATUS:CANCELLED" in data)
</span><span class="cx"> resource = yield self._getResource(txn, "user02", "calendar", "")
</span><del>- print("PLUGH REMOVE user02's copy")
</del><span class="cx"> yield resource.remove()
</span><del>- print("PLUGH REMOVE user02's copy done")
</del><span class="cx"> data = yield self._getResource(txn, "user02", "trash", "")
</span><span class="cx"> self.assertEquals(data, None)
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> # user01 restores event from the trash
</span><del>- print("TEST: user01 restores event START")
</del><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "trash", "")
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "trash", "")
</span><del>- print("user01 trashed copy", data)
- print("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-")
</del><span class="cx"> yield resource.fromTrash()
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</span><del>- print("TEST: user01 restores event END")
</del><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx">
</span><span class="cx"> # user01's copy should be back on their calendar
</span><del>- names = yield self._getResourceNames(txn, "user01", "calendar")
- print("user01 names", names)
- data = yield self._getResourceData(txn, "user01", "calendar", "")
- print("WHAT?", data)
</del><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><del>- print("user01 copy")
- print(data)
</del><ins>+ self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</ins><span class="cx">
</span><span class="cx"> # user02's copy should be back on their calendar
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "calendar", "")
</span><del>- print("user02 copy")
- print(data)
</del><span class="cx"> self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</span><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><span class="lines">@@ -1001,9 +981,7 @@
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "calendar", "")
</span><span class="cx"> self.assertTrue("STATUS:CANCELLED" in data)
</span><span class="cx"> resource = yield self._getResource(txn, "user02", "calendar", "")
</span><del>- print("PLUGH REMOVE user02's copy")
</del><span class="cx"> yield resource.remove()
</span><del>- print("PLUGH REMOVE user02's copy done")
</del><span class="cx"> data = yield self._getResource(txn, "user02", "trash", "")
</span><span class="cx"> self.assertEquals(data, None)
</span><span class="cx"> yield txn.commit()
</span><span class="lines">@@ -1012,8 +990,6 @@
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "trash", "")
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "trash", "")
</span><del>- print("user01 trashed copy", data)
- print("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-")
</del><span class="cx"> yield resource.fromTrash()
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="lines">@@ -1023,13 +999,10 @@
</span><span class="cx">
</span><span class="cx"> # user01's copy should be back on their calendar
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><del>- print("user01 copy")
- print(data)
</del><ins>+ self.assertTrue("PARTSTAT=TENTATIVE" in data)
</ins><span class="cx">
</span><span class="cx"> # user02's copy should be back on their calendar
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "calendar", "")
</span><del>- print("user02 copy")
- print(data)
</del><span class="cx"> self.assertTrue("PARTSTAT=TENTATIVE" in data)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1150,9 +1123,7 @@
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "calendar", "")
</span><span class="cx"> self.assertTrue("STATUS:CANCELLED" in data)
</span><span class="cx"> resource = yield self._getResource(txn, "user02", "calendar", "")
</span><del>- print("PLUGH REMOVE user02's copy")
</del><span class="cx"> yield resource.remove()
</span><del>- print("PLUGH REMOVE user02's copy done")
</del><span class="cx"> data = yield self._getResource(txn, "user02", "trash", "")
</span><span class="cx"> self.assertEquals(data, None)
</span><span class="cx"> yield txn.commit()
</span><span class="lines">@@ -1160,9 +1131,6 @@
</span><span class="cx"> # user01 restores event from the trash
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "trash", "")
</span><del>- data = yield self._getResourceData(txn, "user01", "trash", "")
- print("user01 trashed copy", data)
- print("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-")
</del><span class="cx"> yield resource.fromTrash()
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="lines">@@ -1170,9 +1138,6 @@
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx">
</span><del>- # resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
- # print("user01's calendar", resourceNames)
-
</del><span class="cx"> # user01's trash should be empty
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user01", "trash")
</span><span class="cx"> self.assertEquals(len(resourceNames), 0)
</span><span class="lines">@@ -1186,24 +1151,25 @@
</span><span class="cx">
</span><span class="cx"> # user01's test.ics -- verify it got split correctly
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span><del>- print("user01 test.ics")
- print(data)
</del><ins>+ self.assertTrue("COUNT=15" in data)
</ins><span class="cx">
</span><span class="cx"> # user01's new .ics -- verify it got split correctly
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", newName)
</span><del>- print("user01 new ics")
- print(data)
</del><ins>+ self.assertTrue("RRULE:FREQ=WEEKLY;UNTIL=" in data)
</ins><span class="cx">
</span><ins>+ # user02's copy should be back on their calendar
+
</ins><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
</span><span class="cx"> print("user02's calendar", resourceNames)
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user02", "trash")
</span><span class="cx"> print("user02's trash", resourceNames)
</span><span class="cx">
</span><del>- # # user02's copy should be back on their calendar
- # data = yield self._getResourceData(txn, "user02", "calendar", "")
- # print("user02 copy")
- # print(data)
- # # self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</del><ins>+ data = yield self._getResourceData(txn, "user02", "calendar", "")
+ print("user02 copy")
+ if data is None:
+ print("Resource not found")
+ else:
+ print(data)
+ self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</ins><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><del>-
</del></span></pre>
</div>
</div>
</body>
</html>