[CalendarServer-changes] [7556] CalDAVTester/branches/release/CalDAVTester-3.0-dev
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jun 5 12:52:27 PDT 2011
Revision: 7556
http://trac.macosforge.org/projects/calendarserver/changeset/7556
Author: cdaboo at apple.com
Date: 2011-06-05 12:52:26 -0700 (Sun, 05 Jun 2011)
Log Message:
-----------
Test auto-accept resource removal when attendee removed by organizer with a PUT and If-Schedule-Tag-Match.
Added Paths:
-----------
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/1.ics
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/2.ics
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/3.ics
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/4.ics
CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/5.ics
CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitauto9.xml
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/1.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/1.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/1.ics 2011-06-05 19:52:26 UTC (rev 7556)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddralt1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/2.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/2.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/2.ics 2011-06-05 19:52:26 UTC (rev 7556)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/3.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/3.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/3.ics 2011-06-05 19:52:26 UTC (rev 7556)
@@ -0,0 +1,18 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;SCHEDULE-STATUS=1.2;EMAIL=$email1::$cuaddrurn1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/4.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/4.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/4.ics 2011-06-05 19:52:26 UTC (rev 7556)
@@ -0,0 +1,17 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddralt1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddralt1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/5.ics
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/5.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CalDAV/implicit/auto9/suite1/5.ics 2011-06-05 19:52:26 UTC (rev 7556)
@@ -0,0 +1,17 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-1
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+CREATED:20060110T231240Z
+DESCRIPTION:Call-in
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+STATUS:CONFIRMED
+SUMMARY:Example
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitauto9.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitauto9.xml (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CalDAV/implicitauto9.xml 2011-06-05 19:52:26 UTC (rev 7556)
@@ -0,0 +1,362 @@
+<?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 implicit scheduling for auto-accept location remove during PUT</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>auto-accept</feature>
+ <feature>implicit-scheduling</feature>
+ </require-feature>
+
+ <start>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
+ </request>
+ </start>
+
+ <test-suite name='#1.1 Without If-Schedule-Tag-Match' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>Create new event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto9/suite1/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>One item in user01 Inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>One item in user01 Calendar</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto9/suite1/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>One item in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>GETNEW</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto9/suite1/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>Remove Attendee</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto9/suite1/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>One item in user01 Inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>One item in user01 Calendar</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto9/suite1/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>No items in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>0</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
+ <description>Clean-up inboxes</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='#1.2 With If-Schedule-Tag-Match' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>Create new event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto9/suite1/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Schedule-Tag</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Schedule-Tag</name>
+ <variable>$schedule-tag-organizer:</variable>
+ </grabheader>
+ </request>
+ <request>
+ <method>WAITCOUNT 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>One item in user01 Inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>One item in user01 Calendar</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto9/suite1/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>One item in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>GETNEW</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto9/suite1/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>Remove Attendee</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <header>
+ <name>If-Schedule-Tag-Match</name>
+ <value>$schedule-tag-organizer:</value>
+ </header>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto9/suite1/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>One item in user01 Inbox</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>1</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>One item in user01 Calendar</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto9/suite1/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8' ignore='no'>
+ <description>No items in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+ <method>PROPFIND</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/Common/PROPFIND/count.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>count</name>
+ <value>0</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9' ignore='no'>
+ <description>Clean-up inboxes</description>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <ruri>$rinboxpath1:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110605/946bb683/attachment-0001.html>
More information about the calendarserver-changes
mailing list