[CalendarServer-changes] [14862] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 29 13:19:32 PDT 2015
Revision: 14862
http://trac.calendarserver.org//changeset/14862
Author: cdaboo at apple.com
Date: 2015-05-29 13:19:32 -0700 (Fri, 29 May 2015)
Log Message:
-----------
Trash+group attendee expansion tests.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics
CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics
CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json
CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/1.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+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
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$groupname20:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$gcuaddrurn20:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/2.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/3.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20::$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/4.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+ATTENDEE;CN=$username2:;PARTSTAT=DECLINED;SCHEDULE-STATUS=2.0;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/attendee/5.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/1.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+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
+DTSTAMP:20051222T205953Z
+CREATED:20060101T150000Z
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event 1
+UID:$uid1:
+ORGANIZER;CN=$username1::$cuaddr1:
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED:$cuaddr1:
+ATTENDEE;CN=$groupname20:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$gcuaddrurn20:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/2.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,34 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/3.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20::$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/4.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:1
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/5.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,38 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20::$gcuaddrurn20:
+ATTENDEE;CN=$username2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email2:;MEMBER="$gcuaddrurn20:":$cuaddrurn2:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:3
+STATUS:CANCELLED
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/implicitgroup/organizer/6.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,35 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+BEGIN:VTIMEZONE
+TZID:US/Eastern
+LAST-MODIFIED:20040110T032845Z
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+ATTENDEE;CN=$username1:;PARTSTAT=ACCEPTED;EMAIL=$email1::$cuaddrurn1:
+ATTENDEE;CN=$groupname20:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail20:;SCHEDULE-STATUS=2.7:$gcuaddrurn20:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SEQUENCE:2
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics 2015-05-29 20:14:28 UTC (rev 14861)
+++ CalDAVTester/trunk/Resource/CalDAV/trash/organizertrash/recovered.ics 2015-05-29 20:19:32 UTC (rev 14862)
@@ -5,7 +5,7 @@
UID:$uid1:
DTSTART:$now.8:T200000Z
DURATION:PT1H
-ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddrurn1:
+ATTENDEE;CN=$username1:;EMAIL=$email1:;PARTSTAT=ACCEPTED:$cuaddrurn1:
ATTENDEE;CN=$username2:;EMAIL=$email2:;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:$cuaddrurn2:
CREATED:20060110T231240Z
DESCRIPTION:Call-in
Added: CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json
===================================================================
--- CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json (rev 0)
+++ CalDAVTester/trunk/Resource/Common/POST/controlschedulingdone.json 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,4 @@
+{
+ "action": "refreshgroups",
+ "wait": true
+}
Added: CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/trash-implicitgroup.xml 2015-05-29 20:19:32 UTC (rev 14862)
@@ -0,0 +1,784 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2015 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 with group expansion and trash collection</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>implicit-scheduling</feature>
+ <feature>group-attendee-expansion</feature>
+ <feature>trash-collection</feature>
+ </require-feature>
+
+ <start>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$calendarpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>GET</method>
+ <ruri>$calendarpath3:/</ruri>
+ </request>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>GET</method>
+ <ruri>$calendarpath6:/</ruri>
+ </request>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GET</method>
+ <ruri>$calendarpath7:/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ </start>
+
+ <test-suite name='Invite empty group, trash, then add member, recover' change-uid='yes'>
+ <require-feature>
+ <feature>control-api</feature>
+ </require-feature>
+ <test name='1'>
+ <description>Organizer invites Group Attendee</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/implicitgroup/organizer/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Organizer deletes data</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Organizer has no events</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='5'>
+ <description>Add group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controladdmember.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember:</name>
+ <value>$userguid2:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer has no events</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='7'>
+ <description>Attendee has no events</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='8'>
+ <description>Organizer Recover trash</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&mode=event&id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GETNEW</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/4.ics</value>
+ </arg>
+ </verify>
+ <graburi>$recovered:</graburi>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Trash, then remove member, recover'>
+ <require-feature>
+ <feature>control-api</feature>
+ </require-feature>
+ <test name='1'>
+ <description>Organizer deletes data</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$recovered:</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Organizer has no events</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='5'>
+ <description>Remove group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlremovemember.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember:</name>
+ <value>$userguid2:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Organizer has no events</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='7'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer Recover trash</description>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=recovertrash&mode=event&id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Attendee no Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$inboxpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='10'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GETNEW</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/organizer/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Invite empty group, trash, then add member, recover' change-uid='yes'>
+ <require-feature>
+ <feature>control-api</feature>
+ </require-feature>
+ <test name='1'>
+ <description>Add group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controladdmember.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember:</name>
+ <value>$userguid2:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer invites Group Attendee</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/trash/implicitgroup/attendee/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/attendee/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/attendee/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Attendee deletes data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETE</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Organizer Inbox Item</description>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/attendee/4.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Remove group member</description>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlremovemember.json</filepath>
+ <substitute>
+ <name>$controlgroup:</name>
+ <value>$groupguid20:</value>
+ </substitute>
+ <substitute>
+ <name>$controlmember:</name>
+ <value>$userguid2:</value>
+ </substitute>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlgrouprefresh.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>POST</method>
+ <ruri>/control</ruri>
+ <data>
+ <content-type>application/json; charset=utf-8</content-type>
+ <filepath>Resource/Common/POST/controlschedulingdone.json</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='10'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/attendee/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='11'>
+ <description>Attendee has no events</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='12'>
+ <description>Attendee Recover trash</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=recovertrash&mode=event&id=all</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='13'>
+ <description>Attendee has no events</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PROPFIND</method>
+ <ruri>$calendarpath2:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <data>
+ <content-type>text/calendar; 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='14'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GETNEW</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/trash/implicitgroup/attendee/5.ics</value>
+ </arg>
+ </verify>
+ <graburi>$recovered:</graburi>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath2:/</ruri>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request>
+ <method>POST</method>
+ <ruri>$calendarhome1:/?action=emptytrash</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>POST</method>
+ <ruri>$calendarhome2:/?action=emptytrash</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150529/6bd899e7/attachment-0001.html>
More information about the calendarserver-changes
mailing list