<!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>[13567] CalendarServer/trunk/txdav/dps/test/test_json.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/13567">13567</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-05-29 15:56:05 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More serialization tests</pre>
<h3>Modified Paths</h3>
<ul>
<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="CalendarServertrunktxdavdpstesttest_jsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_json.py (13566 => 13567)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_json.py 2014-05-29 22:55:49 UTC (rev 13566)
+++ CalendarServer/trunk/txdav/dps/test/test_json.py 2014-05-29 22:56:05 UTC (rev 13567)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> from ..json import (
</span><span class="cx"> matchExpressionAsJSON, compoundExpressionAsJSON,
</span><del>- # expressionAsJSON, expressionAsJSONText,
</del><ins>+ expressionAsJSON, expressionAsJSONText,
</ins><span class="cx"> matchExpressionFromJSON, # compoundExpressionFromJSON,
</span><span class="cx"> # expressionFromJSON, expressionFromJSONText,
</span><span class="cx"> from_json_text, # to_json_text,
</span><span class="lines">@@ -40,53 +40,59 @@
</span><span class="cx"> Tests for serialization to JSON.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def test_matchExpressionAsJSON_basic(self):
</del><ins>+ def test_matchExpressionAsJSON_basic(
+ self, serialize=matchExpressionAsJSON
+ ):
</ins><span class="cx"> """
</span><span class="cx"> L{matchExpressionAsJSON} with default matching and flags.
</span><span class="cx"> """
</span><span class="cx"> uid = u"Some UID"
</span><span class="cx"> expression = MatchExpression(FieldName.uid, uid)
</span><del>- json = matchExpressionAsJSON(expression)
</del><ins>+ json = serialize(expression)
</ins><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": "MatchExpression",
- "field": "uid",
- "match": "equals",
- "value": uid,
- "flags": "{}",
</del><ins>+ u"type": u"MatchExpression",
+ u"field": u"uid",
+ u"match": u"equals",
+ u"value": uid,
+ u"flags": u"{}",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> self.assertEquals(json, expected)
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_matchExpressionAsJSON_types(self):
</del><ins>+ def test_matchExpressionAsJSON_types(
+ self, serialize=matchExpressionAsJSON
+ ):
</ins><span class="cx"> """
</span><span class="cx"> L{matchExpressionAsJSON} with various match types.
</span><span class="cx"> """
</span><span class="cx"> uid = u"Some UID"
</span><span class="cx">
</span><span class="cx"> for matchType, matchText in (
</span><del>- (MatchType.equals, "equals"),
- (MatchType.endsWith, "endsWith"),
- (MatchType.lessThanOrEqualTo, "lessThanOrEqualTo"),
</del><ins>+ (MatchType.equals, u"equals"),
+ (MatchType.endsWith, u"endsWith"),
+ (MatchType.lessThanOrEqualTo, u"lessThanOrEqualTo"),
</ins><span class="cx"> ):
</span><span class="cx"> expression = MatchExpression(
</span><span class="cx"> FieldName.uid, uid, matchType=matchType
</span><span class="cx"> )
</span><del>- json = matchExpressionAsJSON(expression)
</del><ins>+ json = serialize(expression)
</ins><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": "MatchExpression",
- "field": "uid",
- "match": matchText,
- "value": uid,
- "flags": "{}",
</del><ins>+ u"type": u"MatchExpression",
+ u"field": u"uid",
+ u"match": matchText,
+ u"value": uid,
+ u"flags": u"{}",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> self.assertEquals(json, expected)
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_matchExpressionAsJSON_flags(self):
</del><ins>+ def test_matchExpressionAsJSON_flags(
+ self, serialize=matchExpressionAsJSON
+ ):
</ins><span class="cx"> """
</span><span class="cx"> L{matchExpressionAsJSON} with various flags.
</span><span class="cx"> """
</span><span class="lines">@@ -95,36 +101,38 @@
</span><span class="cx"> for flags, flagsText, in (
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.none,
</span><del>- "{}"
</del><ins>+ u"{}"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.NOT,
</span><del>- "NOT"
</del><ins>+ u"NOT"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.caseInsensitive,
</span><del>- "caseInsensitive"
</del><ins>+ u"caseInsensitive"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.NOT | MatchFlags.caseInsensitive,
</span><del>- "{NOT,caseInsensitive}"
</del><ins>+ u"{NOT,caseInsensitive}"
</ins><span class="cx"> ),
</span><span class="cx"> ):
</span><span class="cx"> expression = MatchExpression(FieldName.uid, uid, flags=flags)
</span><del>- json = matchExpressionAsJSON(expression)
</del><ins>+ json = serialize(expression)
</ins><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": "MatchExpression",
- "field": "uid",
- "match": "equals",
- "value": uid,
- "flags": flagsText,
</del><ins>+ u"type": u"MatchExpression",
+ u"field": u"uid",
+ u"match": u"equals",
+ u"value": uid,
+ u"flags": flagsText,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> self.assertEquals(json, expected)
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_compoundExpressionAsJSON_expressions(self):
</del><ins>+ def test_compoundExpressionAsJSON_expressions(
+ self, serialize=compoundExpressionAsJSON
+ ):
</ins><span class="cx"> """
</span><span class="cx"> L{compoundExpressionAsJSON} with 0, 1 and 2 sub-expressions.
</span><span class="cx"> """
</span><span class="lines">@@ -142,35 +150,84 @@
</span><span class="cx"> json = compoundExpressionAsJSON(expression)
</span><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": "CompoundExpression",
- "expressions": subExpressionsText,
- "operand": "AND",
</del><ins>+ u"type": u"CompoundExpression",
+ u"expressions": subExpressionsText,
+ u"operand": u"AND",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> self.assertEquals(json, expected)
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_compoundExpressionAsJSON_operands(self):
</del><ins>+ def test_compoundExpressionAsJSON_operands(
+ self, serialize=compoundExpressionAsJSON
+ ):
</ins><span class="cx"> """
</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, "AND"),
- (Operand.OR, "OR"),
</del><ins>+ (Operand.AND, u"AND"),
+ (Operand.OR, u"OR"),
</ins><span class="cx"> ):
</span><span class="cx"> expression = CompoundExpression((), operand)
</span><span class="cx"> json = compoundExpressionAsJSON(expression)
</span><span class="cx">
</span><span class="cx"> expected = {
</span><del>- "type": "CompoundExpression",
- "expressions": [],
- "operand": operandText,
</del><ins>+ u"type": u"CompoundExpression",
+ u"expressions": [],
+ u"operand": operandText,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> self.assertEquals(json, expected)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_expressionAsJSON_matchExpression(self):
+ """
+ L{expressionAsJSON} with match expression.
+ """
+ self.test_matchExpressionAsJSON_basic(expressionAsJSON)
+ self.test_matchExpressionAsJSON_types(expressionAsJSON)
+ self.test_matchExpressionAsJSON_flags(expressionAsJSON)
</ins><span class="cx">
</span><ins>+
+ def test_expressionAsJSON_compoundExpression(self):
+ """
+ L{expressionAsJSON} with compound expression.
+ """
+ self.test_compoundExpressionAsJSON_expressions(expressionAsJSON)
+ self.test_compoundExpressionAsJSON_operands(expressionAsJSON)
+
+
+ def test_expressionAsJSON_unknown(self):
+ """
+ L{expressionAsJSON} with compound expression.
+ """
+ self.assertRaises(TypeError, expressionAsJSON, object())
+
+
+ def test_expressionAsJSONText(self):
+ """
+ L{expressionAsJSON} with compound expression.
+ """
+ uid = u"Some UID"
+ expression = MatchExpression(FieldName.uid, uid)
+ jsonText = expressionAsJSONText(expression)
+
+ expected = (
+ u"""
+ {{
+ "field": "uid",
+ "flags": "{{}}",
+ "match": "equals",
+ "value": "{uid}",
+ "type": "MatchExpression"
+ }}
+ """
+ ).replace(" ", "").replace("\n", "").format(uid=uid)
+
+ self.assertEquals(jsonText, expected)
+
+
+
</ins><span class="cx"> class DeserializationTests(unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for deserialization from JSON.
</span><span class="lines">@@ -187,7 +244,7 @@
</span><span class="cx"> service = self.service()
</span><span class="cx"> uid = u"Some UID"
</span><span class="cx"> jsonText = (
</span><del>- """
</del><ins>+ u"""
</ins><span class="cx"> {{
</span><span class="cx"> "type": "MatchExpression",
</span><span class="cx"> "field": "uid",
</span><span class="lines">@@ -211,12 +268,12 @@
</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, u"equals"),
+ (MatchType.endsWith, u"endsWith"),
+ (MatchType.lessThanOrEqualTo, u"lessThanOrEqualTo"),
</ins><span class="cx"> ):
</span><span class="cx"> jsonText = (
</span><del>- """
</del><ins>+ u"""
</ins><span class="cx"> {{
</span><span class="cx"> "type": "MatchExpression",
</span><span class="cx"> "field": "uid",
</span><span class="lines">@@ -244,23 +301,23 @@
</span><span class="cx"> for flags, flagsText, in (
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.none,
</span><del>- "{}"
</del><ins>+ u"{}"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.NOT,
</span><del>- "NOT"
</del><ins>+ u"NOT"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.caseInsensitive,
</span><del>- "caseInsensitive"
</del><ins>+ u"caseInsensitive"
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> MatchFlags.NOT | MatchFlags.caseInsensitive,
</span><del>- "{NOT,caseInsensitive}"
</del><ins>+ u"{NOT,caseInsensitive}"
</ins><span class="cx"> ),
</span><span class="cx"> ):
</span><span class="cx"> jsonText = (
</span><del>- """
</del><ins>+ u"""
</ins><span class="cx"> {{
</span><span class="cx"> "type": "MatchExpression",
</span><span class="cx"> "field": "uid",
</span></span></pre>
</div>
</div>
</body>
</html>