[CalendarServer-changes] [8623] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 2 08:38:21 PST 2012
Revision: 8623
http://trac.macosforge.org/projects/calendarserver/changeset/8623
Author: cdaboo at apple.com
Date: 2012-02-02 08:38:20 -0800 (Thu, 02 Feb 2012)
Log Message:
-----------
Test that etag always changes when schedule-tag changes,
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/21.ics 2012-02-02 16:38:20 UTC (rev 8623)
@@ -0,0 +1,42 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TR
+ UE;SCHEDULE-STATUS=1.2:$cuaddrurn2:
+ATTENDEE;CN=$username3:;EMAIL=$email3:;PARTSTAT=NEEDS-ACTION;RSVP=TR
+ UE;SCHEDULE-STATUS=1.2:$cuaddrurn3:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+BEGIN:VALARM
+ACTION:DISPLAY
+SUMMARY:Alarm
+TRIGGER:P0D
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/scheduletag/22.ics 2012-02-02 16:38:20 UTC (rev 8623)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event1 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
+ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TR
+ UE;SCHEDULE-STATUS=1.2:$cuaddrurn2:
+ATTENDEE;CN=$username3:;EMAIL=$email3:;PARTSTAT=NEEDS-ACTION;RSVP=TR
+ UE;SCHEDULE-STATUS=1.2:$cuaddrurn3:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml 2012-02-01 20:46:00 UTC (rev 8622)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml 2012-02-02 16:38:20 UTC (rev 8623)
@@ -3,7 +3,7 @@
<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
- Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ Copyright (c) 2006-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.
@@ -3032,6 +3032,127 @@
</test>
</test-suite>
+ <test-suite name='ETag change with Schedule-tag' ignore='no'>
+ <test name='1'>
+ <description>New event</description>
+ <request print-response="no">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/scheduletag/8.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Get event</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <grabheader>
+ <name>Schedule-Tag</name>
+ <variable>$schedule-tag-organizer:</variable>
+ </grabheader>
+ <grabheader>
+ <name>ETag</name>
+ <variable>$etag-organizer:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Add alarm</description>
+ <request print-response="no">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/scheduletag/21.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Get event</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>ETag!$etag-organizer:</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Schedule-Tag!$schedule-tag-organizer:</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Schedule-Tag</name>
+ <variable>$schedule-tag-organizer2:</variable>
+ </grabheader>
+ <grabheader>
+ <name>ETag</name>
+ <variable>$etag-organizer2:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Remove alarm</description>
+ <request print-response="no">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/scheduletag/22.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Get event</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>ETag!$etag-organizer:</value>
+ <value>ETag!$etag-organizer2:</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Schedule-Tag!$schedule-tag-organizer:</value>
+ <value>Schedule-Tag!$schedule-tag-organizer2:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end>
<request user="$useradmin:" pswd="$pswdadmin:">
<method>DELETEALL</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120202/265f397c/attachment.html>
More information about the calendarserver-changes
mailing list