[CalendarServer-changes] [13865] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Aug 11 14:26:39 PDT 2014
Revision: 13865
http://trac.calendarserver.org//changeset/13865
Author: cdaboo at apple.com
Date: 2014-08-11 14:26:39 -0700 (Mon, 11 Aug 2014)
Log Message:
-----------
Basic test for group attendee expansion.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/implicit/groups/
CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/
CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/1.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/2.ics
CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/3.ics
CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/1.ics 2014-08-11 21:26:39 UTC (rev 13865)
@@ -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=$groupname2:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION:$gcuaddrurn2:
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/2.ics 2014-08-11 21:26:39 UTC (rev 13865)
@@ -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=$groupname2:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail2:;SCHEDULE-STATUS=2.7:$gcuaddrurn2:
+ATTENDEE;CN=$username6:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email6:;MEMBER="$gcuaddrurn2:":$cuaddrurn6:
+ATTENDEE;CN=$username7:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;SCHEDULE-STATUS=1.2;EMAIL=$email7:;MEMBER="$gcuaddrurn2:":$cuaddrurn7:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/implicit/groups/simple/3.ics 2014-08-11 21:26:39 UTC (rev 13865)
@@ -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=$groupname2:;CUTYPE=X-SERVER-GROUP;EMAIL=$gemail2::$gcuaddrurn2:
+ATTENDEE;CN=$username6:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email6:;MEMBER="$gcuaddrurn2:":$cuaddrurn6:
+ATTENDEE;CN=$username7:;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;EMAIL=$email7:;MEMBER="$gcuaddrurn2:":$cuaddrurn7:
+CREATED:20060101T150000Z
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+SUMMARY:event 1
+TRANSP:TRANSPARENT
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-08-11 20:33:39 UTC (rev 13864)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2014-08-11 21:26:39 UTC (rev 13865)
@@ -83,6 +83,7 @@
<feature>default-alarms</feature> <!-- default alarms extension -->
<feature>EMAIL parameter</feature> <!-- Server normalizes cuaddress and adds EMAIL parameter -->
<feature>extended-freebusy</feature> <!-- Extended freebusy response -->
+ <feature>group-attendee-expansion</feature> <!-- Auto-expansion of group attendees -->
<feature>implicit-scheduling</feature> <!-- CalDAV scheduling - implicit -->
<feature>location-resource-tracking</feature> <!-- Server tracks who makes unscheduled changes to locations and resources -->
<feature>managed-attachments</feature> <!-- CalDAV Managed Attachments -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-08-11 20:33:39 UTC (rev 13864)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2014-08-11 21:26:39 UTC (rev 13865)
@@ -78,6 +78,7 @@
<feature>default-alarms</feature> <!-- default alarms extension -->
<feature>EMAIL parameter</feature> <!-- Server normalizes cuaddress and adds EMAIL parameter -->
<feature>extended-freebusy</feature> <!-- Extended freebusy response -->
+ <feature>group-attendee-expansion</feature> <!-- Auto-expansion of group attendees -->
<feature>implicit-scheduling</feature> <!-- CalDAV scheduling - implicit -->
<feature>location-resource-tracking</feature> <!-- Server tracks who makes unscheduled changes to locations and resources -->
<feature>managed-attachments</feature> <!-- CalDAV Managed Attachments -->
@@ -746,6 +747,10 @@
<value>$principals_uids:$groupguid%d:/</value>
</substitution>
<substitution>
+ <key>$gemail%d:</key>
+ <value>$groupid%d:@example.com</value>
+ </substitution>
+ <substitution>
<key>$gcuaddralt%d:</key>
<value>$gprincipaluri%d:</value>
</substitution>
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-08-11 20:33:39 UTC (rev 13864)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-08-11 21:26:39 UTC (rev 13865)
@@ -78,6 +78,7 @@
<feature>default-alarms</feature> <!-- default alarms extension -->
<feature>EMAIL parameter</feature> <!-- Server normalizes cuaddress and adds EMAIL parameter -->
<feature>extended-freebusy</feature> <!-- Extended freebusy response -->
+ <feature>group-attendee-expansion</feature> <!-- Auto-expansion of group attendees -->
<feature>implicit-scheduling</feature> <!-- CalDAV scheduling - implicit -->
<feature>location-resource-tracking</feature> <!-- Server tracks who makes unscheduled changes to locations and resources -->
<feature>managed-attachments</feature> <!-- CalDAV Managed Attachments -->
@@ -746,6 +747,10 @@
<value>$principals_uids:$groupguid%d:/</value>
</substitution>
<substitution>
+ <key>$gemail%d:</key>
+ <value>$groupid%d:@example.com</value>
+ </substitution>
+ <substitution>
<key>$gcuaddralt%d:</key>
<value>$gprincipaluri%d:</value>
</substitution>
Added: CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml 2014-08-11 21:26:39 UTC (rev 13865)
@@ -0,0 +1,144 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2013 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</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>implicit-scheduling</feature>
+ <feature>group-attendee-expansion</feature>
+ </require-feature>
+
+ <start>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</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>
+ </start>
+
+ <test-suite name='Invite group'>
+ <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/implicit/groups/simple/1.ics</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/implicit/groups/simple/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath6:/</ruri>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has data</description>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath6:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/groups/simple/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee Inbox Item</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath7:/</ruri>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Attendee has data</description>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>GETNEW</method>
+ <ruri>$calendarpath7:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/implicit/groups/simple/3.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="$userid6:" pswd="$pswd6:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath6:/</ruri>
+ </request>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath7:/</ruri>
+ </request>
+ <request user="$userid6:" pswd="$pswd6:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath6:/</ruri>
+ </request>
+ <request user="$userid7:" pswd="$pswd7:">
+ <method>DELETEALL</method>
+ <ruri>$calendarpath7:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140811/1199ec24/attachment-0001.html>
More information about the calendarserver-changes
mailing list