<!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>[9435] CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/test/test_sharing.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.macosforge.org/projects/calendarserver/changeset/9435">9435</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2012-07-11 17:13:15 -0700 (Wed, 11 Jul 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>expect urn:uuid:-style cuaddrs in invite properties</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayainvitecleantwistedcaldavtesttest_sharingpy">CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/test/test_sharing.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayainvitecleantwistedcaldavtesttest_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/test/test_sharing.py (9434 => 9435)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/test/test_sharing.py        2012-07-11 22:30:14 UTC (rev 9434)
+++ CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/test/test_sharing.py        2012-07-12 00:13:15 UTC (rev 9435)
</span><span class="lines">@@ -47,10 +47,18 @@
</span><span class="cx">                 self.calendarUserAddresses = set((cuaddr,))
</span><span class="cx"> 
</span><span class="cx">         def __init__(self, cuaddr):
</span><del>-            self.path = &quot;/principals/__uids__/%s&quot; % (cuaddr[7:].split('@')[0],)
-            self.homepath = &quot;/calendars/__uids__/%s&quot; % (cuaddr[7:].split('@')[0],)
-            self.displayname = cuaddr[7:].split('@')[0].upper()
-            self.record = self.FakeRecord(cuaddr[7:].split('@')[0], cuaddr)
</del><ins>+            if cuaddr.startswith(&quot;mailto:&quot;):
+                name = cuaddr[7:].split('@')[0]
+            elif cuaddr.startswith(&quot;urn:uuid:&quot;):
+                name = cuaddr[9:]
+            else:
+                name = cuaddr
+                
+            self.path = &quot;/principals/__uids__/%s&quot; % (name,)
+            self.homepath = &quot;/calendars/__uids__/%s&quot; % (name,)
+            self.displayname = name.upper()
+            self.record = self.FakeRecord(name, cuaddr)
+            
</ins><span class="cx"> 
</span><span class="cx">         def calendarHome(self, request):
</span><span class="cx">             class FakeHome(object):
</span><span class="lines">@@ -79,7 +87,8 @@
</span><span class="cx">         CalDAVResource.sendInvite = lambda self, record, request: succeed(True)
</span><span class="cx">         CalDAVResource.removeInvite = lambda self, record, request: succeed(True)
</span><span class="cx"> 
</span><del>-        self.patch(CalDAVResource, &quot;principalForCalendarUserAddress&quot;, lambda self, cuaddr: SharingTests.FakePrincipal(cuaddr))
</del><ins>+        self.patch(CalDAVResource, &quot;principalForCalendarUserAddress&quot;, lambda self, cuaddr: None if &quot;bogus&quot; in cuaddr else SharingTests.FakePrincipal(cuaddr))
+        self.patch(CalDAVResource, &quot;principalForUID&quot;, lambda self, principalUID: SharingTests.FakePrincipal(&quot;urn:uuid:&quot; + principalUID ))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -205,7 +214,7 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user02@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user02&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER02&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -235,7 +244,7 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user02@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user02&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER02&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -276,7 +285,7 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user02@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user02&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER02&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -342,21 +351,21 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user02@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user02&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER02&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="cx">             ),
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user03@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user03&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER03&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="cx">             ),
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user04@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user04&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER04&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -399,14 +408,14 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user02@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user02&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER02&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="cx">             ),
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user04@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user04&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER04&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -449,14 +458,14 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user02@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user02&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER02&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="cx">             ),
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user03@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user03&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER03&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -515,7 +524,7 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user01@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user01&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER01&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusNoResponse(),
</span><span class="lines">@@ -530,7 +539,7 @@
</span><span class="cx">         self.assertEquals(self._clearUIDElementValue(propInvite), customxml.Invite(
</span><span class="cx">             customxml.InviteUser(
</span><span class="cx">                 customxml.UID.fromString(&quot;&quot;),
</span><del>-                davxml.HRef.fromString(&quot;mailto:user01@example.com&quot;),
</del><ins>+                davxml.HRef.fromString(&quot;urn:uuid:user01&quot;),
</ins><span class="cx">                 customxml.CommonName.fromString(&quot;USER01&quot;),
</span><span class="cx">                 customxml.InviteAccess(customxml.ReadWriteAccess()),
</span><span class="cx">                 customxml.InviteStatusInvalid(),
</span></span></pre>
</div>
</div>

</body>
</html>