[CalendarServer-changes] [15425] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jan 7 10:52:28 PST 2016
Revision: 15425
http://trac.calendarserver.org//changeset/15425
Author: cdaboo at apple.com
Date: 2016-01-07 10:52:28 -0800 (Thu, 07 Jan 2016)
Log Message:
-----------
Test for new override not triggering auto-accept.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/17.ics
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/3.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/4.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/5.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/6.ics
CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto12.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/17.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/17.ics 2016-01-07 15:49:59 UTC (rev 15424)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/attendeedelete/recurring-master/17.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -32,7 +32,6 @@
ATTENDEE;CN=$username3:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email3::$cuaddrurn3:
ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
RRULE:FREQ=DAILY
-EXDATE;TZID=US/Eastern:$now.year.1:0102T120000
SEQUENCE:3
TRANSP:TRANSPARENT
END:VEVENT
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/1.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,14 @@
+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:$cuaddr1:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddr1:
+SUMMARY:Block
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/2.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,14 @@
+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:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Block
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite1/3.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,15 @@
+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:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SUMMARY:Block
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/1.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.2:T130000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$resourcename1::$rcuaddralt1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1::$cuaddr1:
+RRULE:FREQ=DAILY;UNTIL=$now.7:T130000Z
+SUMMARY:Recurring
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/2.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,15 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.2:T130000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;UNTIL=$now.7:T130000Z
+SUMMARY:Recurring
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/3.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,16 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.2:T130000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+RRULE:FREQ=DAILY;UNTIL=$now.7:T130000Z
+SUMMARY:Recurring
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/4.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,26 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=NEEDS-ACTION:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;UNTIL=$now.7:T130000Z
+SUMMARY:Recurring
+END:VEVENT
+BEGIN:VEVENT
+UID:event-2
+RECURRENCE-ID:$now.1:T130000Z
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;PARTSTAT=DECLINED:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:Recurring
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/5.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,28 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+RRULE:FREQ=DAILY;UNTIL=$now.7:T130000Z
+SEQUENCE:1
+SUMMARY:Recurring
+END:VEVENT
+BEGIN:VEVENT
+UID:event-2
+RECURRENCE-ID:$now.1:T130000Z
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Recurring
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/auto12/suite2/6.ics 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,30 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VEVENT
+UID:event-2
+DTSTART:$now.1:T130000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=ACCEPTED:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+RRULE:FREQ=DAILY;UNTIL=$now.7:T130000Z
+SEQUENCE:1
+SUMMARY:Recurring
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:event-2
+RECURRENCE-ID:$now.1:T130000Z
+DTSTART:$now.1:T120000Z
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$resourcename1:;CUTYPE=RESOURCE;PARTSTAT=DECLINED:$rcuaddrurn1:
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:Recurring
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto12.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto12.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto12.xml 2016-01-07 18:52:28 UTC (rev 15425)
@@ -0,0 +1,237 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2013-2016 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 where earlier instance is added</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>$rinboxpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ </request>
+ </start>
+
+ <test-suite name='#1 Blocking non-recurring event'>
+ <test name='1'>
+ <description>Create non-recurring event - resource invited</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto12/suite1/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>One item in user01 Inbox</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='3'>
+ <description>One item in user01 Calendar</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto12/suite1/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>No items in resource01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 0</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='5'>
+ <description>One item in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>GETNEW</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto12/suite1/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='#2 Recurring'>
+ <test name='1'>
+ <description>Create recurring event - starts after blocking event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto12/suite2/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>One item in user01 Inbox</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='3'>
+ <description>One item in user01 Calendar</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto12/suite2/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>No items in resource01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 0</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='5'>
+ <description>One item in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>GETNEW</method>
+ <ruri>$rcalendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto12/suite2/3.ics</value>
+ </arg>
+ </verify>
+ <graburi>$r2:</graburi>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Update recurring event - add override at same time as blocking event</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/implicit/auto12/suite2/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>One item in user01 Inbox</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='8'>
+ <description>One item in user01 Calendar</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/2.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto12/suite2/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>No items in resource01 Inbox</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>WAITCOUNT 0</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='10'>
+ <description>One item in resource01 Calendar</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>GET</method>
+ <ruri>$r2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/auto12/suite2/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$inboxpath1:/</ruri>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$rinboxpath1:/</ruri>
+ <ruri>$rcalendarpath1:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160107/98b990b6/attachment-0001.html>
More information about the calendarserver-changes
mailing list