[CalendarServer-changes] [14024] CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml

source_changes at macosforge.org source_changes at macosforge.org
Tue Sep 30 04:53:37 PDT 2014


Revision: 14024
          http://trac.calendarserver.org//changeset/14024
Author:   cdaboo at apple.com
Date:     2014-09-30 04:53:37 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
Update to latest draft.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml
===================================================================
--- 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)
@@ -45,7 +45,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Non-query GET/POST'>
+	<test-suite name='Non-query GET'>
 		<test name='1'>
 			<description>GET on resource</description>
 			<request>
@@ -86,24 +86,28 @@
 			</request>
 		</test>
 		<test name='3'>
-			<description>POST on resource</description>
+			<description>PUT on resource - fails</description>
 			<request>
-				<method>POST</method>
+				<method>PUT</method>
 				<ruri>$timezonestdservice:</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/recurrenceput/1.txt</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 					<arg>
 						<name>status</name>
-						<value>200</value>
-						<value>400</value>
+						<value>403</value>
+						<value>405</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='4'>
-			<description>PUT on resource - fails</description>
+			<description>POST on resource - fails</description>
 			<request>
-				<method>PUT</method>
+				<method>POST</method>
 				<ruri>$timezonestdservice:</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
@@ -156,24 +160,6 @@
 			</request>
 		</test>
 		<test name='2'>
-			<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'>
 			<description>GET on resource - invalid action</description>
 			<request>
 				<method>GET</method>
@@ -191,25 +177,7 @@
 				</verify>
 			</request>
 		</test>
-		<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'>
+		<test name='3'>
 			<description>GET on resource - multiple actions</description>
 			<request>
 				<method>GET</method>
@@ -227,20 +195,24 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6'>
-			<description>POST on resource - multiple methods</description>
+	</test-suite>
+	
+	<test-suite name='Query method=capabilities'>
+		<test name='1'>
+			<description>GET on resource</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=list&amp;action=list</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=capabilities</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
-						<name>status</name>
-						<value>400</value>
-					</arg>
-					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-action</value>
+						<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>
 					</arg>
 				</verify>
 			</request>
@@ -265,23 +237,6 @@
 				</verify>
 			</request>
 		</test>
-		<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>
 	</test-suite>
 	
 	<test-suite name='Invalid query action=get'>
@@ -304,24 +259,6 @@
 			</request>
 		</test>
 		<test name='2'>
-			<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'>
 			<description>GET on resource - multiple tzid</description>
 			<request>
 				<method>GET</method>
@@ -339,25 +276,7 @@
 				</verify>
 			</request>
 		</test>
-		<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'>
+		<test name='3'>
 			<description>GET on resource - invalid tzid</description>
 			<request>
 				<method>GET</method>
@@ -375,24 +294,6 @@
 				</verify>
 			</request>
 		</test>
-		<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>
 	</test-suite>
 	
 	<test-suite name='Query action=get'>
@@ -418,27 +319,6 @@
 			</request>
 		</test>
 		<test name='2'>
-			<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'>
 			<description>GET on resource</description>
 			<request>
 				<method>GET</method>
@@ -459,28 +339,7 @@
 				</verify>
 			</request>
 		</test>
-		<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'>
+		<test name='3'>
 			<description>GET on resource</description>
 			<request>
 				<method>GET</method>
@@ -501,27 +360,6 @@
 				</verify>
 			</request>
 		</test>
-		<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>
 	</test-suite>
 	
 	<test-suite name='Invalid query action=expand'>
@@ -544,10 +382,10 @@
 			</request>
 		</test>
 		<test name='2'>
-			<description>POST on resource - no tzid</description>
+			<description>GET on resource - multiple tzid</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -562,28 +400,28 @@
 			</request>
 		</test>
 		<test name='3'>
