<!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>[13564] CalendarServer/trunk/txdav/dps</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/13564">13564</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-05-29 15:36:41 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test match expression deserialization</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsjsonpy">CalendarServer/trunk/txdav/dps/json.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_jsonpy">CalendarServer/trunk/txdav/dps/test/test_json.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsjsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/json.py (13563 => 13564)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/json.py 2014-05-29 22:36:05 UTC (rev 13563)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-05-29 22:36:41 UTC (rev 13564)
</span><span class="lines">@@ -75,25 +75,31 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def matchExpressionFromJSON(json):
</del><ins>+def matchExpressionFromJSON(service, json):
</ins><span class="cx"> try:
</span><del>- field_json = json["field"]
- value_json = json["value"]
- match_json = json["match"]
- flags_json = json["flags"]
</del><ins>+ jsonField = json["field"]
+ jsonValue = json["value"]
</ins><span class="cx"> except KeyError as e:
</span><span class="cx"> raise ValueError(
</span><span class="cx"> "JSON match expression must have {!r} key.".format(e[0])
</span><span class="cx"> )
</span><span class="cx">
</span><del>- raise NotImplementedError()
</del><ins>+ jsonMatch = json.get("match", "equals")
+ jsonFlags = json.get("flags", "{}")
</ins><span class="cx">
</span><del>- fieldName = NotImplemented, field_json # Need service...
- fieldValue = NotImplemented, value_json # Need to cast to correct value
- matchType = MatchType.lookupByName(match_json)
- flags = NotImplemented, flags_json # Need to handle composite flags
</del><ins>+ fieldName = service.fieldName.lookupByName(jsonField)
+ fieldValue = unicode(jsonValue)
+ matchType = MatchType.lookupByName(jsonMatch)
</ins><span class="cx">
</span><del>- MatchFlags # Shh, flakes
</del><ins>+ if jsonFlags == "{}":
+ flags = MatchFlags.none
+ elif jsonFlags.startswith("{") and jsonFlags.endswith("}"):
+ # Composite flags: "{A,B,C,...}"
+ flags = MatchFlags.none
+ for flag in jsonFlags[1:-1].split(","):
+ flags |= MatchFlags.lookupByName(flag)
+ else:
+ flags = MatchFlags.lookupByName(jsonFlags)
</ins><span class="cx">
</span><span class="cx"> return MatchExpression(
</span><span class="cx"> fieldName, fieldValue,
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_jsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_json.py (13563 => 13564)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_json.py 2014-05-29 22:36:05 UTC (rev 13563)
+++ CalendarServer/trunk/txdav/dps/test/test_json.py 2014-05-29 22:36:41 UTC (rev 13564)
</span><span class="lines">@@ -25,10 +25,12 @@
</span><span class="cx"> from ..json import (
</span><span class="cx"> matchExpressionAsJSON, compoundExpressionAsJSON,
</span><span class="cx"> # expressionAsJSON, expressionAsJSONText,
</span><del>- # matchExpressionFromJSON, compoundExpressionFromJSON,
</del><ins>+ matchExpressionFromJSON, # compoundExpressionFromJSON,
</ins><span class="cx"> # expressionFromJSON, expressionFromJSONText,
</span><ins>+ from_json_text, # to_json_text,
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+from twext.who.test.test_xml import xmlService
</ins><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -38,6 +40,10 @@
</span><span class="cx"> Tests for serialization to JSON.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ def service(self, subClass=None, xmlData=None):
+ return xmlService(self.mktemp())
+
+
</ins><span class="cx"> def test_matchExpressionAsJSON_basic(self):
</span><span class="cx"> """
</span><span class="cx"> L{matchExpressionAsJSON} with default matching and flags.
</span><span class="lines">@@ -64,9 +70,9 @@
</span><span class="cx"> uid = u"Some UID"
</span><span class="cx">
</span><span class="cx"> for matchType, matchText in (
</span><del>- (MatchType.equals, b"equals"),
- (MatchType.endsWith, b"endsWith"),
- (MatchType.lessThanOrEqualTo, b"lessThanOrEqualTo"),
</del><ins>+ (MatchType.equals, "equals"),
+ (MatchType.endsWith, "endsWith"),
+ (MatchType.lessThanOrEqualTo, "lessThanOrEqualTo"),
</ins><span class="cx"> ):
</span><span class="cx"> expression = MatchExpression(
</span><span class="cx"> FieldName.uid, uid, matchType=matchType
</span><span class="lines">@@ -74,8 +80,8 @@
</span><span class="cx"> json = matchExpressionAsJSON(expression)
</span><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": b"MatchExpression",
- "field": b"uid",
</del><ins>+ "type": "MatchExpression",
+ "field": "uid",
</ins><span class="cx"> "match": matchText,
</span><span class="cx"> "value": uid,
</span><span class="cx"> "flags": "{}",
</span><span class="lines">@@ -93,28 +99,28 @@
</span><span class="cx"> for flags, flagsText, in (
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.none,
</span><del>- b"{}"
</del><ins>+ "{}"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.NOT,
</span><del>- b"NOT"
</del><ins>+ "NOT"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.caseInsensitive,
</span><del>- b"caseInsensitive"
</del><ins>+ "caseInsensitive"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.NOT | MatchFlags.caseInsensitive,
</span><del>- b"{NOT,caseInsensitive}"
</del><ins>+ "{NOT,caseInsensitive}"
</ins><span class="cx"> ),
</span><span class="cx"> ):
</span><span class="cx"> expression = MatchExpression(FieldName.uid, uid, flags=flags)
</span><span class="cx"> json = matchExpressionAsJSON(expression)
</span><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": b"MatchExpression",
- "field": b"uid",
- "match": b"equals",
</del><ins>+ "type": "MatchExpression",
+ "field": "uid",
+ "match": "equals",
</ins><span class="cx"> "value": uid,
</span><span class="cx"> "flags": flagsText,
</span><span class="cx"> }
</span><span class="lines">@@ -153,8 +159,8 @@
</span><span class="cx"> L{compoundExpressionAsJSON} with different operands.
</span><span class="cx"> """
</span><span class="cx"> for operand, operandText in (
</span><del>- (Operand.AND, b"AND"),
- (Operand.OR, b"OR"),
</del><ins>+ (Operand.AND, "AND"),
+ (Operand.OR, "OR"),
</ins><span class="cx"> ):
</span><span class="cx"> expression = CompoundExpression((), operand)
</span><span class="cx"> json = compoundExpressionAsJSON(expression)
</span><span class="lines">@@ -166,3 +172,101 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> self.assertEquals(json, expected)
</span><ins>+
+
+ def test_matchExpressionFromJSON_basic(self):
+ """
+ L{test_matchExpressionFromJSON_basic} with default matching and flags.
+ """
+ service = self.service()
+ uid = u"Some UID"
+ jsonText = (
+ """
+ {{
+ "type": "MatchExpression",
+ "field": "uid",
+ "value": "{uid}"
+ }}
+ """
+ ).format(uid=uid)
+ json = from_json_text(jsonText)
+
+ expected = MatchExpression(FieldName.uid, uid)
+ expression = matchExpressionFromJSON(service, json)
+
+ self.assertEquals(expression, expected)
+
+
+ def test_matchExpressionFromJSON_types(self):
+ """
+ L{matchExpressionFromJSON} with various match types.
+ """
+ service = self.service()
+ uid = u"Some UID"
+
+ for matchType, matchText in (
+ (MatchType.equals, b"equals"),
+ (MatchType.endsWith, b"endsWith"),
+ (MatchType.lessThanOrEqualTo, b"lessThanOrEqualTo"),
+ ):
+ jsonText = (
+ """
+ {{
+ "type": "MatchExpression",
+ "field": "uid",
+ "match": "{matchType}",
+ "value": "{uid}",
+ "flags": "{{}}"
+ }}
+ """
+ ).format(uid=uid, matchType=matchText)
+ json = from_json_text(jsonText)
+
+ expected = MatchExpression(FieldName.uid, uid, matchType=matchType)
+ expression = matchExpressionFromJSON(service, json)
+
+ self.assertEquals(expression, expected)
+
+
+ def test_matchExpressionFromJSON_flags(self):
+ """
+ L{matchExpressionFromJSON} with various flags.
+ """
+ service = self.service()
+ uid = u"Some UID"
+
+ for flags, flagsText, in (
+ (
+ MatchFlags.none,
+ "{}"
+ ),
+ (
+ MatchFlags.NOT,
+ "NOT"
+ ),
+ (
+ MatchFlags.caseInsensitive,
+ "caseInsensitive"
+ ),
+ (
+ MatchFlags.NOT | MatchFlags.caseInsensitive,
+ "{NOT,caseInsensitive}"
+ ),
+ ):
+ jsonText = (
+ """
+ {{
+ "type": "MatchExpression",
+ "field": "uid",
+ "match": "equals",
+ "value": "{uid}",
+ "flags": "{flagsText}"
+ }}
+ """
+ ).format(uid=uid, flagsText=flagsText)
+ json = from_json_text(jsonText)
+
+ expected = MatchExpression(FieldName.uid, uid, flags=flags)
+ expression = matchExpressionFromJSON(service, json)
+
+ self.assertEquals(expression, expected)
</ins></span></pre>
</div>
</div>
</body>
</html>