[CalendarServer-changes] [8342] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Nov 28 11:35:23 PST 2011


Revision: 8342
          http://trac.macosforge.org/projects/calendarserver/changeset/8342
Author:   cdaboo at apple.com
Date:     2011-11-28 11:35:22 -0800 (Mon, 28 Nov 2011)
Log Message:
-----------
Test for client alarm dismissal.

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics
    CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics
    CalDAVTester/trunk/scripts/tests/CalDAV/alarm-dismissal.xml

Added: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/1.ics	2011-11-28 19:35:22 UTC (rev 8342)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-1 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+BEGIN:VALARM
+X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/2.ics	2011-11-28 19:35:22 UTC (rev 8342)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-1 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+BEGIN:VALARM
+X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+ACKNOWLEDGED:20111128T175238Z
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/3.ics	2011-11-28 19:35:22 UTC (rev 8342)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-2 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 2
+RRULE:FREQ=DAILY;COUNT=20
+BEGIN:VALARM
+X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/4.ics	2011-11-28 19:35:22 UTC (rev 8342)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-2 at example.com
+DTSTART:20110427T120000Z
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 2
+RRULE:FREQ=DAILY;COUNT=20
+BEGIN:VALARM
+X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:put-2 at example.com
+RECURRENCE-ID:20110427T120000Z
+DTSTART:20110427T120000Z
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 2
+BEGIN:VALARM
+X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+ACKNOWLEDGED:20111128T175238Z
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/alarm-dismissal/5.ics	2011-11-28 19:35:22 UTC (rev 8342)
@@ -0,0 +1,19 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:put-3 at example.com
+DTSTART:20110427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 3
+BEGIN:VALARM
+X-WR-ALARMUID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+UID:D9D1AC84-F629-4B9D-9B6B-4A6CA9A11FEF
+DESCRIPTION:Event reminder
+ACKNOWLEDGED:20111128T175238
+TRIGGER:-PT8M
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/scripts/tests/CalDAV/alarm-dismissal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/alarm-dismissal.xml	                        (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/alarm-dismissal.xml	2011-11-28 19:35:22 UTC (rev 8342)
@@ -0,0 +1,176 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2011 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 alarm dismissal behavior</description>
+
+	<require-feature>
+		<feature>caldav</feature>
+	</require-feature>
+
+	<start/>
+	
+	<test-suite name='Simple dismissal'>
+		<test name='1'>
+			<description>PUT event with alarm</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/alarm-dismissal/1.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Verify data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/alarm-dismissal/1.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>PUT event with ack'd alarm</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/alarm-dismissal/2.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Verify data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/alarm-dismissal/2.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Recurring dismissal'>
+		<test name='1'>
+			<description>PUT event with alarm</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/alarm-dismissal/3.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='2'>
+			<description>Verify data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/alarm-dismissal/3.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+		<test name='3'>
+			<description>PUT event with ack'd alarm</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/alarm-dismissal/4.ics</filepath>
+				</data>
+				<verify>
+					<callback>statusCode</callback>
+				</verify>
+			</request>
+		</test>
+		<test name='4'>
+			<description>Verify data</description>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/2.ics</ruri>
+				<verify>
+					<callback>calendarDataMatch</callback>
+					<arg>
+						<name>filepath</name>
+						<value>Resource/CalDAV/alarm-dismissal/4.ics</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<test-suite name='Bad property value'>
+		<test name='1'>
+			<description>PUT event with alarm</description>
+			<request>
+				<method>PUT</method>
+				<ruri>$calendarpath1:/3.ics</ruri>
+				<data>
+					<content-type>text/calendar; charset=utf-8</content-type>
+					<filepath>Resource/CalDAV/alarm-dismissal/5.ics</filepath>
+				</data>
+				<verify>
+					<callback>prepostcondition</callback>
+					<arg>
+						<name>error</name>
+						<value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
+	</test-suite>
+
+	<end>
+		<request>
+			<method>DELETEALL</method>
+			<ruri>$calendarpath1:/</ruri>
+		</request>
+	</end>
+	
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111128/7d1aa746/attachment-0001.html>


More information about the calendarserver-changes mailing list