-			<description>GET on resource - multiple tzid</description>
+			<description>GET on resource - invalid tzid</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
+				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>status</name>
-						<value>400</value>
+						<value>404</value>
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-tzid</value>
+						<value>/error~$tzid-not-found</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='4'>
-			<description>POST on resource - multiple tzid</description>
+			<description>GET on resource - too many start</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
+				<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>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -592,52 +430,52 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-tzid</value>
+						<value>/error~$invalid-start</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='5'>
-			<description>GET on resource - invalid tzid</description>
+			<description>GET on resource - invalid start</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh</ruri>
+				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>status</name>
-						<value>404</value>
+						<value>400</value>
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$tzid-not-found</value>
+						<value>/error~$invalid-start</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='6'>
-			<description>POST on resource - invalid tzid</description>
+			<description>GET on resource - too many end</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh</ruri>
+				<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>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>status</name>
-						<value>404</value>
+						<value>400</value>
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$tzid-not-found</value>
+						<value>/error~$invalid-end</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='7'>
-			<description>GET on resource - too many start</description>
+			<description>GET on resource - invalid end</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;start=2009</ruri>
+				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -646,16 +484,16 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-start</value>
+						<value>/error~$invalid-end</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='8'>
-			<description>POST on resource - too many start</description>
+			<description>GET on resource - start > end</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;start=2009</ruri>
+				<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>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -664,16 +502,16 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-start</value>
+						<value>/error~$invalid-end</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='9'>
-			<description>GET on resource - invalid start</description>
+			<description>GET on resource - start == end</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
+				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -682,106 +520,114 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-start</value>
+						<value>/error~$invalid-end</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='10'>
-			<description>POST on resource - invalid start</description>
+	</test-suite>
+
+	<test-suite name="Expand">
+		<test name='1'>
+			<description>GET on resource - simple range</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
+				<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>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
-						<name>status</name>
-						<value>400</value>
-					</arg>
-					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-start</value>
+						<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>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='11'>
-			<description>GET on resource - too many end</description>
+		<test name='2'>
+			<description>GET on resource - complex range</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009&amp;end=2009</ruri>
+				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
-						<name>status</name>
-						<value>400</value>
-					</arg>
-					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<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>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='12'>
-			<description>POST on resource - too many end</description>
+		<test name='3'>
+			<description>GET on resource - no DST</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009&amp;end=2009</ruri>
+				<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>
 				<verify>
-					<callback>jsonPointerMatch</callback>
-					<arg>
-						<name>status</name>
-						<value>400</value>
-					</arg>
-					<arg>
-						<name>exists</name>
-						<value>/error~$invalid-end</value>
-					</arg>
+					<callback>statusCode</callback>
 				</verify>
-			</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>
 				<verify>
-					<callback>jsonPointerMatch</callback>
+					<callback>dataString</callback>
 					<arg>
-						<name>status</name>
-						<value>400</value>
+						<name>contains</name>
+						<value>2006-01-01T00:00:00Z</value>
+						<value>-25200</value>
 					</arg>
 					<arg>
-						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<name>notcontains</name>
+						<value>2007</value>
+						<value>2008</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='14'>
-			<description>POST on resource - invalid end</description>
+		<test name='4'>
+			<description>GET on resource trailing slash - simple range</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=20090101</ruri>
+				<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>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
-						<name>status</name>
-						<value>400</value>
-					</arg>
-					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<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>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='15'>
-			<description>GET on resource - start > end</description>
+	</test-suite>
+	
+	
+	<test-suite name='Invalid query action=find'>
+		<test name='1'>
+			<description>GET on resource - no pattern</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2009&amp;end=2008</ruri>
+				<ruri>$timezonestdservice:?action=find</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -790,16 +636,16 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<value>/error~$invalid-pattern</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='16'>
-			<description>POST on resource - start > end</description>
+		<test name='2'>
+			<description>GET on resource - multiple pattern</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2009&amp;end=2008</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=America/New_York&amp;pattern=America/Los_Angeles</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -808,16 +654,16 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<value>/error~$invalid-pattern</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='17'>
-			<description>GET on resource - start == end</description>
+		<test name='3'>
+			<description>GET on resource - empty pattern</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2008</ruri>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=*</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -826,16 +672,16 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<value>/error~$invalid-pattern</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='18'>
-			<description>POST on resource - start == end</description>
+		<test name='4'>
+			<description>GET on resource - empty pattern</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2008</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=**</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
@@ -844,168 +690,151 @@
 					</arg>
 					<arg>
 						<name>exists</name>
