<!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>[14024] CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml</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/14024">14024</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-30 04:53:37 -0700 (Tue, 30 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to latest draft.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVtimezonestdservicexml">CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCalDAVtimezonestdservicexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml (14023 => 14024)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml 2014-09-30 10:55:58 UTC (rev 14023)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml 2014-09-30 11:53:37 UTC (rev 14024)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Non-query GET/POST'>
</del><ins>+ <test-suite name='Non-query GET'>
</ins><span class="cx"> <test name='1'>
</span><span class="cx"> <description>GET on resource</description>
</span><span class="cx"> <request>
</span><span class="lines">@@ -86,24 +86,28 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>POST on resource</description>
</del><ins>+ <description>PUT on resource - fails</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
</del><ins>+ <method>PUT</method>
</ins><span class="cx"> <ruri>$timezonestdservice:</ruri>
</span><ins>+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/recurrenceput/1.txt</filepath>
+ </data>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>statusCode</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>200</value>
- <value>400</value>
</del><ins>+ <value>403</value>
+ <value>405</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><del>- <description>PUT on resource - fails</description>
</del><ins>+ <description>POST on resource - fails</description>
</ins><span class="cx"> <request>
</span><del>- <method>PUT</method>
</del><ins>+ <method>POST</method>
</ins><span class="cx"> <ruri>$timezonestdservice:</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><span class="lines">@@ -156,24 +160,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>POST on resource - invalid parameter</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?query=true</ruri>
- <verify>
- <callback>jsonPointerMatch</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
- <name>exists</name>
- <value>/error~$invalid-action</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
</del><span class="cx"> <description>GET on resource - invalid action</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -191,25 +177,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4'>
- <description>POST on resource - invalid action</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=true</ruri>
- <verify>
- <callback>jsonPointerMatch</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
- <name>exists</name>
- <value>/error~$invalid-action</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='5'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>GET on resource - multiple actions</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -227,20 +195,24 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6'>
- <description>POST on resource - multiple methods</description>
</del><ins>+ </test-suite>
+
+ <test-suite name='Query method=capabilities'>
+ <test name='1'>
+ <description>GET on resource</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=list&amp;action=list</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=capabilities</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><del>- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
</del><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-action</value>
</del><ins>+ <value>/info/version~$1</value>
+ <value>/actions/./name~$capabilities</value>
+ <value>/actions/./name~$list</value>
+ <value>/actions/./name~$get</value>
+ <value>/actions/./name~$expand</value>
+ <value>/actions/./name~$find</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="lines">@@ -265,23 +237,6 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2'>
- <description>POST on resource</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=list</ruri>
- <verify>
- <callback>jsonPointerMatch</callback>
- <arg>
- <name>exists</name>
- <value>/dtstamp</value>
- <value>/timezones/./tzid~$America/New_York</value>
- <value>/timezones/./tzid~$America/Phoenix</value>
- <value>/timezones/./aliases/.~$GB</value>
- </arg>
- </verify>
- </request>
- </test>
</del><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Invalid query action=get'>
</span><span class="lines">@@ -304,24 +259,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>POST on resource - no tzid</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=get</ruri>
- <verify>
- <callback>jsonPointerMatch</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
- <name>exists</name>
- <value>/error~$invalid-tzid</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
</del><span class="cx"> <description>GET on resource - multiple tzid</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -339,25 +276,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4'>
- <description>POST on resource - multiple tzid</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=get&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
- <verify>
- <callback>jsonPointerMatch</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
- <name>exists</name>
- <value>/error~$invalid-tzid</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='5'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>GET on resource - invalid tzid</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -375,24 +294,6 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6'>
- <description>POST on resource - invalid tzid</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=get&amp;tzid=America/Pittsburgh</ruri>
- <verify>
- <callback>jsonPointerMatch</callback>
- <arg>
- <name>status</name>
- <value>404</value>
- </arg>
- <arg>
- <name>exists</name>
- <value>/error~$tzid-not-found</value>
- </arg>
- </verify>
- </request>
- </test>
</del><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Query action=get'>
</span><span class="lines">@@ -418,27 +319,6 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>POST on resource</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=get&amp;tzid=America/New_York</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>doTimezones</name>
- <value>true</value>
- </arg>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/timezonestdservice/New_York.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='3'>
</del><span class="cx"> <description>GET on resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -459,28 +339,7 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='4'>
- <description>POST on resource</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=get&amp;tzid=Europe/London</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>doTimezones</name>
- <value>true</value>
- </arg>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/timezonestdservice/London.ics</value>
- </arg>
- </verify>
- </request>
- </test>
- <test name='5'>
</del><ins>+ <test name='3'>
</ins><span class="cx"> <description>GET on resource</description>
</span><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><span class="lines">@@ -501,27 +360,6 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6'>
- <description>POST on resource</description>
- <request>
- <method>POST</method>
- <ruri>$timezonestdservice:?action=get&amp;tzid=GB</ruri>
- <verify>
- <callback>statusCode</callback>
- </verify>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>doTimezones</name>
- <value>true</value>
- </arg>
- <arg>
- <name>filepath</name>
- <value>Resource/CalDAV/timezonestdservice/GB.ics</value>
- </arg>
- </verify>
- </request>
- </test>
</del><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='Invalid query action=expand'>
</span><span class="lines">@@ -544,10 +382,10 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>POST on resource - no tzid</description>
</del><ins>+ <description>GET on resource - multiple tzid</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -562,28 +400,28 @@
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>GET on resource - multiple tzid</description>
</del><ins>+ <description>GET on resource - invalid tzid</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>400</value>
</del><ins>+ <value>404</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-tzid</value>
</del><ins>+ <value>/error~$tzid-not-found</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><del>- <description>POST on resource - multiple tzid</description>
</del><ins>+ <description>GET on resource - too many start</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;start=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -592,52 +430,52 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-tzid</value>
</del><ins>+ <value>/error~$invalid-start</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5'>
</span><del>- <description>GET on resource - invalid tzid</description>
</del><ins>+ <description>GET on resource - invalid start</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>400</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$tzid-not-found</value>
</del><ins>+ <value>/error~$invalid-start</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><del>- <description>POST on resource - invalid tzid</description>
</del><ins>+ <description>GET on resource - too many end</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z&amp;end=2009</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>status</name>
</span><del>- <value>404</value>
</del><ins>+ <value>400</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$tzid-not-found</value>
</del><ins>+ <value>/error~$invalid-end</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='7'>
</span><del>- <description>GET on resource - too many start</description>
</del><ins>+ <description>GET on resource - invalid end</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;start=2009</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -646,16 +484,16 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-start</value>
</del><ins>+ <value>/error~$invalid-end</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='8'>
</span><del>- <description>POST on resource - too many start</description>
</del><ins>+ <description>GET on resource - start > end</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;start=2009</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2009-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -664,16 +502,16 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-start</value>
</del><ins>+ <value>/error~$invalid-end</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='9'>
</span><del>- <description>GET on resource - invalid start</description>
</del><ins>+ <description>GET on resource - start == end</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -682,106 +520,114 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-start</value>
</del><ins>+ <value>/error~$invalid-end</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='10'>
- <description>POST on resource - invalid start</description>
</del><ins>+ </test-suite>
+
+ <test-suite name="Expand">
+ <test name='1'>
+ <description>GET on resource - simple range</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><del>- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
</del><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-start</value>
</del><ins>+ <value>/dtstamp</value>
+ <value>/tzid~$America/New_York</value>
+ <value>/observances/./onset~$2008-01-01T00:00:00Z</value>
+ <value>/observances/./onset~$2008-03-09T07:00:00Z</value>
+ <value>/observances/./onset~$2008-11-02T06:00:00Z</value>
+ <value>/observances/./utc-offset-from~$-18000</value>
+ <value>/observances/./utc-offset-to~$-18000</value>
+ <value>/observances/./utc-offset-from~$-14400</value>
+ <value>/observances/./utc-offset-to~$-14400</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='11'>
- <description>GET on resource - too many end</description>
</del><ins>+ <test name='2'>
+ <description>GET on resource - complex range</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009&amp;end=2009</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><del>- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
</del><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-end</value>
</del><ins>+ <value>/dtstamp</value>
+ <value>/tzid~$America/New_York</value>
+ <value>/observances/./onset~$2006-01-01T00:00:00Z</value>
+ <value>/observances/./onset~$2006-04-02T07:00:00Z</value>
+ <value>/observances/./onset~$2006-10-29T06:00:00Z</value>
+ <value>/observances/./onset~$2007-03-11T07:00:00Z</value>
+ <value>/observances/./onset~$2007-11-04T06:00:00Z</value>
+ <value>/observances/./utc-offset-from~$-18000</value>
+ <value>/observances/./utc-offset-to~$-18000</value>
+ <value>/observances/./utc-offset-from~$-14400</value>
+ <value>/observances/./utc-offset-to~$-14400</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='12'>
- <description>POST on resource - too many end</description>
</del><ins>+ <test name='3'>
+ <description>GET on resource - no DST</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009&amp;end=2009</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Phoenix&amp;start=2006-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><del>- <callback>jsonPointerMatch</callback>
- <arg>
- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
- <name>exists</name>
- <value>/error~$invalid-end</value>
- </arg>
</del><ins>+ <callback>statusCode</callback>
</ins><span class="cx"> </verify>
</span><del>- </request>
- </test>
- <test name='13'>
- <description>GET on resource - invalid end</description>
- <request>
- <method>GET</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=20090101</ruri>
</del><span class="cx"> <verify>
</span><del>- <callback>jsonPointerMatch</callback>
</del><ins>+ <callback>dataString</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>status</name>
- <value>400</value>
</del><ins>+ <name>contains</name>
+ <value>2006-01-01T00:00:00Z</value>
+ <value>-25200</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><del>- <name>exists</name>
- <value>/error~$invalid-end</value>
</del><ins>+ <name>notcontains</name>
+ <value>2007</value>
+ <value>2008</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='14'>
- <description>POST on resource - invalid end</description>
</del><ins>+ <test name='4'>
+ <description>GET on resource trailing slash - simple range</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=20090101</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:/?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><del>- <name>status</name>
- <value>400</value>
- </arg>
- <arg>
</del><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-end</value>
</del><ins>+ <value>/dtstamp</value>
+ <value>/tzid~$America/New_York</value>
+ <value>/observances/./onset~$2008-01-01T00:00:00Z</value>
+ <value>/observances/./onset~$2008-03-09T07:00:00Z</value>
+ <value>/observances/./onset~$2008-11-02T06:00:00Z</value>
+ <value>/observances/./utc-offset-from~$-18000</value>
+ <value>/observances/./utc-offset-to~$-18000</value>
+ <value>/observances/./utc-offset-from~$-14400</value>
+ <value>/observances/./utc-offset-to~$-14400</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='15'>
- <description>GET on resource - start > end</description>
</del><ins>+ </test-suite>
+
+
+ <test-suite name='Invalid query action=find'>
+ <test name='1'>
+ <description>GET on resource - no pattern</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2009&amp;end=2008</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=find</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -790,16 +636,16 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-end</value>
</del><ins>+ <value>/error~$invalid-pattern</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='16'>
- <description>POST on resource - start > end</description>
</del><ins>+ <test name='2'>
+ <description>GET on resource - multiple pattern</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2009&amp;end=2008</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=America/New_York&amp;pattern=America/Los_Angeles</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -808,16 +654,16 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-end</value>
</del><ins>+ <value>/error~$invalid-pattern</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='17'>
- <description>GET on resource - start == end</description>
</del><ins>+ <test name='3'>
+ <description>GET on resource - empty pattern</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2008</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=find&amp;pattern=*</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -826,16 +672,16 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-end</value>
</del><ins>+ <value>/error~$invalid-pattern</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='18'>
- <description>POST on resource - start == end</description>
</del><ins>+ <test name='4'>
+ <description>GET on resource - empty pattern</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2008</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=**</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="lines">@@ -844,168 +690,151 @@
</span><span class="cx"> </arg>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><del>- <value>/error~$invalid-end</value>
</del><ins>+ <value>/error~$invalid-pattern</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name="Expand">
</del><ins>+ <test-suite name='Query method=find'>
</ins><span class="cx"> <test name='1'>
</span><del>- <description>GET on resource - simple range</description>
</del><ins>+ <description>GET on resource - exact tzid</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=find&amp;pattern=America/New_York</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>/dtstamp</value>
</span><del>- <value>/observances/./onset~$2008-01-01T00:00:00</value>
- <value>/observances/./onset~$2008-03-09T02:00:00</value>
- <value>/observances/./onset~$2008-11-02T02:00:00</value>
- <value>/observances/./utc-offset-from~$-18000</value>
- <value>/observances/./utc-offset-to~$-18000</value>
- <value>/observances/./utc-offset-from~$-14400</value>
- <value>/observances/./utc-offset-to~$-14400</value>
</del><ins>+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='2'>
</span><del>- <description>POST on resource - simple range</description>
</del><ins>+ <description>GET on resource - starts tzid</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=America/New_*</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>/dtstamp</value>
</span><del>- <value>/observances/./onset~$2008-01-01T00:00:00</value>
- <value>/observances/./onset~$2008-03-09T02:00:00</value>
- <value>/observances/./onset~$2008-11-02T02:00:00</value>
- <value>/observances/./utc-offset-from~$-18000</value>
- <value>/observances/./utc-offset-to~$-18000</value>
- <value>/observances/./utc-offset-from~$-14400</value>
- <value>/observances/./utc-offset-to~$-14400</value>
</del><ins>+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><del>- <description>GET on resource - complex range</description>
</del><ins>+ <description>GET on resource - end tzid</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006&amp;end=2008</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=find&amp;pattern=*/New_York</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>/dtstamp</value>
</span><del>- <value>/observances/./onset~$2006-01-01T00:00:00</value>
- <value>/observances/./onset~$2006-04-02T02:00:00</value>
- <value>/observances/./onset~$2006-10-29T02:00:00</value>
- <value>/observances/./onset~$2007-03-11T02:00:00</value>
- <value>/observances/./onset~$2007-11-04T02:00:00</value>
- <value>/observances/./utc-offset-from~$-18000</value>
- <value>/observances/./utc-offset-to~$-18000</value>
- <value>/observances/./utc-offset-from~$-14400</value>
- <value>/observances/./utc-offset-to~$-14400</value>
</del><ins>+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='4'>
</span><del>- <description>POST on resource - complex range</description>
</del><ins>+ <description>GET on resource - contains tzid</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006&amp;end=2008</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=*/New_*</ruri>
</ins><span class="cx"> <verify>
</span><del>- <callback>statusCode</callback>
- </verify>
- <verify>
</del><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>/dtstamp</value>
</span><del>- <value>/observances/./onset~$2006-01-01T00:00:00</value>
- <value>/observances/./onset~$2006-04-02T02:00:00</value>
- <value>/observances/./onset~$2006-10-29T02:00:00</value>
- <value>/observances/./onset~$2007-03-11T02:00:00</value>
- <value>/observances/./onset~$2007-11-04T02:00:00</value>
- <value>/observances/./utc-offset-from~$-18000</value>
- <value>/observances/./utc-offset-to~$-18000</value>
- <value>/observances/./utc-offset-from~$-14400</value>
- <value>/observances/./utc-offset-to~$-14400</value>
</del><ins>+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='5'>
</span><del>- <description>GET on resource - no DST</description>
</del><ins>+ <description>GET on resource - starts tzid multiple</description>
</ins><span class="cx"> <request>
</span><span class="cx"> <method>GET</method>
</span><del>- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Phoenix&amp;start=2006&amp;end=2009</ruri>
</del><ins>+ <ruri>$timezonestdservice:?action=find&amp;pattern=America/N*</ruri>
</ins><span class="cx"> <verify>
</span><del>- <callback>statusCode</callback>
- </verify>
- <verify>
- <callback>dataString</callback>
</del><ins>+ <callback>jsonPointerMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>contains</name>
- <value>2006-01-01T00:00:00</value>
- <value>-25200</value>
</del><ins>+ <name>exists</name>
+ <value>/dtstamp</value>
+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><del>- <arg>
- <name>notcontains</name>
- <value>2007</value>
- <value>2008</value>
- </arg>
</del><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><span class="cx"> <test name='6'>
</span><del>- <description>POST on resource - start == end</description>
</del><ins>+ <description>GET on resource - one alias</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Phoenix&amp;start=2006&amp;end=2009</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=US/Eastern</ruri>
</ins><span class="cx"> <verify>
</span><del>- <callback>statusCode</callback>
</del><ins>+ <callback>jsonPointerMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>/dtstamp</value>
+ <value>/timezones/./tzid~$America/New_York</value>
+ </arg>
</ins><span class="cx"> </verify>
</span><ins>+ </request>
+ </test>
+ <test name='7'>
+ <description>GET on resource - alias and tzid</description>
+ <request>
+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=Africa/L*</ruri>
</ins><span class="cx"> <verify>
</span><del>- <callback>dataString</callback>
</del><ins>+ <callback>jsonPointerMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>contains</name>
- <value>2006-01-01T00:00:00</value>
- <value>-25200</value>
</del><ins>+ <name>exists</name>
+ <value>/dtstamp</value>
+ <value>/timezones/./tzid~$Africa/Lagos</value>
+ <value>/timezones/./tzid~$Africa/Maputo</value>
+ <value>/timezones/./tzid~$Africa/Abidjan</value>
+ <value>/timezones/./aliases/.~$Africa/Lome</value>
+ <value>/timezones/./aliases/.~$Africa/Libreville</value>
+ <value>/timezones/./aliases/.~$Africa/Luanda</value>
+ <value>/timezones/./aliases/.~$Africa/Lubumbashi</value>
</ins><span class="cx"> </arg>
</span><ins>+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>GET on resource - contains text underscore</description>
+ <request>
+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=*New%20York*</ruri>
+ <verify>
+ <callback>jsonPointerMatch</callback>
</ins><span class="cx"> <arg>
</span><del>- <name>notcontains</name>
- <value>2007</value>
- <value>2008</value>
</del><ins>+ <name>exists</name>
+ <value>/dtstamp</value>
+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7'>
- <description>POST on resource trailing slash - simple range</description>
</del><ins>+ <test name='9'>
+ <description>GET on resource - contains text lowercase</description>
</ins><span class="cx"> <request>
</span><del>- <method>POST</method>
- <ruri>$timezonestdservice:/?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009</ruri>
</del><ins>+ <method>GET</method>
+ <ruri>$timezonestdservice:?action=find&amp;pattern=*new%20york*</ruri>
</ins><span class="cx"> <verify>
</span><span class="cx"> <callback>jsonPointerMatch</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>exists</name>
</span><span class="cx"> <value>/dtstamp</value>
</span><del>- <value>/observances/./onset~$2008-01-01T00:00:00</value>
- <value>/observances/./onset~$2008-03-09T02:00:00</value>
- <value>/observances/./onset~$2008-11-02T02:00:00</value>
- <value>/observances/./utc-offset-from~$-18000</value>
- <value>/observances/./utc-offset-to~$-18000</value>
- <value>/observances/./utc-offset-from~$-14400</value>
- <value>/observances/./utc-offset-to~$-14400</value>
</del><ins>+ <value>/timezones/./tzid~$America/New_York</value>
</ins><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span></span></pre>
</div>
</div>
</body>
</html>