<!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>[13942] CalendarServer/trunk/twistedcaldav</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/13942">13942</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-05 13:35:08 -0700 (Fri, 05 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix issue with group reconciliation when an attendee is removed as a member of one group but is still a member of another.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_icalendarpy">CalendarServer/trunk/twistedcaldav/test/test_icalendar.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13941 => 13942)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-09-05 20:25:47 UTC (rev 13941)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-09-05 20:35:08 UTC (rev 13942)
</span><span class="lines">@@ -3501,16 +3501,16 @@
</span><span class="cx"> # remove attendee or update MEMBER attribute for non-primary attendees in this group,
</span><span class="cx"> for attendeeProp in oldAttendeeProps:
</span><span class="cx"> if attendeeProp.hasParameter("MEMBER"):
</span><del>- parameterValues = tuple(attendeeProp.parameterValues("MEMBER"))
- if groupCUA in parameterValues:
</del><ins>+ memberValues = attendeeProp.parameterValues("MEMBER")
+ if groupCUA in tuple(memberValues):
</ins><span class="cx"> if attendeeProp.value() not in memberCUAs:
</span><del>- attendeeProp.removeParameterValue("MEMBER", groupCUA)
- if not attendeeProp.parameterValues("MEMBER"):
</del><ins>+ memberValues.remove(groupCUA)
+ if len(memberValues) == 0:
</ins><span class="cx"> component.removeProperty(attendeeProp)
</span><span class="cx"> changed = True
</span><span class="cx"> else:
</span><span class="cx"> if attendeeProp.value() in memberCUAs:
</span><del>- attendeeProp.setParameter("MEMBER", parameterValues + (groupCUA,))
</del><ins>+ memberValues.append(groupCUA)
</ins><span class="cx"> changed = True
</span><span class="cx">
</span><span class="cx"> return changed
</span><span class="lines">@@ -3537,10 +3537,10 @@
</span><span class="cx"> attendeeCUA = attendeeProp.value()
</span><span class="cx"> if attendeeCUA in allMemberCUAs:
</span><span class="cx"> # remove orphan member values
</span><del>- parameterValues = tuple(attendeeProp.parameterValues("MEMBER"))
- for orphanGroupCUA in set(parameterValues) - nonemptyGroupCUAs:
- attendeeProp.removeParameterValue("MEMBER", orphanGroupCUA)
- if not attendeeProp.parameterValues("MEMBER"):
</del><ins>+ memberValues = attendeeProp.parameterValues("MEMBER")
+ for orphanGroupCUA in set(memberValues) - nonemptyGroupCUAs:
+ memberValues.remove(orphanGroupCUA)
+ if len(memberValues) == 0:
</ins><span class="cx"> component.removeProperty(attendeeProp)
</span><span class="cx"> changed = True
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py (13941 => 13942)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-09-05 20:25:47 UTC (rev 13941)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-09-05 20:35:08 UTC (rev 13942)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.dateops import normalizeForExpand
</span><span class="cx"> from twistedcaldav.ical import Component, Property, InvalidICalendarDataError, \
</span><del>- normalizeCUAddress, normalize_iCalStr
</del><ins>+ normalizeCUAddress, normalize_iCalStr, diff_iCalStrs
</ins><span class="cx"> from twistedcaldav.ical import iCalendarProductID
</span><span class="cx"> from twistedcaldav.instance import InvalidOverriddenInstanceError
</span><span class="cx"> import twistedcaldav.test.util
</span><span class="lines">@@ -11082,3 +11082,470 @@
</span><span class="cx"> component = Component.fromString(txt).mainComponent()
</span><span class="cx"> transp = component.adjustedTransp()
</span><span class="cx"> self.assertEqual(transp, result, msg=title)
</span><ins>+
+
+ def test_reconcileGroupAttendees(self):
+ """
+ reconcileGroupAttendees()
+ """
+
+ data = (
+ (
+ "No change",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {},
+ False,
+ ),
+ (
+ "Empty group",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {"urn:uuid:group01": ()},
+ False,
+ ),
+ (
+ "One new member",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group01": (
+ Property("ATTENDEE", "mailto:user03@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ True,
+ ),
+ (
+ "One existing member",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group01": (
+ Property("ATTENDEE", "mailto:user03@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ False,
+ ),
+ (
+ "One removed member",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {"urn:uuid:group01": ()},
+ True,
+ ),
+ (
+ "Two members: one existing, one new",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user04@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group01": (
+ Property("ATTENDEE", "mailto:user03@example.com", {"MEMBER": "urn:uuid:group01"}),
+ Property("ATTENDEE", "mailto:user04@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ True,
+ ),
+ (
+ "Two existing members",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user04@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user04@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group01": (
+ Property("ATTENDEE", "mailto:user03@example.com", {"MEMBER": "urn:uuid:group01"}),
+ Property("ATTENDEE", "mailto:user04@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ False,
+ ),
+ (
+ "One existing, one removed member",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user04@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group01
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user04@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group01": (
+ Property("ATTENDEE", "mailto:user04@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ True,
+ ),
+ (
+ "Member with removed group",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {},
+ True,
+ ),
+ (
+ "Member with removed group added to another",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group02
+ATTENDEE;MEMBER="urn:uuid:group01":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group02
+ATTENDEE;MEMBER="urn:uuid:group02":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group02": (
+ Property("ATTENDEE", "mailto:user03@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ True,
+ ),
+ (
+ "Member with removed group in another",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group02
+ATTENDEE;MEMBER="urn:uuid:group01","urn:uuid:group02":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART;VALUE=DATE:20080601
+DURATION:PT1H
+DTSTAMP:20080601T120000Z
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+ATTENDEE;CUTYPE=X-SERVER-GROUP:urn:uuid:group02
+ATTENDEE;MEMBER="urn:uuid:group02":mailto:user03@example.com
+ORGANIZER:mailto:user01@example.com
+SUMMARY:Test
+END:VEVENT
+END:VCALENDAR
+""",
+ {
+ "urn:uuid:group02": (
+ Property("ATTENDEE", "mailto:user03@example.com", {"MEMBER": "urn:uuid:group01"}),
+ )
+ },
+ True,
+ ),
+ )
+
+ for title, txt, txt_result, propMap, changed in data:
+ cal = Component.fromString(txt)
+ result = cal.reconcileGroupAttendees(propMap)
+ self.assertEqual(result, changed, msg="{}: {}".format(title, "Result mismatch"))
+ self.assertEqual(normalize_iCalStr(cal), normalize_iCalStr(txt_result), msg="{}:{}".format(title, diff_iCalStrs(cal, txt_result)))
</ins></span></pre>
</div>
</div>
</body>
</html>