<!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>[12283] twext/trunk/twext</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/12283">12283</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 09:56:24 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextapplicationmasterchildpy">twext/trunk/twext/application/masterchild.py</a></li>
<li><a href="#twexttrunktwextwholdaptesttest_utilpy">twext/trunk/twext/who/ldap/test/test_util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextapplicationmasterchildpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/application/masterchild.py (12282 => 12283)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/application/masterchild.py 2014-01-10 17:22:01 UTC (rev 12282)
+++ twext/trunk/twext/application/masterchild.py 2014-01-10 17:56:24 UTC (rev 12283)
</span><span class="lines">@@ -635,16 +635,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ReportingProtocolWrapper(ProtocolWrapper, object):
</span><del>- # def __init__(self, *args, **kwargs):
- # try:
- # raise RuntimeError()
- # except RuntimeError:
- # from twisted.python.failure import Failure
- # f = Failure()
- # f.printTraceback()
- # return super(ReportingProtocolWrapper, self).__init__(
- # *args, **kwargs
- # )
</del><ins>+ def __init__(self, *args, **kwargs):
+ try:
+ raise RuntimeError()
+ except RuntimeError:
+ from twisted.python.failure import Failure
+ f = Failure()
+ f.printTraceback()
+ return super(ReportingProtocolWrapper, self).__init__(
+ *args, **kwargs
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def connectionLost(self, reason):
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_util.py (12282 => 12283)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_util.py 2014-01-10 17:22:01 UTC (rev 12282)
+++ twext/trunk/twext/who/ldap/test/test_util.py 2014-01-10 17:56:24 UTC (rev 12283)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> from .._service import DirectoryService
</span><span class="cx"> from .._util import (
</span><span class="cx"> ldapQueryStringFromMatchExpression,
</span><ins>+ ldapQueryStringFromCompoundExpression,
+ ldapQueryStringFromExpression,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -69,12 +71,10 @@
</span><span class="cx"> queryString = ldapQueryStringFromMatchExpression(
</span><span class="cx"> expression, self.attrMap(service)
</span><span class="cx"> )
</span><del>- self.assertEquals(
- queryString,
- u"({attribute}{expected})".format(
- attribute="shortNames", expected=expected
- )
</del><ins>+ expected = u"({attribute}{expected})".format(
+ attribute="shortNames", expected=expected
</ins><span class="cx"> )
</span><ins>+ self.assertEquals(queryString, expected)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_queryStringFromMatchExpression_match_not(self):
</span><span class="lines">@@ -90,12 +90,10 @@
</span><span class="cx"> queryString = ldapQueryStringFromMatchExpression(
</span><span class="cx"> expression, self.attrMap(service)
</span><span class="cx"> )
</span><del>- self.assertEquals(
- queryString,
- u"(!{attribute}=xyzzy)".format(
- attribute="shortNames",
- )
</del><ins>+ expected = u"(!{attribute}=xyzzy)".format(
+ attribute="shortNames",
</ins><span class="cx"> )
</span><ins>+ self.assertEquals(queryString, expected)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_queryStringFromMatchExpression_match_caseInsensitive(self):
</span><span class="lines">@@ -112,13 +110,12 @@
</span><span class="cx"> queryString = ldapQueryStringFromMatchExpression(
</span><span class="cx"> expression, self.attrMap(service)
</span><span class="cx"> )
</span><del>- self.assertEquals(
- queryString,
- u"???????({attribute}=xyzzy)".format(
- attribute="shortNames",
- )
</del><ins>+ expected = u"???????({attribute}=xyzzy)".format(
+ attribute="shortNames",
</ins><span class="cx"> )
</span><ins>+ self.assertEquals(queryString, expected)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> test_queryStringFromMatchExpression_match_caseInsensitive.todo = (
</span><span class="cx"> "unimplemented"
</span><span class="cx"> )
</span><span class="lines">@@ -137,83 +134,112 @@
</span><span class="cx"> queryString = ldapQueryStringFromMatchExpression(
</span><span class="cx"> expression, self.attrMap(service)
</span><span class="cx"> )
</span><del>- self.assertEquals(
- queryString,
- u"({attribute}={expected})".format(
- attribute="fullNames",
- expected=(
- u"\\5Cxyzzy: a\\2Fb\\2F\\28c\\29\\2A "
- "\\7E\\7E \\3E\\3D\\3C \\7E\\7E \\26\\7C \\00!!"
</del><ins>+ expected= u"({attribute}={expected})".format(
+ attribute="fullNames",
+ expected=(
+ u"\\5Cxyzzy: a\\2Fb\\2F\\28c\\29\\2A "
+ "\\7E\\7E \\3E\\3D\\3C \\7E\\7E \\26\\7C \\00!!"
+ )
+ )
+ self.assertEquals(queryString, expected)
+
+
+ def test_queryStringFromCompoundExpression_single(self):
+ """
+ Compound expression with a single sub-expression.
+
+ Should result in the same query string as just the sub-expression
+ would.
+
+ The Operand shouldn't make any difference here, so we test AND and OR,
+ expecting the same result.
+ """
+ service = DirectoryService()
+
+ for operand in (Operand.AND, Operand.OR):
+ matchExpression = MatchExpression(
+ service.fieldName.shortNames, u"xyzzy"
+ )
+ compoundExpression = CompoundExpression(
+ [matchExpression],
+ operand
+ )
+ queryString = ldapQueryStringFromCompoundExpression(
+ compoundExpression, self.attrMap(service)
+ )
+ expected = u"{match}".format(
+ match=ldapQueryStringFromMatchExpression(
+ matchExpression, self.attrMap(service)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ self.assertEquals(queryString, expected)
+
+
+ def test_queryStringFromCompoundExpression_multiple(self):
+ """
+ Compound expression with multiple sub-expressions.
+
+ The sub-expressions should be grouped with the given operand.
+ """
+ service = DirectoryService()
+
+ for (operand, token) in ((Operand.AND, u"&"), (Operand.OR, u"|")):
+ matchExpression1 = MatchExpression(
+ service.fieldName.shortNames, u"xyzzy"
+ )
+ matchExpression2 = MatchExpression(
+ service.fieldName.shortNames, u"plugh"
+ )
+ compoundExpression = CompoundExpression(
+ [matchExpression1, matchExpression2],
+ operand
+ )
+ queryString = ldapQueryStringFromCompoundExpression(
+ compoundExpression, self.attrMap(service)
+ )
+ expected = u"({op}{match1}{match2})".format(
+ op=token,
+ match1=ldapQueryStringFromMatchExpression(
+ matchExpression1, self.attrMap(service)
+ ),
+ match2=ldapQueryStringFromMatchExpression(
+ matchExpression2, self.attrMap(service)
+ ),
+ )
+ self.assertEquals(queryString, expected)
+
+
+ def test_queryStringFromExpression_match(self):
+ """
+ Match expression.
+ """
+ service = DirectoryService()
+
+ matchExpression = MatchExpression(
+ service.fieldName.shortNames, u"xyzzy"
</ins><span class="cx"> )
</span><ins>+ queryString = ldapQueryStringFromExpression(
+ matchExpression, self.attrMap(service)
+ )
+ expected = ldapQueryStringFromMatchExpression(
+ matchExpression, self.attrMap(service)
+ )
+ self.assertEquals(queryString, expected)
</ins><span class="cx">
</span><span class="cx">
</span><del>- # def test_queryStringFromExpression(self):
- # service = DirectoryService()
</del><ins>+ def test_queryStringFromExpression_compound(self):
+ """
+ Compound expression.
+ """
+ raise NotImplementedError()
</ins><span class="cx">
</span><del>- # # CompoundExpressions
</del><ins>+ test_queryStringFromExpression_compound.todo = "unimplemented"
</ins><span class="cx">
</span><del>- # expression = CompoundExpression(
- # [
- # MatchExpression(
- # service.fieldName.uid, u"a",
- # matchType=MatchType.contains
- # ),
- # MatchExpression(
- # service.fieldName.guid, u"b",
- # matchType=MatchType.contains
- # ),
- # MatchExpression(
- # service.fieldName.shortNames, u"c",
- # matchType=MatchType.contains
- # ),
- # MatchExpression(
- # service.fieldName.emailAddresses, u"d",
- # matchType=MatchType.startsWith
- # ),
- # MatchExpression(
- # service.fieldName.fullNames, u"e",
- # matchType=MatchType.equals
- # ),
- # ],
- # Operand.AND
- # )
- # queryString = service._queryStringFromExpression(expression)
- # self.assertEquals(
- # queryString,
- # (
- # u"(&(dsAttrTypeStandard:GeneratedUID=*a*)"
- # u"(dsAttrTypeStandard:GeneratedUID=*b*)"
- # u"(dsAttrTypeStandard:RecordName=*c*)"
- # u"(dsAttrTypeStandard:EMailAddress=d*)"
- # u"(dsAttrTypeStandard:RealName=e))"
- # )
- # )
</del><span class="cx">
</span><del>- # expression = CompoundExpression(
- # [
- # MatchExpression(
- # service.fieldName.shortNames, u"a",
- # matchType=MatchType.contains
- # ),
- # MatchExpression(
- # service.fieldName.emailAddresses, u"b",
- # matchType=MatchType.startsWith
- # ),
- # MatchExpression(
- # service.fieldName.fullNames, u"c",
- # matchType=MatchType.equals
- # ),
- # ],
- # Operand.OR
- # )
- # queryString = service._queryStringFromExpression(expression)
- # self.assertEquals(
- # queryString,
- # (
- # u"(|(dsAttrTypeStandard:RecordName=*a*)"
- # u"(dsAttrTypeStandard:EMailAddress=b*)"
- # u"(dsAttrTypeStandard:RealName=c))"
- # )
- # )
</del><ins>+ def test_queryStringFromExpression_unknown(self):
+ """
+ Unknown expression.
+ """
+ raise NotImplementedError()
+
+ test_queryStringFromExpression_unknown.todo = "unimplemented"
</ins></span></pre>
</div>
</div>
</body>
</html>