<!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>[13337] CalendarServer/trunk</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/13337">13337</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 07:31:27 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes after recent split changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolscalverifypy">CalendarServer/trunk/calendarserver/tools/calverify.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_calverifypy">CalendarServer/trunk/calendarserver/tools/test/test_calverify.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolscalverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/calverify.py (13336 => 13337)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/calverify.py 2014-04-19 04:58:59 UTC (rev 13336)
+++ CalendarServer/trunk/calendarserver/tools/calverify.py 2014-04-19 14:31:27 UTC (rev 13337)
</span><span class="lines">@@ -2679,6 +2679,7 @@
</span><span class="cx">
</span><span class="cx"> oldObj = yield calendarObj.split(rid=rid)
</span><span class="cx"> oldUID = oldObj.uid()
</span><ins>+ oldRelated = (yield oldObj.component()).mainComponent().propertyValue("RELATED-TO")
</ins><span class="cx">
</span><span class="cx"> self.output.write("\n")
</span><span class="cx"> self.output.write("Split Resource: %s at %s, old UID: %s.\n" % (resid, rid, oldUID,))
</span><span class="lines">@@ -2686,7 +2687,7 @@
</span><span class="cx"> yield self.txn.commit()
</span><span class="cx"> self.txn = None
</span><span class="cx">
</span><del>- returnValue(oldUID)
</del><ins>+ returnValue((oldUID, oldRelated,))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_calverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_calverify.py (13336 => 13337)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_calverify.py 2014-04-19 04:58:59 UTC (rev 13336)
+++ CalendarServer/trunk/calendarserver/tools/test/test_calverify.py 2014-04-19 14:31:27 UTC (rev 13337)
</span><span class="lines">@@ -2577,7 +2577,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//Apple Inc.//iCal 4.0.1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=Example User1;EMAIL=example1@example.com:urn:x-uid:%(uuid1)s
</span><span class="lines">@@ -2596,7 +2596,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//Apple Inc.//iCal 4.0.1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=Example User1;EMAIL=example1@example.com:urn:x-uid:%(uuid1)s
</span><span class="lines">@@ -2732,10 +2732,11 @@
</span><span class="cx"> }
</span><span class="cx"> output = StringIO()
</span><span class="cx"> calverify = EventSplitService(self._sqlCalendarStore, options, output, reactor, config)
</span><del>- oldUID = yield calverify.doAction()
</del><ins>+ oldUID, oldRelatedTo = yield calverify.doAction()
</ins><span class="cx">
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = oldUID
</del><ins>+ relsubs["uid"] = oldUID
+ relsubs["relID"] = oldRelatedTo
</ins><span class="cx">
</span><span class="cx"> calendar = yield self.calendarUnderTest(home=CalVerifyMismatchTestsBase.uuid1, name="calendar")
</span><span class="cx"> objs = yield calendar.listObjectResources()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (13336 => 13337)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-04-19 04:58:59 UTC (rev 13336)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-04-19 14:31:27 UTC (rev 13337)
</span><span class="lines">@@ -2286,6 +2286,27 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def _splitDetails(self, home):
+ # Get home data
+ cal = yield self.calendarUnderTest(name="calendar", home=home)
+ cobjs = yield cal.calendarObjects()
+ self.assertEqual(len(cobjs), 2)
+ for cobj in cobjs:
+ self.assertTrue(cobj.isScheduleObject)
+ ical = yield cobj.component()
+ if ical.resourceUID() == "12345-67890":
+ ical_future = ical
+ else:
+ ical_past = ical
+ new_name = cobj.name()
+
+ relID = ical_future.mainComponent().propertyValue("RELATED-TO")
+ uid = ical_past.resourceUID()
+
+ returnValue((ical_future, ical_past, uid, relID, new_name,))
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_calendarObjectSplit(self):
</span><span class="cx"> """
</span><span class="cx"> Test that (manual) splitting of calendar objects works.
</span><span class="lines">@@ -2402,7 +2423,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE:mailto:user1@example.org
</span><span class="lines">@@ -2437,7 +2458,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2449,7 +2470,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2481,20 +2502,15 @@
</span><span class="cx"> will = yield cobj.willSplit()
</span><span class="cx"> self.assertTrue(will)
</span><span class="cx">
</span><del>- newObj = yield cobj.split()
- newUID = newObj.uid()
</del><ins>+ yield cobj.split()
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><del>- cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
- cobj2 = yield self.calendarObjectUnderTest(name="%s.ics" % (newUID,), calendar_name="calendar", home="user01")
- self.assertTrue(cobj2 is not None)
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user01")
</ins><span class="cx">
</span><del>- ical_future = yield cobj1.component()
- ical_past = yield cobj2.component()
-
</del><span class="cx"> title = "temp"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = pastUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span><span class="lines">@@ -2603,7 +2619,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -2620,7 +2636,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2633,7 +2649,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2682,7 +2698,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -2699,7 +2715,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2712,7 +2728,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2724,7 +2740,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user02
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="lines">@@ -2793,7 +2809,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -2812,7 +2828,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user03
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="lines">@@ -2850,7 +2866,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -2863,7 +2879,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user04
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="lines">@@ -2944,35 +2960,18 @@
</span><span class="cx"> yield self.abort()
</span><span class="cx">
</span><span class="cx"> # Get the existing and new object data
</span><del>- cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
- self.assertTrue(cobj1.isScheduleObject)
- ical1 = yield cobj1.component()
- newUID = ical1.masterComponent().propertyValue("RELATED-TO")
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user01")
</ins><span class="cx">
</span><del>- cobj2 = yield self.calendarObjectUnderTest(name="%s.ics" % (newUID,), calendar_name="calendar", home="user01")
- self.assertTrue(cobj2 is not None)
- self.assertTrue(cobj2.isScheduleObject)
-
- ical_future = yield cobj1.component()
- ical_past = yield cobj2.component()
-
</del><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = pastUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span><span class="cx"> # Get user02 data
</span><del>- cal = yield self.calendarUnderTest(name="calendar", home="user02")
- cobjs = yield cal.calendarObjects()
- self.assertEqual(len(cobjs), 2)
- for cobj in cobjs:
- ical = yield cobj.component()
- if ical.resourceUID() == "12345-67890":
- ical_future = ical
- else:
- ical_past = ical
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user02")
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="inbox", home="user02")
</span><span class="cx"> cobjs = yield cal.calendarObjects()
</span><span class="lines">@@ -2986,16 +2985,7 @@
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_inbox), normalize_iCalStr(data_inbox2) % relsubs, "Failed inbox: %s" % (title,))
</span><span class="cx">
</span><span class="cx"> # Get user03 data
</span><del>- cal = yield self.calendarUnderTest(name="calendar", home="user03")
- cobjs = yield cal.calendarObjects()
- self.assertEqual(len(cobjs), 2)
- for cobj in cobjs:
- ical = yield cobj.component()
- if ical.resourceUID() == "12345-67890":
- ical_future = ical
- else:
- ical_past = ical
- self.assertTrue(cobj.isScheduleObject)
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user03")
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="inbox", home="user03")
</span><span class="cx"> cobjs = yield cal.calendarObjects()
</span><span class="lines">@@ -3567,7 +3557,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTACH;FILENAME=new.attachment;FMTTYPE=text/x-fixture;MANAGED-ID=%(past_mid)s;SIZE=14:%(att_past_uri)s
</span><span class="lines">@@ -3584,7 +3574,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -3597,7 +3587,7 @@
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -3659,7 +3649,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTACH;FILENAME=new.attachment;FMTTYPE=text/x-fixture;MANAGED-ID=%(past_mid)s;SIZE=14:%(att_past_uri)s
</span><span class="lines">@@ -3676,7 +3666,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -3689,7 +3679,7 @@
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -3702,7 +3692,7 @@
</span><span class="cx"> SEQUENCE:3
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user02
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="lines">@@ -3747,15 +3737,11 @@
</span><span class="cx"> yield work.whenExecuted()
</span><span class="cx">
</span><span class="cx"> # Get the existing and new object data
</span><del>- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
- ical_future = yield cobj.component()
- newUID = ical_future.masterComponent().propertyValue("RELATED-TO")
- relsubs["relID"] = newUID
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user01")
+ relsubs["uid"] = pastUID
+ relsubs["relID"] = relID
</ins><span class="cx"> relsubs["dtstamp"] = str(ical_future.masterComponent().propertyValue("DTSTAMP"))
</span><span class="cx">
</span><del>- cobj = yield self.calendarObjectUnderTest(name="%s.ics" % (newUID,), calendar_name="calendar", home="user01")
- self.assertTrue(cobj is not None)
- ical_past = yield cobj.component()
</del><span class="cx"> attachment = ical.masterComponent().getProperty("ATTACH")
</span><span class="cx"> self.assertEqual(attachment.parameterValue("MANAGED-ID"), mid)
</span><span class="cx"> self.assertEqual(attachment.value(), location)
</span><span class="lines">@@ -3769,15 +3755,7 @@
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span><span class="cx"> # Get user02 data
</span><del>- cal = yield self.calendarUnderTest(name="calendar", home="user02")
- cobjs = yield cal.calendarObjects()
- self.assertEqual(len(cobjs), 2)
- for cobj in cobjs:
- ical = yield cobj.component()
- if ical.resourceUID() == "12345-67890":
- ical_future = ical
- else:
- ical_past = ical
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user02")
</ins><span class="cx">
</span><span class="cx"> # Verify user02 data
</span><span class="cx"> title = "user02"
</span><span class="lines">@@ -3916,7 +3894,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> RRULE:FREQ=DAILY
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> SUMMARY:1234567890123456789012345678901234567890
</span><span class="lines">@@ -3933,7 +3911,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=TENTATIVE:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><span class="lines">@@ -3969,7 +3947,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> RRULE:FREQ=DAILY;UNTIL=%(now_back14_1)s
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> SUMMARY:1234567890123456789012345678901234567890
</span><span class="lines">@@ -3986,7 +3964,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=NEEDS-ACTION:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="lines">@@ -3998,7 +3976,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=DECLINED:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><span class="lines">@@ -4047,7 +4025,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> RRULE:FREQ=DAILY;UNTIL=%(now_back14_1)s
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> SUMMARY:1234567890123456789012345678901234567890
</span><span class="lines">@@ -4064,7 +4042,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=NEEDS-ACTION:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><span class="lines">@@ -4076,7 +4054,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=DECLINED:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="lines">@@ -4104,26 +4082,21 @@
</span><span class="cx"> self.assertEqual(result, (True, False, False, None,))
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><del>- new_name = []
</del><ins>+ new_names = []
+ relsubs = dict(self.subs)
</ins><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _verify_state():
</span><span class="cx"> # Get user01 data
</span><del>- cal = yield self.calendarUnderTest(name="calendar", home="user01")
- cobjs = yield cal.calendarObjects()
- self.assertEqual(len(cobjs), 2)
- for cobj in cobjs:
- ical = yield cobj.component()
- if ical.resourceUID() == "12345-67890":
- ical_future = ical
- else:
- ical_past = ical
- new_name.append(cobj.name())
</del><ins>+ ical_future, ical_past, pastUID, relID, new_name = yield self._splitDetails("user01")
+ relsubs["uid"] = pastUID
+ relsubs["relID"] = relID
+ new_names.append(new_name)
</ins><span class="cx">
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><del>- self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % self.subs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % self.subs),))
- self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % self.subs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % self.subs),))
</del><ins>+ self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % relsubs),))
+ self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % relsubs),))
</ins><span class="cx">
</span><span class="cx"> # No inbox
</span><span class="cx"> cal = yield self.calendarUnderTest(name="inbox", home="user01")
</span><span class="lines">@@ -4137,11 +4110,11 @@
</span><span class="cx"> processor = ImplicitProcessor()
</span><span class="cx"> processor.getRecipientsCopy = lambda : succeed(None)
</span><span class="cx">
</span><del>- cobj = yield self.calendarObjectUnderTest(name=new_name[0], calendar_name="calendar", home="user01")
</del><ins>+ cobj = yield self.calendarObjectUnderTest(name=new_names[0], calendar_name="calendar", home="user01")
</ins><span class="cx"> self.assertTrue(cobj is not None)
</span><span class="cx"> processor.recipient_calendar_resource = cobj
</span><span class="cx"> processor.recipient_calendar = (yield cobj.componentForUser("user01"))
</span><del>- processor.message = Component.fromString(itip2 % self.subs)
</del><ins>+ processor.message = Component.fromString(itip2 % relsubs)
</ins><span class="cx"> processor.originator = RemoteCalendarUser("mailto:cuser01@example.org")
</span><span class="cx"> processor.recipient = LocalCalendarUser("urn:x-uid:user01", None)
</span><span class="cx"> processor.method = "REQUEST"
</span><span class="lines">@@ -4220,7 +4193,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=NEEDS-ACTION:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><span class="lines">@@ -4262,15 +4235,18 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> # Get user01 data
</span><ins>+ relsubs = dict(self.subs)
</ins><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.calendarObjects()
</span><span class="cx"> self.assertEqual(len(cobjs), 1)
</span><span class="cx"> ical = yield cobjs[0].component()
</span><span class="cx"> ical_past = ical
</span><ins>+ relsubs["uid"] = ical.resourceUID()
+ relsubs["relID"] = ical.mainComponent().propertyValue("RELATED-TO")
</ins><span class="cx">
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><del>- self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % self.subs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % self.subs),))
</del><ins>+ self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % relsubs),))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -4339,7 +4315,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=TENTATIVE:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><span class="lines">@@ -4380,15 +4356,18 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> # Get user01 data
</span><ins>+ relsubs = dict(self.subs)
</ins><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.calendarObjects()
</span><span class="cx"> self.assertEqual(len(cobjs), 1)
</span><span class="cx"> ical = yield cobjs[0].component()
</span><span class="cx"> ical_future = ical
</span><ins>+ relsubs["uid"] = ical.resourceUID()
+ relsubs["relID"] = ical.mainComponent().propertyValue("RELATED-TO")
</ins><span class="cx">
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><del>- self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % self.subs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % self.subs),))
</del><ins>+ self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % relsubs),))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -4478,7 +4457,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=TENTATIVE:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><span class="lines">@@ -4508,7 +4487,7 @@
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=NEEDS-ACTION:urn:x-uid:user01
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="cx"> ORGANIZER;SCHEDULE-AGENT=NONE:mailto:cuser01@example.org
</span><del>-RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:C4526F4C-4324-4893-B769-BD766E4A4E7C
</del><ins>+RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><span class="lines">@@ -4550,20 +4529,15 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> # Get user01 data
</span><del>- cal = yield self.calendarUnderTest(name="calendar", home="user01")
- cobjs = yield cal.calendarObjects()
- self.assertEqual(len(cobjs), 2)
- for cobj in cobjs:
- ical = yield cobj.component()
- if ical.resourceUID() == "12345-67890":
- ical_future = ical
- else:
- ical_past = ical
</del><ins>+ ical_future, ical_past, pastUID, relID, _ignore_new_name = yield self._splitDetails("user01")
+ relsubs = dict(self.subs)
+ relsubs["uid"] = pastUID
+ relsubs["relID"] = relID
</ins><span class="cx">
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><del>- self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % self.subs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % self.subs),))
- self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % self.subs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % self.subs),))
</del><ins>+ self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % relsubs),))
+ self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % relsubs),))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -4890,7 +4864,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -4907,7 +4881,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -4920,7 +4894,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -4969,7 +4943,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -4986,7 +4960,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -4999,7 +4973,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5011,7 +4985,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user02
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="lines">@@ -5049,7 +5023,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> METHOD:REQUEST
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><del>-X-CALENDARSERVER-SPLIT-OLDER-UID:%(relID)s
</del><ins>+X-CALENDARSERVER-SPLIT-OLDER-UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-SPLIT-RID;VALUE=DATE-TIME:%(now_back14)s
</span><span class="cx"> BEGIN:VEVENT
</span><span class="cx"> UID:12345-67890
</span><span class="lines">@@ -5090,7 +5064,7 @@
</span><span class="cx"> X-CALENDARSERVER-SPLIT-NEWER-UID:12345-67890
</span><span class="cx"> X-CALENDARSERVER-SPLIT-RID;VALUE=DATE-TIME:%(now_back14)s
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -5108,7 +5082,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5161,22 +5135,23 @@
</span><span class="cx"> yield self.abort()
</span><span class="cx">
</span><span class="cx"> # Get the existing and new object data
</span><del>- cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
- self.assertTrue(cobj1.isScheduleObject)
- ical1 = yield cobj1.component()
- newUID = ical1.masterComponent().propertyValue("RELATED-TO")
</del><ins>+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
+ cobjs = yield cal.calendarObjects()
+ self.assertEqual(len(cobjs), 2)
+ for cobj in cobjs:
+ ical = yield cobj.component()
+ if ical.resourceUID() == "12345-67890":
+ ical_future = ical
+ else:
+ ical_past = ical
+ relID = ical_future.masterComponent().propertyValue("RELATED-TO")
+ newUID = ical_past.masterComponent().propertyValue("UID")
</ins><span class="cx">
</span><del>- cobj2 = yield self.calendarObjectUnderTest(name="%s.ics" % (newUID,), calendar_name="calendar", home="user01")
- self.assertTrue(cobj2 is not None)
- self.assertTrue(cobj2.isScheduleObject)
-
- ical_future = yield cobj1.component()
- ical_past = yield cobj2.component()
-
</del><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = newUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s\n%s" % (title, diff_iCalStrs(ical_future, data_future % relsubs),))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s\n%s" % (title, diff_iCalStrs(ical_past, data_past % relsubs),))
</span><span class="cx">
</span><span class="lines">@@ -5356,7 +5331,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT2H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -5372,7 +5347,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5384,7 +5359,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5443,7 +5418,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back30)s
</span><span class="cx"> DURATION:PT2H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -5459,7 +5434,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5471,7 +5446,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5483,7 +5458,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user02
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="lines">@@ -5594,22 +5569,25 @@
</span><span class="cx"> yield self.abort()
</span><span class="cx">
</span><span class="cx"> # Get the existing and new object data
</span><del>- cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
- self.assertTrue(cobj1.isScheduleObject)
- ical1 = yield cobj1.component()
- newUID = ical1.masterComponent().propertyValue("RELATED-TO")
</del><ins>+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
+ cobjs = yield cal.calendarObjects()
+ self.assertEqual(len(cobjs), 2)
+ for cobj in cobjs:
+ self.assertTrue(cobj.isScheduleObject)
+ ical = yield cobj.component()
+ if ical.resourceUID() == "12345-67890":
+ ical_future = ical
+ else:
+ ical_past = ical
</ins><span class="cx">
</span><del>- cobj2 = yield self.calendarObjectUnderTest(name="%s.ics" % (newUID,), calendar_name="calendar", home="user01")
- self.assertTrue(cobj2 is not None)
- self.assertTrue(cobj2.isScheduleObject)
</del><ins>+ relID = ical_future.masterComponent().propertyValue("RELATED-TO")
+ newUID = ical_past.masterComponent().propertyValue("UID")
</ins><span class="cx">
</span><del>- ical_future = yield cobj1.component()
- ical_past = yield cobj2.component()
-
</del><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = newUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span><span class="lines">@@ -5737,7 +5715,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back28)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -5753,7 +5731,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5765,7 +5743,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5824,7 +5802,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back28)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> ATTENDEE;CN=User 01;EMAIL=user01@example.com;PARTSTAT=ACCEPTED:urn:x-uid:user01
</span><span class="lines">@@ -5840,7 +5818,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5852,7 +5830,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -5864,7 +5842,7 @@
</span><span class="cx"> SEQUENCE:1
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERUSER
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> X-CALENDARSERVER-PERUSER-UID:user02
</span><span class="cx"> BEGIN:X-CALENDARSERVER-PERINSTANCE
</span><span class="cx"> TRANSP:TRANSPARENT
</span><span class="lines">@@ -6006,7 +5984,7 @@
</span><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> DTSTART:%(now_back28)s
</span><span class="cx"> DURATION:PT1H
</span><span class="cx"> DTSTAMP:20051222T210507Z
</span><span class="lines">@@ -6018,7 +5996,7 @@
</span><span class="cx"> 1234567890123456789012345678901234567890
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back25)s
</span><span class="cx"> DTSTART:%(now_back25)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -6026,7 +6004,7 @@
</span><span class="cx"> RELATED-TO;RELTYPE=X-CALENDARSERVER-RECURRENCE-SET:%(relID)s
</span><span class="cx"> END:VEVENT
</span><span class="cx"> BEGIN:VEVENT
</span><del>-UID:%(relID)s
</del><ins>+UID:%(uid)s
</ins><span class="cx"> RECURRENCE-ID:%(now_back24)s
</span><span class="cx"> DTSTART:%(now_back24)s
</span><span class="cx"> DURATION:PT1H
</span><span class="lines">@@ -6087,11 +6065,13 @@
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="cx"> self.assertTrue(cobj1.isScheduleObject)
</span><span class="cx"> ical1 = yield cobj1.component()
</span><del>- newUID = ical1.masterComponent().propertyValue("RELATED-TO")
</del><ins>+ relID = ical1.masterComponent().propertyValue("RELATED-TO")
</ins><span class="cx">
</span><span class="cx"> cobj2 = yield self.calendarObjectUnderTest(name=oldname, calendar_name="calendar", home="user01")
</span><span class="cx"> self.assertTrue(cobj2 is not None)
</span><span class="cx"> self.assertTrue(cobj2.isScheduleObject)
</span><ins>+ ical2 = yield cobj2.component()
+ newUID = ical2.masterComponent().propertyValue("UID")
</ins><span class="cx">
</span><span class="cx"> ical_future = yield cobj1.component()
</span><span class="cx"> ical_past = yield cobj2.component()
</span><span class="lines">@@ -6099,7 +6079,8 @@
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = newUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span><span class="lines">@@ -6160,11 +6141,13 @@
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="cx"> self.assertTrue(cobj1.isScheduleObject)
</span><span class="cx"> ical1 = yield cobj1.component()
</span><del>- newUID = ical1.masterComponent().propertyValue("RELATED-TO")
</del><ins>+ relID = ical1.masterComponent().propertyValue("RELATED-TO")
</ins><span class="cx">
</span><span class="cx"> cobj2 = yield self.calendarObjectUnderTest(name=oldname, calendar_name="calendar", home="user01")
</span><span class="cx"> self.assertTrue(cobj2 is not None)
</span><span class="cx"> self.assertTrue(cobj2.isScheduleObject)
</span><ins>+ ical2 = yield cobj2.component()
+ newUID = ical2.masterComponent().propertyValue("UID")
</ins><span class="cx">
</span><span class="cx"> ical_future = yield cobj1.component()
</span><span class="cx"> ical_past = yield cobj2.component()
</span><span class="lines">@@ -6172,7 +6155,8 @@
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = newUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span><span class="lines">@@ -6233,11 +6217,13 @@
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="cx"> self.assertTrue(cobj1.isScheduleObject)
</span><span class="cx"> ical1 = yield cobj1.component()
</span><del>- newUID = ical1.masterComponent().propertyValue("RELATED-TO")
</del><ins>+ relID = ical1.masterComponent().propertyValue("RELATED-TO")
</ins><span class="cx">
</span><span class="cx"> cobj2 = yield self.calendarObjectUnderTest(name=oldname, calendar_name="calendar", home="user01")
</span><span class="cx"> self.assertTrue(cobj2 is not None)
</span><span class="cx"> self.assertTrue(cobj2.isScheduleObject)
</span><ins>+ ical2 = yield cobj2.component()
+ newUID = ical2.masterComponent().propertyValue("UID")
</ins><span class="cx">
</span><span class="cx"> ical_future = yield cobj1.component()
</span><span class="cx"> ical_past = yield cobj2.component()
</span><span class="lines">@@ -6245,7 +6231,8 @@
</span><span class="cx"> # Verify user01 data
</span><span class="cx"> title = "user01"
</span><span class="cx"> relsubs = dict(self.subs)
</span><del>- relsubs["relID"] = newUID
</del><ins>+ relsubs["uid"] = newUID
+ relsubs["relID"] = relID
</ins><span class="cx"> self.assertEqual(normalize_iCalStr(ical_future), normalize_iCalStr(data_future) % relsubs, "Failed future: %s" % (title,))
</span><span class="cx"> self.assertEqual(normalize_iCalStr(ical_past), normalize_iCalStr(data_past) % relsubs, "Failed past: %s" % (title,))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>