[CalendarServer-changes] [9997] CalDAVTester/branches/users/cdaboo/managed-attachments

source_changes at macosforge.org source_changes at macosforge.org
Wed Oct 31 13:11:19 PDT 2012


Revision: 9997
          http://trac.calendarserver.org//changeset/9997
Author:   cdaboo at apple.com
Date:     2012-10-31 13:11:19 -0700 (Wed, 31 Oct 2012)
Log Message:
-----------
Initial set of managed attachments test - attachment-add only.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-template.xml
    CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo.xml

Added Paths:
-----------
    CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/
    CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/
    CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/1.ics
    CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/2.txt
    CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CalDAV/managed-attachments.xml

Added: CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/1.ics	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/1.ics	2012-10-31 20:11:19 UTC (rev 9997)
@@ -0,0 +1,11 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:put-1 at example.com
+DTSTART:$now.year.1:0101T120000Z
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/2.txt
===================================================================
--- CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/2.txt	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/managed-attachments/Resource/CalDAV/managedattachments/simple/2.txt	2012-10-31 20:11:19 UTC (rev 9997)
@@ -0,0 +1,3 @@
+This is a text file being used
+as a test of managed attachment
+support in calendarserver.

Modified: CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-partitioning.xml	2012-10-31 16:06:38 UTC (rev 9996)
+++ CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-partitioning.xml	2012-10-31 20:11:19 UTC (rev 9997)
@@ -70,6 +70,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<feature>managed-attachments</feature>			<!-- CalDAV Managed Attachments -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<feature>partitioning</feature>					<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->

Modified: CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-template.xml	2012-10-31 16:06:38 UTC (rev 9996)
+++ CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo-template.xml	2012-10-31 20:11:19 UTC (rev 9997)
@@ -70,6 +70,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<feature>managed-attachments</feature>			<!-- CalDAV Managed Attachments -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->

Modified: CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo.xml	2012-10-31 16:06:38 UTC (rev 9996)
+++ CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/server/serverinfo.xml	2012-10-31 20:11:19 UTC (rev 9997)
@@ -70,6 +70,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>extended-freebusy</feature>	      	<!-- Extended freebusy response -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
+		<feature>managed-attachments</feature>			<!-- CalDAV Managed Attachments -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
 		<!-- <feature>partitioning</feature> -->		<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->

Added: CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CalDAV/managed-attachments.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CalDAV/managed-attachments.xml	                        (rev 0)
+++ CalDAVTester/branches/users/cdaboo/managed-attachments/scripts/tests/CalDAV/managed-attachments.xml	2012-10-31 20:11:19 UTC (rev 9997)
@@ -0,0 +1,185 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2012 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.
+ -->
+
+<caldavtest>
+	<description>Test managed attachments</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+		<feature>managed-attachments</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='OPTIONS header'>
+		<test name='1'>
+			<description>Look for options header tag on principal</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$principal1:</ruri>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>*DAV$.*calendar-managed-attachments*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Look for options header tag on calendar</description>
+			<request print-response="no">
+				<method>OPTIONS</method>
+				<ruri>$calendarpath1:/</ruri>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>*DAV$.*calendar-managed-attachments*</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Simple non-recurring, non-scheduled attachment processing'>
+		<test name='1' ignore='no'>
+			<description>PUT event</description>
+			<request end-delete='no'>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/managedattachments/simple/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/managedattachments/simple/1.ics</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>ETag</name>
+					<variable>$etag:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='2' ignore='no'>
+			<description>Add attachment (no prefer)</description>
+			<request>
+				<method>POST</method>
+				<ruri>$calendarpath1:/1.ics?action=attachment-add</ruri>
+				<header>
+					<name>Content-Disposition</name>
+					<value>attachment;filename=test.txt</value>
+				</header>
+				<data>
+					<content-type>text/plain</content-type>
+					<filepath>Resource/CalDAV/managedattachments/simple/2.txt</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>Cal-Managed-ID</value>
+					</arg>
+				</verify>
+				<grabheader>
+					<name>Location</name>
+					<variable>$location:</variable>
+				</grabheader>
+				<grabheader>
+					<name>Cal-Managed-ID</name>
+					<variable>$managed-id:</variable>
+				</grabheader>
+			</request>
+		</test>
+		<test name='3' ignore='no'>
+			<description>Check for ATTACH property</description>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>header</name>
+						<value>ETag!$etag:</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/managedattachments/simple/1.ics</value>
+					</arg>
+					<arg>
+						<name>filter</name>
+						<value>ATTACH</value>
+					</arg>
+				</verify>
+				<verify>
+					<callback>dataString</callback>
+					<arg>
+						<name>unwrap</name>
+						<value/>
+					</arg>
+					<arg>
+						<name>contains</name>
+						<value>ATTACH</value>
+						<value>;FILENAME=</value>
+						<value>;FMT-TYPE=</value>
+						<value>;SIZE=</value>
+						<value>;MTAG=</value>
+						<value>;MANAGED-ID=$managed-id:</value>
+						<value>:$location:</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='4' ignore='no'>
+			<description>Check for attachment</description>
+			<request>
+				<method>GET</method>
+				<ruri>$location:</ruri>
+				<verify>
+					<callback>dataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/managedattachments/simple/2.txt</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<end/>
+	
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121031/eac9ff2d/attachment-0001.html>


More information about the calendarserver-changes mailing list