-						<value>/error~$invalid-end</value>
+						<value>/error~$invalid-pattern</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 	</test-suite>
 
-	<test-suite name="Expand">
+	<test-suite name='Query method=find'>
 		<test name='1'>
-			<description>GET on resource - simple range</description>
+			<description>GET on resource - exact tzid</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009</ruri>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=America/New_York</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>exists</name>
 						<value>/dtstamp</value>
-						<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>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='2'>
-			<description>POST on resource - simple range</description>
+			<description>GET on resource - starts tzid</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=America/New_*</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>exists</name>
 						<value>/dtstamp</value>
-						<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>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='3'>
-			<description>GET on resource - complex range</description>
+			<description>GET on resource - end tzid</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006&amp;end=2008</ruri>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=*/New_York</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>exists</name>
 						<value>/dtstamp</value>
-						<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>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='4'>
-			<description>POST on resource - complex range</description>
+			<description>GET on resource - contains tzid</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006&amp;end=2008</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=*/New_*</ruri>
 				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>exists</name>
 						<value>/dtstamp</value>
-						<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>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='5'>
-			<description>GET on resource - no DST</description>
+			<description>GET on resource - starts tzid multiple</description>
 			<request>
 				<method>GET</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/Phoenix&amp;start=2006&amp;end=2009</ruri>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=America/N*</ruri>
 				<verify>
-					<callback>statusCode</callback>
-				</verify>
-				<verify>
-					<callback>dataString</callback>
+					<callback>jsonPointerMatch</callback>
 					<arg>
-						<name>contains</name>
-						<value>2006-01-01T00:00:00</value>
-						<value>-25200</value>
+						<name>exists</name>
+						<value>/dtstamp</value>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
-					<arg>
-						<name>notcontains</name>
-						<value>2007</value>
-						<value>2008</value>
-					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='6'>
-			<description>POST on resource - start == end</description>
+			<description>GET on resource - one alias</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:?action=expand&amp;tzid=America/Phoenix&amp;start=2006&amp;end=2009</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=US/Eastern</ruri>
 				<verify>
-					<callback>statusCode</callback>
+					<callback>jsonPointerMatch</callback>
+					<arg>
+						<name>exists</name>
+						<value>/dtstamp</value>
+						<value>/timezones/./tzid~$America/New_York</value>
+					</arg>
 				</verify>
+			</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>
 				<verify>
-					<callback>dataString</callback>
+					<callback>jsonPointerMatch</callback>
 					<arg>
-						<name>contains</name>
-						<value>2006-01-01T00:00:00</value>
-						<value>-25200</value>
+						<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>
 					</arg>
+				</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>
 					<arg>
-						<name>notcontains</name>
-						<value>2007</value>
-						<value>2008</value>
+						<name>exists</name>
+						<value>/dtstamp</value>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
-		<test name='7'>
-			<description>POST on resource trailing slash - simple range</description>
+		<test name='9'>
+			<description>GET on resource - contains text lowercase</description>
 			<request>
-				<method>POST</method>
-				<ruri>$timezonestdservice:/?action=expand&amp;tzid=America/New_York&amp;start=2008&amp;end=2009</ruri>
+				<method>GET</method>
+				<ruri>$timezonestdservice:?action=find&amp;pattern=*new%20york*</ruri>
 				<verify>
 					<callback>jsonPointerMatch</callback>
 					<arg>
 						<name>exists</name>
 						<value>/dtstamp</value>
-						<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>
+						<value>/timezones/./tzid~$America/New_York</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140930/f3dbf355/attachment-0001.html>


More information about the calendarserver-changes mailing list