<!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>[13027] CalendarServer/branches/users/sagen/move2who-4/txdav</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/13027">13027</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 12:31:41 -0700 (Fri, 28 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>recordsFromExpression does not work across AMP until we can serialize expressions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_directorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (13026 => 13027)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-28 19:08:49 UTC (rev 13026)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-28 19:31:41 UTC (rev 13027)
</span><span class="lines">@@ -271,6 +271,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def recordsFromExpression(self, expression):
+ raise NotImplementedError("This won't work until expressions are serializable to send across AMP")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py (13026 => 13027)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-28 19:08:49 UTC (rev 13026)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py 2014-03-28 19:31:41 UTC (rev 13027)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> import os
</span><span class="cx">
</span><span class="cx"> from twext.who.expression import (
</span><del>- Operand, MatchType, MatchFlags, MatchExpression, CompoundExpression
</del><ins>+ Operand, MatchType, MatchFlags, MatchExpression
</ins><span class="cx"> )
</span><span class="cx"> from twext.who.idirectory import RecordType, FieldName
</span><span class="cx"> from twisted.cred.credentials import calcResponse, calcHA1, calcHA2
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DPSClientSingleDirectoryTest(unittest.TestCase):
</span><ins>+ """
+ Tests the client against a single directory service (as opposed to the
+ augmented, aggregated structure you get from directoryFromConfig(), which
+ is tested in the class below)
+ """
</ins><span class="cx">
</span><span class="cx"> def setUp(self):
</span><span class="cx">
</span><span class="lines">@@ -218,7 +223,9 @@
</span><span class="cx"> records = yield self.directory.recordsFromExpression(expression)
</span><span class="cx"> self.assertEquals(len(records), 1)
</span><span class="cx">
</span><ins>+ test_recordsFromMatchExpression.todo = "Won't work until we can serialize expressions"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_verifyPlaintextPassword(self):
</span><span class="cx"> expectations = (
</span><span class="lines">@@ -279,6 +286,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DPSClientAugmentedAggregateDirectoryTest(StoreTestCase):
</span><ins>+ """
+ Similar to the above tests, but in the context of the directory structure
+ that directoryFromConfig() returns
+ """
</ins><span class="cx">
</span><span class="cx"> wsanchezUID = u"6423F94A-6B76-4A3A-815B-D52CFD77935D"
</span><span class="cx">
</span><span class="lines">@@ -438,7 +449,9 @@
</span><span class="cx"> records = yield self.client.recordsFromExpression(expression)
</span><span class="cx"> self.assertEquals(len(records), 1)
</span><span class="cx">
</span><ins>+ test_recordsFromMatchExpression.todo = "Won't work until we can serialize expressions"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_verifyPlaintextPassword(self):
</span><span class="cx"> expectations = (
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py (13026 => 13027)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py 2014-03-28 19:08:49 UTC (rev 13026)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py 2014-03-28 19:31:41 UTC (rev 13027)
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> from twext.who.idirectory import FieldName, RecordType
</span><span class="cx"> from txdav.who.directory import CalendarDirectoryRecordMixin
</span><span class="cx"> from uuid import UUID
</span><ins>+from twext.who.expression import (
+ MatchType, MatchFlags, MatchExpression
+)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -96,3 +99,15 @@
</span><span class="cx"> record.canonicalCalendarUserAddress(),
</span><span class="cx"> u"urn:uuid:E2F6C57F-BB15-4EF9-B0AC-47A7578386F1"
</span><span class="cx"> )
</span><ins>+
+
+ @inlineCallbacks
+ def test_recordsFromMatchExpression(self):
+ expression = MatchExpression(
+ FieldName.uid,
+ u"6423F94A-6B76-4A3A-815B-D52CFD77935D",
+ MatchType.equals,
+ MatchFlags.none
+ )
+ records = yield self.directory.recordsFromExpression(expression)
+ self.assertEquals(len(records), 1)
</ins></span></pre>
</div>
</div>
</body>
</html>