<!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>[13914] CalDAVTester/trunk</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/13914">13914</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-22 11:13:07 -0700 (Fri, 22 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better handling of calendar/contact data comparisons. Minor script file clean-ups.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVputxml">CalDAVTester/trunk/scripts/tests/CardDAV/put.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingbulkxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml</a></li>
<li><a href="#CalDAVTestertrunkverifiersaddressDataMatchpy">CalDAVTester/trunk/verifiers/addressDataMatch.py</a></li>
<li><a href="#CalDAVTestertrunkverifierscalendarDataMatchpy">CalDAVTester/trunk/verifiers/calendarDataMatch.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkverifiersjcardDataMatchpy">CalDAVTester/trunk/verifiers/jcardDataMatch.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCardDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd (13913 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2014-08-22 18:00:16 UTC (rev 13913)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd 2014-08-22 18:13:07 UTC (rev 13914)
</span><span class="lines">@@ -74,7 +74,8 @@
</span><span class="cx"> <!ELEMENT test-suite (require-feature?, exclude-feature?, test*)>
</span><span class="cx"> <!ATTLIST test-suite name CDATA #REQUIRED
</span><span class="cx"> ignore (yes|no) "no"
</span><del>- only (yes|no) "no">
</del><ins>+ only (yes|no) "no"
+ change-uid (yes|no) "no">
</ins><span class="cx">
</span><span class="cx"> <!ELEMENT test (require-feature?, exclude-feature?, description?, (request|pause)+)>
</span><span class="cx"> <!ATTLIST test name CDATA #REQUIRED
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVputxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/put.xml (13913 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/put.xml 2014-08-22 18:00:16 UTC (rev 13913)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/put.xml 2014-08-22 18:13:07 UTC (rev 13914)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start>
</span><del>- <description>clean up old data</description>
</del><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -591,7 +590,6 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end>
</span><del>- <description>clean up old data</description>
</del><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingbulkxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml (13913 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml 2014-08-22 18:00:16 UTC (rev 13913)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml 2014-08-22 18:13:07 UTC (rev 13914)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> <test-suite name='POST with circular groups'>
</span><span class="cx"> <test name='0'>
</span><del>- <description>clean up old data</description>
</del><ins>+ <!-- clean up old data -->
</ins><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/1.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>user2 POSTs invitation</description>
</del><ins>+ <!-- user2 POSTs invitation -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath2:/1.vcf</ruri>
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <variable>$inviteuid:</variable>
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><del>- <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> <test-suite name='POST with circular groups and one bad reference'>
</span><span class="cx"> <test name='0'>
</span><del>- <description>clean up old data</description>
</del><ins>+ <!-- clean up old data -->
</ins><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/1.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>user2 POSTs invitation</description>
</del><ins>+ <!-- user2 POSTs invitation -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath2:/1.vcf</ruri>
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> <variable>$inviteuid:</variable>
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><del>- <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx">
</span><span class="cx"> <test-suite name='CRUD POST with circular groups'>
</span><span class="cx"> <test name='0'>
</span><del>- <description>clean up old data</description>
</del><ins>+ <!-- clean up old data -->
</ins><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/1.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>user2 POSTs invitation</description>
</del><ins>+ <!-- user2 POSTs invitation -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath2:/1.vcf</ruri>
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> <variable>$inviteuid:</variable>
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><del>- <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx">
</span><span class="cx"> <test-suite name='crud POST with circular groups and one bad reference'>
</span><span class="cx"> <test name='0'>
</span><del>- <description>clean up old data</description>
</del><ins>+ <!-- clean up old data -->
</ins><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/1.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>user2 POSTs invitation</description>
</del><ins>+ <!-- user2 POSTs invitation -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath2:/1.vcf</ruri>
</span><span class="lines">@@ -645,7 +645,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> <variable>$inviteuid:</variable>
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><del>- <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -789,7 +789,7 @@
</span><span class="cx">
</span><span class="cx"> <test-suite name='crud POST delete cannot delete (unshare) read-write shared group'>
</span><span class="cx"> <test name='0'>
</span><del>- <description>clean up old data</description>
</del><ins>+ <!-- clean up old data -->
</ins><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/1.vcf</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>user2 POSTs invitation</description>
</del><ins>+ <!-- user2 POSTs invitation -->
</ins><span class="cx"> <request user="$userid2:" pswd="$pswd2:">
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookpath2:/1.vcf</ruri>
</span><span class="lines">@@ -814,7 +814,7 @@
</span><span class="cx"> <filepath>Resource/CardDAV/sharing/bulk/9.xml</filepath>
</span><span class="cx"> </data>
</span><span class="cx"> </request>
</span><del>- <description>Check user1 notification collection and get invite uid</description>
</del><ins>+ <!-- Check user1 notification collection and get invite uid -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>WAITCOUNT 1</method>
</span><span class="cx"> <ruri>$notificationpath1:/</ruri>
</span><span class="lines">@@ -827,7 +827,7 @@
</span><span class="cx"> <variable>$inviteuid:</variable>
</span><span class="cx"> </grabelement>
</span><span class="cx"> </request>
</span><del>- <description>user1 replies ACCEPTED and deletes notification</description>
</del><ins>+ <!-- user1 replies ACCEPTED and deletes notification -->
</ins><span class="cx"> <request>
</span><span class="cx"> <method>POST</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span><span class="lines">@@ -921,7 +921,6 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <end>
</span><del>- <description>clean up old data</description>
</del><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="cx"> <method>DELETEALL</method>
</span><span class="cx"> <ruri>$addressbookhome1:/</ruri>
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersaddressDataMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/addressDataMatch.py (13913 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/addressDataMatch.py 2014-08-22 18:00:16 UTC (rev 13913)
+++ CalDAVTester/trunk/verifiers/addressDataMatch.py 2014-08-22 18:13:07 UTC (rev 13914)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> class Verifier(object):
</span><span class="cx">
</span><del>- def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
</del><ins>+ def verify(self, manager, uri, response, respdata, args, is_json=False): #@UnusedVariable
</ins><span class="cx"> # Get arguments
</span><span class="cx"> files = args.get("filepath", [])
</span><span class="cx"> carddata = args.get("data", [])
</span><span class="lines">@@ -80,15 +80,17 @@
</span><span class="cx"> component.removeProperty(property)
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- resp_adbk = Card.parseText(respdata)
</del><ins>+ format = Card.sFormatJSON if is_json else Card.sFormatText
+
+ resp_adbk = Card.parseData(respdata, format=format)
</ins><span class="cx"> removePropertiesParameters(resp_adbk)
</span><del>- respdata = resp_adbk.getText()
</del><ins>+ respdata = resp_adbk.getText(format=format)
</ins><span class="cx">
</span><del>- data_adbk = Card.parseText(data)
</del><ins>+ data_adbk = Card.parseData(data, format=format)
</ins><span class="cx"> removePropertiesParameters(data_adbk)
</span><del>- data = data_adbk.getText()
</del><ins>+ data = data_adbk.getText(format=format)
</ins><span class="cx">
</span><del>- result = respdata == data
</del><ins>+ result = resp_adbk == data_adbk
</ins><span class="cx">
</span><span class="cx"> if result:
</span><span class="cx"> return True, ""
</span></span></pre></div>
<a id="CalDAVTestertrunkverifierscalendarDataMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py (13913 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/calendarDataMatch.py 2014-08-22 18:00:16 UTC (rev 13913)
+++ CalDAVTester/trunk/verifiers/calendarDataMatch.py 2014-08-22 18:13:07 UTC (rev 13914)
</span><span class="lines">@@ -114,15 +114,17 @@
</span><span class="cx"> component.removeProperty(property)
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- resp_calendar = Calendar.parseText(respdata) if not is_json else Calendar.parseJSONData(respdata)
</del><ins>+ format = Calendar.sFormatJSON if is_json else Calendar.sFormatText
+
+ resp_calendar = Calendar.parseData(respdata, format=format)
</ins><span class="cx"> removePropertiesParameters(resp_calendar)
</span><del>- respdata = resp_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES) if not is_json else resp_calendar.getTextJSON()
</del><ins>+ respdata = resp_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
</ins><span class="cx">
</span><del>- data_calendar = Calendar.parseText(data) if not is_json else Calendar.parseJSONData(data)
</del><ins>+ data_calendar = Calendar.parseData(data, format=format)
</ins><span class="cx"> removePropertiesParameters(data_calendar)
</span><del>- data = data_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES) if not is_json else data_calendar.getTextJSON()
</del><ins>+ data = data_calendar.getText(includeTimezones=Calendar.NO_TIMEZONES, format=format)
</ins><span class="cx">
</span><del>- result = respdata == data
</del><ins>+ result = resp_calendar == data_calendar
</ins><span class="cx">
</span><span class="cx"> if result:
</span><span class="cx"> return True, ""
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersjcardDataMatchpy"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/verifiers/jcardDataMatch.py (0 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/jcardDataMatch.py (rev 0)
+++ CalDAVTester/trunk/verifiers/jcardDataMatch.py 2014-08-22 18:13:07 UTC (rev 13914)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+##
+# Copyright (c) 2013 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.
+##
+
+from verifiers.addressDataMatch import Verifier as CardVerifier
+
+"""
+Verifier that checks the response body for a semantic match to data in a file.
+"""
+
+class Verifier(object):
+
+ def verify(self, manager, uri, response, respdata, args):
+
+ # Just hand this off to the addressDataMatch verifier which knows all about
+ # proper vCard normalization rules.
+ verifier = CardVerifier()
+ return verifier.verify(manager, uri, response, respdata, args, is_json=True)
</ins></span></pre>
</div>
</div>
</body>
</html>