[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [13558] CalendarServer/trunk/txdav/dps/test/test_json.py
From: source_changes () macosforge ! org
Date: 2014-05-29 18:44:32
Message-ID: 20140529184432.C3E08140ED4 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 13558
http://trac.calendarserver.org//changeset/13558
Author: wsanchez@apple.com
Date: 2014-05-29 11:44:32 -0700 (Thu, 29 May 2014)
Log Message:
-----------
Add tests for matchExpressionAsJSON()
Added Paths:
-----------
CalendarServer/trunk/txdav/dps/test/test_json.py
Added: CalendarServer/trunk/txdav/dps/test/test_json.py
===================================================================
--- CalendarServer/trunk/txdav/dps/test/test_json.py (rev 0)
+++ CalendarServer/trunk/txdav/dps/test/test_json.py 2014-05-29 18:44:32 UTC (rev 13558)
@@ -0,0 +1,122 @@
+#
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Tests for txdav.dps.json.
+"""
+
+from twext.who.idirectory import FieldName
+from twext.who.expression import MatchExpression, MatchType, MatchFlags
+# from twext.who.expression import CompoundExpression, Operand
+
+from ..json import (
+ matchExpressionAsJSON, # compoundExpressionAsJSON,
+ # expressionAsJSON, expressionAsJSONText,
+ # matchExpressionFromJSON, compoundExpressionFromJSON,
+ # expressionFromJSON, expressionFromJSONText,
+)
+
+from twisted.trial import unittest
+
+
+
+class SerializationTests(unittest.TestCase):
+ """
+ Tests for serialization to JSON.
+ """
+
+ def test_matchExpressionAsJSON_basic(self):
+ """
+ L{matchExpressionAsJSON} with default matching and flags.
+ """
+ uid = u"Some UID"
+ expression = MatchExpression(FieldName.uid, uid)
+ json = matchExpressionAsJSON(expression)
+
+ expected = {
+ "type": "MatchExpression",
+ "field": "uid",
+ "match": "equals",
+ "value": uid,
+ "flags": "{}",
+ }
+
+ self.assertEquals(json, expected)
+
+
+ def test_matchExpressionAsJSON_types(self):
+ """
+ L{matchExpressionAsJSON} with various match types.
+ """
+ uid = u"Some UID"
+
+ for matchType, matchText in (
+ (MatchType.equals, b"equals"),
+ (MatchType.endsWith, b"endsWith"),
+ (MatchType.lessThanOrEqualTo, b"lessThanOrEqualTo"),
+ ):
+ expression = MatchExpression(
+ FieldName.uid, uid, matchType=matchType
+ )
+ json = matchExpressionAsJSON(expression)
+
+ expected = {
+ "type": b"MatchExpression",
+ "field": b"uid",
+ "match": matchText,
+ "value": uid,
+ "flags": "{}",
+ }
+
+ self.assertEquals(json, expected)
+
+
+ def test_matchExpressionAsJSON_flags(self):
+ """
+ L{matchExpressionAsJSON} with various flags.
+ """
+ uid = u"Some UID"
+
+ for flags, flagsText, in (
+ (
+ MatchFlags.none,
+ b"{}"
+ ),
+ (
+ MatchFlags.NOT,
+ b"NOT"
+ ),
+ (
+ MatchFlags.caseInsensitive,
+ b"caseInsensitive"
+ ),
+ (
+ MatchFlags.NOT | MatchFlags.caseInsensitive,
+ b"{NOT,caseInsensitive}"
+ ),
+ ):
+ expression = MatchExpression(FieldName.uid, uid, flags=flags)
+ json = matchExpressionAsJSON(expression)
+
+ expected = {
+ "type": b"MatchExpression",
+ "field": b"uid",
+ "match": b"equals",
+ "value": uid,
+ "flags": flagsText,
+ }
+
+ self.assertEquals(json, expected)
[Attachment #5 (text/html)]
<!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>[13558] 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/13558">13558</a></dd> <dt>Author</dt> \
<dd>wsanchez@apple.com</dd> <dt>Date</dt> <dd>2014-05-29 11:44:32 -0700 (Thu, 29 May \
2014)</dd> </dl>
<h3>Log Message</h3>
<pre>Add tests for matchExpressionAsJSON()</pre>
<h3>Added 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="addfile"><h4>Added: CalendarServer/trunk/txdav/dps/test/test_json.py (0 \
=> 13558)</h4> <pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_json.py \
(rev 0)
+++ CalendarServer/trunk/txdav/dps/test/test_json.py 2014-05-29 18:44:32 UTC (rev \
13558) </span><span class="lines">@@ -0,0 +1,122 @@
</span><ins>+#
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Tests for txdav.dps.json.
+"""
+
+from twext.who.idirectory import FieldName
+from twext.who.expression import MatchExpression, MatchType, MatchFlags
+# from twext.who.expression import CompoundExpression, Operand
+
+from ..json import (
+ matchExpressionAsJSON, # compoundExpressionAsJSON,
+ # expressionAsJSON, expressionAsJSONText,
+ # matchExpressionFromJSON, compoundExpressionFromJSON,
+ # expressionFromJSON, expressionFromJSONText,
+)
+
+from twisted.trial import unittest
+
+
+
+class SerializationTests(unittest.TestCase):
+ """
+ Tests for serialization to JSON.
+ """
+
+ def test_matchExpressionAsJSON_basic(self):
+ """
+ L{matchExpressionAsJSON} with default matching and flags.
+ """
+ uid = u"Some UID"
+ expression = MatchExpression(FieldName.uid, uid)
+ json = matchExpressionAsJSON(expression)
+
+ expected = {
+ "type": "MatchExpression",
+ "field": "uid",
+ "match": "equals",
+ "value": uid,
+ "flags": "{}",
+ }
+
+ self.assertEquals(json, expected)
+
+
+ def test_matchExpressionAsJSON_types(self):
+ """
+ L{matchExpressionAsJSON} with various match types.
+ """
+ uid = u"Some UID"
+
+ for matchType, matchText in (
+ (MatchType.equals, b"equals"),
+ (MatchType.endsWith, b"endsWith"),
+ (MatchType.lessThanOrEqualTo, b"lessThanOrEqualTo"),
+ ):
+ expression = MatchExpression(
+ FieldName.uid, uid, matchType=matchType
+ )
+ json = matchExpressionAsJSON(expression)
+
+ expected = {
+ "type": b"MatchExpression",
+ "field": b"uid",
+ "match": matchText,
+ "value": uid,
+ "flags": "{}",
+ }
+
+ self.assertEquals(json, expected)
+
+
+ def test_matchExpressionAsJSON_flags(self):
+ """
+ L{matchExpressionAsJSON} with various flags.
+ """
+ uid = u"Some UID"
+
+ for flags, flagsText, in (
+ (
+ MatchFlags.none,
+ b"{}"
+ ),
+ (
+ MatchFlags.NOT,
+ b"NOT"
+ ),
+ (
+ MatchFlags.caseInsensitive,
+ b"caseInsensitive"
+ ),
+ (
+ MatchFlags.NOT | MatchFlags.caseInsensitive,
+ b"{NOT,caseInsensitive}"
+ ),
+ ):
+ expression = MatchExpression(FieldName.uid, uid, flags=flags)
+ json = matchExpressionAsJSON(expression)
+
+ expected = {
+ "type": b"MatchExpression",
+ "field": b"uid",
+ "match": b"equals",
+ "value": uid,
+ "flags": flagsText,
+ }
+
+ self.assertEquals(json, expected)
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic