<!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>[13141] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.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/13141">13141</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-03 06:14:03 -0700 (Thu, 03 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Resource hierarchy and propertyToField test tweaks</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytesttest_principalpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py (13140 => 13141)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py        2014-04-03 02:28:28 UTC (rev 13140)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py        2014-04-03 13:14:03 UTC (rev 13141)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> from __future__ import print_function
</span><span class="cx"> 
</span><span class="cx"> from urllib import quote
</span><ins>+from uuid import UUID
</ins><span class="cx"> 
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><span class="lines">@@ -68,48 +69,91 @@
</span><span class="cx"> 
</span><span class="cx">         DirectoryPrincipalResource.principalURL(),
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        if True:
-            #print(&quot;\n -&gt; %s&quot; % (directory.__class__.__name__,))
-            provisioningResource = self.principalRootResource
</del><ins>+        provisioningResource = self.principalRootResource
</ins><span class="cx"> 
</span><del>-            provisioningURL = &quot;/principals/&quot;
-            self.assertEquals(
-                provisioningURL,
-                provisioningResource.principalCollectionURL()
</del><ins>+        provisioningURL = &quot;/principals/&quot;
+        self.assertEquals(
+            provisioningURL,
+            provisioningResource.principalCollectionURL()
+        )
+
+        principalCollections = provisioningResource.principalCollections()
+        self.assertEquals(
+            set((provisioningURL,)),
+            set(pc.principalCollectionURL() for pc in principalCollections)
+        )
+
+        recordTypes = set((yield provisioningResource.listChildren()))
+        self.assertEquals(
+            recordTypes,
+            set(
+                [
+                    self.directory.recordTypeToOldName(rt) for rt in
+                    (
+                        self.directory.recordType.user,
+                        self.directory.recordType.group,
+                        self.directory.recordType.location,
+                        self.directory.recordType.resource,
+                        self.directory.recordType.address,
+                    )
+                ]
</ins><span class="cx">             )
</span><ins>+        )
</ins><span class="cx"> 
</span><del>-            principalCollections = provisioningResource.principalCollections()
</del><ins>+        for recordType in recordTypes:
+            typeResource = yield provisioningResource.getChild(recordType)
+            self.failUnless(
+                isinstance(
+                    typeResource,
+                    DirectoryPrincipalTypeProvisioningResource
+                )
+            )
+
+            typeURL = provisioningURL + recordType + &quot;/&quot;
</ins><span class="cx">             self.assertEquals(
</span><del>-                set((provisioningURL,)),
-                set(pc.principalCollectionURL() for pc in principalCollections)
</del><ins>+                typeURL, typeResource.principalCollectionURL()
</ins><span class="cx">             )
</span><span class="cx"> 
</span><del>-            recordTypes = set((yield provisioningResource.listChildren()))
</del><ins>+            principalCollections = typeResource.principalCollections()
</ins><span class="cx">             self.assertEquals(
</span><del>-                recordTypes,
</del><ins>+                set((provisioningURL,)),
</ins><span class="cx">                 set(
</span><del>-                    [
-                        self.directory.recordTypeToOldName(rt) for rt in
-                        self.directory.recordTypes()
-                    ]
</del><ins>+                    pc.principalCollectionURL()
+                    for pc in principalCollections
</ins><span class="cx">                 )
</span><span class="cx">             )
</span><span class="cx"> 
</span><del>-            for recordType in recordTypes:
-                typeResource = yield provisioningResource.getChild(recordType)
</del><ins>+            shortNames = set((yield typeResource.listChildren()))
+            # Handle records with mulitple shortNames
+            expected = []
+            for r in (
+                yield self.directory.recordsWithRecordType(
+                    self.directory.oldNameToRecordType(recordType)
+                )
+            ):
+                expected.extend(r.shortNames)
+            self.assertEquals(shortNames, set(expected))
+
+            for shortName in shortNames:
+                #print(&quot;     -&gt; %s&quot; % (shortName,))
+                recordResource = yield typeResource.getChild(shortName)
</ins><span class="cx">                 self.failUnless(
</span><del>-                    isinstance(
-                        typeResource,
-                        DirectoryPrincipalTypeProvisioningResource
</del><ins>+                    isinstance(recordResource, DirectoryPrincipalResource)
+                )
+
+                # shortName may be non-ascii
+                recordURL = typeURL + quote(shortName.encode(&quot;utf-8&quot;)) + &quot;/&quot;
+                self.assertIn(
+                    recordURL,
+                    (
+                        (recordResource.principalURL(),) +
+                        tuple(recordResource.alternateURIs())
</ins><span class="cx">                     )
</span><span class="cx">                 )
</span><span class="cx"> 
</span><del>-                typeURL = provisioningURL + recordType + &quot;/&quot;
-                self.assertEquals(
-                    typeURL, typeResource.principalCollectionURL()
</del><ins>+                principalCollections = (
+                    recordResource.principalCollections()
</ins><span class="cx">                 )
</span><del>-
-                principalCollections = typeResource.principalCollections()
</del><span class="cx">                 self.assertEquals(
</span><span class="cx">                     set((provisioningURL,)),
</span><span class="cx">                     set(
</span><span class="lines">@@ -118,46 +162,7 @@
</span><span class="cx">                     )
</span><span class="cx">                 )
</span><span class="cx"> 
</span><del>-                shortNames = set((yield typeResource.listChildren()))
-                # Handle records with mulitple shortNames
-                expected = []
-                for r in (
-                    yield self.directory.recordsWithRecordType(
-                        self.directory.oldNameToRecordType(recordType)
-                    )
-                ):
-                    expected.extend(r.shortNames)
-                self.assertEquals(shortNames, set(expected))
</del><span class="cx"> 
</span><del>-                for shortName in shortNames:
-                    #print(&quot;     -&gt; %s&quot; % (shortName,))
-                    recordResource = yield typeResource.getChild(shortName)
-                    self.failUnless(
-                        isinstance(recordResource, DirectoryPrincipalResource)
-                    )
-
-                    # shortName may be non-ascii
-                    recordURL = typeURL + quote(shortName.encode(&quot;utf-8&quot;)) + &quot;/&quot;
-                    self.assertIn(
-                        recordURL,
-                        (
-                            (recordResource.principalURL(),) +
-                            tuple(recordResource.alternateURIs())
-                        )
-                    )
-
-                    principalCollections = (
-                        recordResource.principalCollections()
-                    )
-                    self.assertEquals(
-                        set((provisioningURL,)),
-                        set(
-                            pc.principalCollectionURL()
-                            for pc in principalCollections
-                        )
-                    )
-
-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def test_allRecords(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -921,7 +926,7 @@
</span><span class="cx">             (
</span><span class="cx">                 &quot;urn:ietf:params:xml:ns:caldav&quot;, &quot;calendar-user-address-set&quot;,
</span><span class="cx">                 &quot;urn:uuid:AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA&quot;,
</span><del>-                &quot;guid&quot;, &quot;AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA&quot;
</del><ins>+                &quot;guid&quot;, UUID(&quot;AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA&quot;)
</ins><span class="cx">             ),
</span><span class="cx">             (
</span><span class="cx">                 &quot;urn:ietf:params:xml:ns:caldav&quot;, &quot;calendar-user-address-set&quot;,
</span></span></pre>
</div>
</div>

</body>
</html>