[CalendarServer-changes] [12547] CalDAVTester/trunk/scripts/tests/CalDAV/json.xml

[source_changes at macosforge.org]

Revision: 12547
          http://trac.calendarserver.org//changeset/12547
Author:   cdaboo at apple.com
Date:     2014-02-03 17:14:29 -0800 (Mon, 03 Feb 2014)
Log Message:
-----------
Tweak accept/return=representation behavior.

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

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/json.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/json.xml	2014-02-04 00:55:57 UTC (rev 12546)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/json.xml	2014-02-04 01:14:29 UTC (rev 12547)
@@ -186,7 +186,7 @@
 
 	<test-suite name='PUT + return-rep'>
 		<test name='1'>
-			<description>PUT jCal/return iCalendar</description>
+			<description>PUT jCal/return jCal - no Accept</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
@@ -202,16 +202,16 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>calendarDataMatch</callback>
+					<callback>jcalDataMatch</callback>
 					<arg>
 						<name>filepath</name>
-						<value>Resource/CalDAV/json/put/2.ics</value>
+						<value>Resource/CalDAV/json/put/1.json</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='2'>
-			<description>PUT jCal/return jCal</description>
+			<description>PUT jCal/return jCal - with Accept</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
@@ -240,7 +240,7 @@
 			</request>
 		</test>
 		<test name='3'>
-			<description>PUT iCalendar/return iCalendar</description>
+			<description>PUT jCal/return iCalendar - with Accept</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
@@ -248,7 +248,36 @@
 					<name>Prefer</name>
 					<value>return=representation</value>
 				</header>
+				<header>
+					<name>Accept</name>
+					<value>text/calendar</value>
+				</header>
 				<data>
+					<content-type>application/calendar+json; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/json/put/1.json</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/json/put/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>PUT iCalendar/return iCalendar - no Accept</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<header>
+					<name>Prefer</name>
+					<value>return=representation</value>
+				</header>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/json/put/2.ics</filepath>
 				</data>
@@ -264,8 +293,8 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4'>
-			<description>PUT iCalendar/return jCal</description>
+		<test name='5'>
+			<description>PUT iCalendar/return iCalendar - with Accept</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
@@ -275,6 +304,35 @@
 				</header>
 				<header>
 					<name>Accept</name>
+					<value>text/calendar</value>
+				</header>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/json/put/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/json/put/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='6'>
+			<description>PUT iCalendar/return jCal - with Accept</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<header>
+					<name>Prefer</name>
+					<value>return=representation</value>
+				</header>
+				<header>
+					<name>Accept</name>
 					<value>application/calendar+json</value>
 				</header>
 				<data>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/724ed0a8/attachment.html>