[CalendarServer-changes] [5925] CalDAVTester/trunk/scripts/tests

[source_changes at macosforge.org]

Revision: 5925
          http://trac.macosforge.org/projects/calendarserver/changeset/5925
Author:   cdaboo at apple.com
Date:     2010-07-23 09:50:33 -0700 (Fri, 23 Jul 2010)
Log Message:
-----------
Mostly schema clean-up.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
    CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml	2010-07-22 19:46:02 UTC (rev 5924)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml	2010-07-23 16:50:33 UTC (rev 5925)
@@ -106,7 +106,7 @@
 		<test name='2' ignore='no'>
 			<request>
 				<method>GET</method>
-				<ruri>$posted:/</ruri>
+				<ruri>$posted:</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2010-07-22 19:46:02 UTC (rev 5924)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd	2010-07-23 16:50:33 UTC (rev 5925)
@@ -25,7 +25,7 @@
 	<!ELEMENT start (request*)>
 	<!ELEMENT end (request*)>
 
-	<!ELEMENT request (require-feature?, method, ruri+, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
+	<!ELEMENT request (require-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
 		<!ATTLIST request auth (yes|no) "yes"
 						 user CDATA ""
 						 pswd CDATA ""
@@ -45,7 +45,7 @@
 		<!ELEMENT verify (callback, arg*)>
 			
 				<!ELEMENT callback (#PCDATA)>
-				<!ELEMENT arg (name, value+)>
+				<!ELEMENT arg (name, value*)>
 		
 		<!ELEMENT grabheader (name, variable)>
 	

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml	2010-07-22 19:46:02 UTC (rev 5924)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml	2010-07-23 16:50:33 UTC (rev 5925)
@@ -1298,6 +1298,10 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/dropbox-abcefg.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/dropbox/4.ics</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 					<arg>
@@ -1305,10 +1309,6 @@
 						<value>201</value>
 					</arg>
 				</verify>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/dropbox/4.ics</filepath>
-				</data>
 			</request>
 			<request user='$userid2:' pswd='$pswd2:'>
 				<method>MKCOL</method>
@@ -1365,6 +1365,10 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/dropbox-abcefg.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/dropbox/3.ics</filepath>
+				</data>
 				<verify>
 					<callback>statusCode</callback>
 					<arg>
@@ -1372,10 +1376,6 @@
 						<value>204</value>
 					</arg>
 				</verify>
-				<data>
-					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/dropbox/3.ics</filepath>
-				</data>
 			</request>
 			<request user='$userid2:' pswd='$pswd2:' >
 				<method>ACL</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml	2010-07-22 19:46:02 UTC (rev 5924)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml	2010-07-23 16:50:33 UTC (rev 5925)
@@ -106,7 +106,7 @@
 		<test name='2' ignore='no'>
 			<request>
 				<method>GET</method>
-				<ruri>$posted:/</ruri>
+				<ruri>$posted:</ruri>
 				<verify>
 					<callback>calendarDataMatch</callback>
 					<arg>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd	2010-07-22 19:46:02 UTC (rev 5924)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd	2010-07-23 16:50:33 UTC (rev 5925)
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ Copyright (c) 2006-2010 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.
@@ -19,13 +19,13 @@
 
 	<!ELEMENT description (#PCDATA)>
 
-	<!ELEMENT require-feature feature*>
+	<!ELEMENT require-feature (feature*)>
 		<!ELEMENT feature (#PCDATA)>
 
 	<!ELEMENT start (request*)>
 	<!ELEMENT end (request*)>
 
-	<!ELEMENT request (method, ruri+, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
+	<!ELEMENT request (require-feature?, method, ruri*, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
 		<!ATTLIST request auth (yes|no) "yes"
 						 user CDATA ""
 						 pswd CDATA ""
@@ -45,7 +45,7 @@
 		<!ELEMENT verify (callback, arg*)>
 			
 				<!ELEMENT callback (#PCDATA)>
-				<!ELEMENT arg (name, value+)>
+				<!ELEMENT arg (name, value*)>
 		
 		<!ELEMENT grabheader (name, variable)>
 	
@@ -59,7 +59,7 @@
 		<!ATTLIST test-suite name CDATA #REQUIRED
 							ignore (yes|no) "no">
 	
-		<!ELEMENT test (description?, request+)>
+		<!ELEMENT test (require-feature?, description?, request+)>
 			<!ATTLIST test name CDATA #REQUIRED
 						  count CDATA "1"
 						  stats (yes|no) "no"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100723/e37bd861/attachment.html>