<!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>[12318] twext/trunk/twext/who/ldap/test/test_service.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/12318">12318</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 16:51:24 -0800 (Sat, 11 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Bind test passes now</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwholdaptesttest_servicepy">twext/trunk/twext/who/ldap/test/test_service.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py (12317 => 12318)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py        2014-01-11 23:59:15 UTC (rev 12317)
+++ twext/trunk/twext/who/ldap/test/test_service.py        2014-01-12 00:51:24 UTC (rev 12318)
</span><span class="lines">@@ -115,28 +115,31 @@
</span><span class="cx">         Connect with UsernamePassword credentials.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         credentials = UsernamePassword(
</span><del>-            &quot;cn=wsanchez,ou=calendarserver,o=org&quot;,
-            &quot;__password__&quot;
</del><ins>+            u&quot;uid=wsanchez,cn=user,dc=calendarserver,dc=org&quot;,
+            u&quot;__password__&quot;
</ins><span class="cx">         )
</span><span class="cx">         service = self.service(credentials=credentials)
</span><span class="cx">         self.assertFailure(service._connect(), LDAPBindAuthError)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    @inlineCallbacks
</ins><span class="cx">     def test_connect_withUsernamePassword_valid(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Connect with UsernamePassword credentials.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         credentials = UsernamePassword(
</span><del>-            &quot;cn=wsanchez,ou=calendarserver,o=org&quot;,
-            &quot;__password__&quot;
</del><ins>+            u&quot;uid=wsanchez,cn=user,dc=calendarserver,dc=org&quot;,
+            u&quot;zehcnasw&quot;
</ins><span class="cx">         )
</span><span class="cx">         service = self.service(credentials=credentials)
</span><ins>+        connection = yield service._connect()
</ins><span class="cx"> 
</span><del>-        raise NotImplementedError(service)
</del><ins>+        self.assertEquals(
+            connection.methods_called(),
+            [&quot;initialize&quot;, &quot;simple_bind_s&quot;]
+        )
</ins><span class="cx"> 
</span><del>-    test_connect_withUsernamePassword_valid.todo = &quot;unimplemented&quot;
</del><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def test_connect_withOptions(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -195,32 +198,48 @@
</span><span class="cx">     ou = u&quot;calendarserver&quot;
</span><span class="cx"> 
</span><span class="cx">     data = {
</span><del>-        u&quot;o={0}&quot;.format(o): dict(o=o),
-        u&quot;ou={0}&quot;.format(ou): dict(ou=ou),
</del><ins>+        u&quot;o={o}&quot;.format(o=o): dict(o=o),
+        u&quot;ou={ou}&quot;.format(ou=ou): dict(ou=ou),
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    for records in service.index[service.fieldName.uid].itervalues():
-        for record in records:
-            cn = record.shortNames[0]
</del><ins>+    def toAttribute(fieldName):
+        return unicode({
+            service.fieldName.uid: u&quot;recordid&quot;,
+            service.fieldName.guid: u&quot;guid&quot;,
+            service.fieldName.recordType: u&quot;objectclass&quot;,
+            service.fieldName.shortNames: u&quot;uid&quot;,
+            service.fieldName.fullNames: u&quot;cn&quot;,
+            service.fieldName.emailAddresses: u&quot;mail&quot;,
+            service.fieldName.password: u&quot;userPassword&quot;,
+        }.get(fieldName, fieldName.name))
</ins><span class="cx"> 
</span><del>-            key = u&quot;cn={0},ou={1},o={2}&quot;.format(cn, ou, o)
</del><ins>+    def toUnicode(obj):
+        if isinstance(obj, (NamedConstant, ValueConstant)):
+            return obj.name
</ins><span class="cx"> 
</span><del>-            def toUnicode(obj):
-                if isinstance(obj, (NamedConstant, ValueConstant)):
-                    return obj.name
</del><ins>+        if isinstance(obj, (tuple, list)):
+            return [unicode(x) for x in obj]
</ins><span class="cx"> 
</span><del>-                if isinstance(obj, (tuple, list)):
-                    return [unicode(x) for x in obj]
</del><ins>+        return unicode(obj)
</ins><span class="cx"> 
</span><del>-                return unicode(obj)
</del><ins>+    def tuplify(record, fieldName):
+        name = toAttribute(fieldName)
+        value = toUnicode(record.fields[fieldName])
+        return (name, value)
</ins><span class="cx"> 
</span><ins>+    for records in service.index[service.fieldName.uid].itervalues():
+        for record in records:
+            dn = u&quot;uid={uid},cn={cn},dc={ou},dc={o}&quot;.format(
+                uid=record.shortNames[0], cn=record.recordType.name, ou=ou, o=o
+            )
+
</ins><span class="cx">             recordData = dict(
</span><del>-                (fieldName.name, toUnicode(record.fields[fieldName]))
</del><ins>+                tuplify(record, fieldName)
</ins><span class="cx">                 for fieldName in service.fieldName.iterconstants()
</span><span class="cx">                 if fieldName in record.fields
</span><span class="cx">             )
</span><span class="cx"> 
</span><del>-            data[key] = recordData
</del><ins>+            data[dn] = recordData
</ins><span class="cx"> 
</span><span class="cx">     # from pprint import pprint
</span><span class="cx">     # print(&quot;&quot;)
</span></span></pre>
</div>
</div>

</body>
</html>