[CalendarServer-changes] [3417] CalDAVTester/branches/users/cdaboo/deployment
source_changes at macosforge.org
source_changes at macosforge.org
Fri Nov 28 11:46:58 PST 2008
Revision: 3417
http://trac.macosforge.org/projects/calendarserver/changeset/3417
Author: cdaboo at apple.com
Date: 2008-11-28 11:46:58 -0800 (Fri, 28 Nov 2008)
Log Message:
-----------
Merge expand REPORT and expanded proxy principal membership properties to deployment.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/19.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/20.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/1.ics
CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/19.ics
CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/4.ics
CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/5.ics
CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/acl.xml
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/calendaruserproxy.xml
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/dropbox.xml
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/put.xml
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/schedulepostauto.xml
CalDAVTester/branches/users/cdaboo/deployment/verifiers/multistatusItems.py
Added Paths:
-----------
CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/10.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/11.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/12.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/10.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/9.ics
CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/21.ics
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/expandproperty.xml
CalDAVTester/branches/users/cdaboo/deployment/verifiers/propfindValues.py
Removed Paths:
-------------
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml
CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml
Modified: CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/19.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/19.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/19.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -22,6 +22,11 @@
</supported-report>
<supported-report>
<report>
+ <expand-property/>
+ </report>
+ </supported-report>
+ <supported-report>
+ <report>
<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
</report>
</supported-report>
Modified: CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/20.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/20.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/aclreports/20.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -22,6 +22,11 @@
</supported-report>
<supported-report>
<report>
+ <expand-property/>
+ </report>
+ </supported-report>
+ <supported-report>
+ <report>
<calendar-query xmlns='urn:ietf:params:xml:ns:caldav'/>
</report>
</supported-report>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/10.xml (from rev 3165, CalDAVTester/trunk/Resource/calendaruserproxy/10.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/10.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/10.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/">
+<D:prop>
+<CS:calendar-proxy-read-for/>
+<CS:calendar-proxy-write-for/>
+</D:prop>
+</D:propfind>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/11.xml (from rev 3165, CalDAVTester/trunk/Resource/calendaruserproxy/11.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/11.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/11.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:group-member-set><D:href>$principaluri1:</D:href></D:group-member-set>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/12.xml (from rev 3165, CalDAVTester/trunk/Resource/calendaruserproxy/12.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/12.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/calendaruserproxy/12.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="calendar-proxy-write-for" namespace="http://calendarserver.org/ns/">
+ <D:property name="displayname"/>
+ </D:property>
+ <D:property name="calendar-proxy-read-for" namespace="http://calendarserver.org/ns/">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/1.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="calendar-home-set" namespace="urn:ietf:params:xml:ns:caldav">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/1.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/1.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="calendar-home-set" namespace="urn:ietf:params:xml:ns:caldav">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/2.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="missing">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/2.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/2.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="missing">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/3.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="group-memberset">
- <D:property name="displayname"/>
- </D:property>
- <D:property name="group-memberships">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/3.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/3.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="group-memberset">
+ <D:property name="displayname"/>
+ </D:property>
+ <D:property name="group-memberships">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/4.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:">
-<D:set>
-<D:prop>
-<D:details1><D:href>$calendarpath1:</D:href></D:details1>
-<D:details2><D:href>$calendarpath2:</D:href></D:details2>
-</D:prop>
-</D:set>
-</D:propertyupdate>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/4.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/4.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:details1><D:href>$calendarpath1:</D:href></D:details1>
+<D:details2><D:href>$calendarpath2:</D:href></D:details2>
+</D:prop>
+</D:set>
+</D:propertyupdate>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/5.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="details1">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/5.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/5.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="details1">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/6.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="details2">
- <D:property name="displayname"/>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/6.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/6.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="details2">
+ <D:property name="displayname"/>
+ </D:property>
+</D:expand-property>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/7.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propertyupdate xmlns:D="DAV:">
-<D:remove>
-<D:prop>
-<D:details1/>
-<D:details2/>
-</D:prop>
-</D:remove>
-</D:propertyupdate>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/7.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/7.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:remove>
+<D:prop>
+<D:details1/>
+<D:details2/>
+</D:prop>
+</D:remove>
+</D:propertyupdate>
Deleted: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/expandproperty/8.xml 2008-10-17 02:20:51 UTC (rev 3165)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:expand-property xmlns:D="DAV:">
- <D:property name="details">
- <D:property name="displayname">
- <D:property name="another"/>
- </D:property>
- </D:property>
-</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml (from rev 3165, CalDAVTester/trunk/Resource/expandproperty/8.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/expandproperty/8.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:expand-property xmlns:D="DAV:">
+ <D:property name="details">
+ <D:property name="displayname">
+ <D:property name="another"/>
+ </D:property>
+ </D:property>
+</D:expand-property>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/10.xml (from rev 3190, CalDAVTester/trunk/Resource/recurrenceput/10.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/10.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/10.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:getcontenttype/>
+</D:prop>
+</D:propfind>
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/9.ics (from rev 3190, CalDAVTester/trunk/Resource/recurrenceput/9.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/9.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/recurrenceput/9.ics 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+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:20060202T205536Z
+DTSTART;TZID=US/Eastern:20060101T120000
+DURATION:PT1H
+SUMMARY:event 1
+UID:event1 at Cyrus-Daboo.local
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/1.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/1.ics 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/1.ics 2008-11-28 19:46:58 UTC (rev 3417)
@@ -8,7 +8,7 @@
DTEND:20060208T210000Z
ATTENDEE;CN=User 01;PARTSTAT=ACCEPTED:$cuaddralt1:
ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01;RSVP=TRUE:$rcuaddralt1:
+ATTENDEE;CN=Resource 01:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
Modified: CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/19.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/19.ics 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/19.ics 2008-11-28 19:46:58 UTC (rev 3417)
@@ -7,7 +7,7 @@
DTSTART:20060308T200000Z
DTEND:20060308T210000Z
ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2:
-ATTENDEE;CN=Resource 01:$rcuaddralt1:
+ATTENDEE;CN=Resource 01;RSVP=FALSE:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
Copied: CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/21.ics (from rev 2451, CalDAVTester/trunk/Resource/scheduleauto/21.ics)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/21.ics (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/21.ics 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REQUEST
+PRODID:-//ORACLE//NONSGML Windows Desktop Calendar 10.1.2.0.5.278//EN
+BEGIN:VEVENT
+UID:20060110T231240Z-4011c71-187-6f73-1
+DTSTART:20060208T200000Z
+DTEND:20060208T210000Z
+ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01;RSVP=FALSE:$rcuaddralt1:
+CREATED:20060110T231240Z
+DESCRIPTION:+1 605 990 0100\nAccess: 879307#
+DTSTAMP:20060309T185105Z
+ORGANIZER;CN=Cyrus Daboo:$cuaddralt1:
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:TC Realtime
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/4.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/4.ics 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/4.ics 2008-11-28 19:46:58 UTC (rev 3417)
@@ -7,7 +7,7 @@
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;CN=Resource 01;RSVP=FALSE;PARTSTAT=ACCEPTED:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
Modified: CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/5.ics
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/5.ics 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/scheduleauto/5.ics 2008-11-28 19:46:58 UTC (rev 3417)
@@ -6,7 +6,7 @@
DTSTART:20060208T200000Z
DTEND:20060208T210000Z
ATTENDEE;CN=User 02;PARTSTAT=ACCEPTED:$cuaddralt2:
-ATTENDEE;CN=Resource 01;PARTSTAT=ACCEPTED:$rcuaddralt1:
+ATTENDEE;PARTSTAT=ACCEPTED;CN=Resource 01:$rcuaddralt1:
CREATED:20060110T231240Z
DESCRIPTION:+1 605 990 0100\nAccess: 879307#
DTSTAMP:20060309T185105Z
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/server/serverinfo.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -191,6 +191,11 @@
<key>$pathprefix2:</key>
<value>/calendars/__uids__/user02</value>
</substitution>
+ <!-- relative path to second user calendar home-->
+ <substitution>
+ <key>$calendarpath2:</key>
+ <value>/calendars/__uids__/user02/calendar</value>
+ </substitution>
<!-- calendar user address of second user-->
<substitution>
<key>$cuaddr2:</key>
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/acl.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/acl.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/acl.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -218,6 +218,7 @@
<value>DAV:resourcetype</value>
<value>DAV:getetag</value>
<value>DAV:displayname</value>
+ <value>DAV:current-user-privilege-set</value>
<value>DAV:supported-privilege-set</value>
<value>DAV:acl-restrictions</value>
<value>DAV:inherited-acl-set</value>
@@ -225,7 +226,6 @@
</arg>
<arg>
<name>badprops</name>
- <value>DAV:current-user-privilege-set</value>
<value>DAV:acl</value>
<value>DAV:owner</value>
<value>DAV:group</value>
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/calendaruserproxy.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/calendaruserproxy.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/calendaruserproxy.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -784,6 +784,247 @@
</test>
</test-suite>
+ <test-suite name='Proxy For properties'>
+ <test name='1'>
+ <description>Default setup</description>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>$principal1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>http://calendarserver.org/ns/calendar-proxy-read-for$</value>
+ <value>http://calendarserver.org/ns/calendar-proxy-write-for$</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Change proxy state and test</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>$principal1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[http://calendarserver.org/ns/calendar-proxy-read-for$<href xmlns="DAV:">$principaluri2:</href>]]></value>
+ <value><![CDATA[http://calendarserver.org/ns/calendar-proxy-write-for$<href xmlns="DAV:">$principaluri3:</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Reset proxies</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Expand properties'>
+ <test name='1'>
+ <description>OK property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principal1:</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>User 02</value>
+ <value>User 03</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Change proxy state and test</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/11.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>OK property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/12.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principal1:</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>User 02</value>
+ <value>User 03</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Reset proxies</description>
+ <request user='$userid2:' pswd='$pswd2:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal2:calendar-proxy-read/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ <request user='$userid3:' pswd='$pswd3:' print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$principal3:calendar-proxy-write/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/calendaruserproxy/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:group-member-set</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/dropbox.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/dropbox.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -196,10 +196,10 @@
<method>MKCALENDAR</method>
<ruri>$pathprefix:/dropbox/calendar/</ruri>
<verify>
- <callback>prepostcondition</callback>
+ <callback>statusCode</callback>
<arg>
- <name>error</name>
- <value>http://calendarserver.org/ns/valid-drop-box</value>
+ <name>status</name>
+ <value>405</value>
</arg>
</verify>
</request>
@@ -230,10 +230,10 @@
<method>MKCALENDAR</method>
<ruri>$pathprefix:/dropbox/ABCEFG/calendar/</ruri>
<verify>
- <callback>prepostcondition</callback>
+ <callback>statusCode</callback>
<arg>
- <name>error</name>
- <value>http://calendarserver.org/ns/valid-drop-box-resource</value>
+ <name>status</name>
+ <value>405</value>
</arg>
</verify>
</request>
@@ -244,10 +244,10 @@
<method>MKCOL</method>
<ruri>$pathprefix:/dropbox/ABCEFG/calendar/</ruri>
<verify>
- <callback>prepostcondition</callback>
+ <callback>statusCode</callback>
<arg>
- <name>error</name>
- <value>http://calendarserver.org/ns/valid-drop-box-resource</value>
+ <name>status</name>
+ <value>405</value>
</arg>
</verify>
</request>
Copied: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/expandproperty.xml (from rev 3165, CalDAVTester/trunk/scripts/tests/expandproperty.xml)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/expandproperty.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/expandproperty.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,243 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2007 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 expand-property REPORT</description>
+
+ <start/>
+
+ <test-suite name='Basic REPORT' ignore='no'>
+ <test name='1'>
+ <description>OK property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$principal1:</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Missing property query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>DAV:missing</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Two OK properties (one empty) query</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Access Control' ignore='no'>
+ <test name='1'>
+ <description>Set property to point to someone else's calendar</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Try query against accessible href</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/5.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>displayname</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Try query against inaccessible href</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/6.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>prefix</name>
+ <value>-</value>
+ </arg>
+ <arg>
+ <name>okhrefs</name>
+ <value>$pathprefix:/</value>
+ </arg>
+ </verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>notcontains</name>
+ <value>displayname</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Reset property</description>
+ <request print-response="no">
+ <method>PROPPATCH</method>
+ <ruri>$pathprefix:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/7.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Invalid REPORTs' ignore='no'>
+ <test name='1'>
+ <description>Wrong Depth 1</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <header>
+ <name>Depth</name>
+ <value>1</value>
+ </header>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Wrong Depth infinity</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <header>
+ <name>Depth</name>
+ <value>infinity</value>
+ </header>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>400</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Multi-expand not supported</description>
+ <request print-response="no">
+ <method>REPORT</method>
+ <ruri>$principal1:</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/expandproperty/8.xml</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>
+ <name>status</name>
+ <value>501</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/put.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/put.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/put.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -42,7 +42,7 @@
<callback>header</callback>
<arg>
<name>header</name>
- <value>ETag$\"6f9c972758484555e19608a4946289eb\"</value>
+ <value>ETag$\"74fc4a187cb771910071f8e326079dff\"</value>
</arg>
</verify>
</request>
@@ -502,6 +502,111 @@
</test>
</test-suite>
+ <test-suite name='PUT with Content-Type parameters'>
+ <test name='1' ignore='no'>
+ <description>PUT</description>
+ <request>
+ <method>PUT</method>
+ <ruri>1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/recurrenceput/9.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>GET</description>
+ <request>
+ <method>GET</method>
+ <ruri>1.ics</ruri>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Content-Type$text/calendar;charset=utf-8</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>PROPFIND</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>1.ics</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/recurrenceput/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:getcontenttype$text/calendar;charset=utf-8</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>MKCOL</description>
+ <request end-delete="yes">
+ <method>MKCOL</method>
+ <ruri>$pathprefix:/collection/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>PUT</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix:/collection/1234</ruri>
+ <data>
+ <content-type>text/calendar; x-mac-auto-archive=yes</content-type>
+ <filepath>Resource/recurrenceput/9.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>GET</description>
+ <request>
+ <method>GET</method>
+ <ruri>$pathprefix:/collection/1234</ruri>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Content-Type$text/calendar;x-mac-auto-archive=yes</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='7' ignore='no'>
+ <description>PROPFIND</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix:/collection/1234</ruri>
+ <data>
+ <content-type>application/xml; charset=utf-8</content-type>
+ <filepath>Resource/recurrenceput/10.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value>DAV:getcontenttype$text/calendar;x-mac-auto-archive=yes</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/schedulepostauto.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/schedulepostauto.xml 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/schedulepostauto.xml 2008-11-28 19:46:58 UTC (rev 3417)
@@ -54,7 +54,7 @@
</request>
</start>
- <test-suite name='POST non-recurring without conflict' ignore='no'>
+ <test-suite name='POST non-recurring without conflict (no RSVP)' ignore='no'>
<test name='1' ignore='no'>
<description>Do POST</description>
<request>
@@ -179,7 +179,7 @@
</test>
</test-suite>
- <test-suite name='POST non-recurring without conflict, no-rsvp' ignore='no'>
+ <test-suite name='POST non-recurring without conflict, rsvp=false' ignore='no'>
<test name='1' ignore='no'>
<description>Do POST</description>
<request>
@@ -362,7 +362,7 @@
<callback>dataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/scheduleauto/4.ics</value>
+ <value>Resource/scheduleauto/21.ics</value>
</arg>
</verify>
</request>
@@ -499,7 +499,7 @@
<callback>dataMatch</callback>
<arg>
<name>filepath</name>
- <value>Resource/scheduleauto/4.ics</value>
+ <value>Resource/scheduleauto/21.ics</value>
</arg>
</verify>
</request>
Modified: CalDAVTester/branches/users/cdaboo/deployment/verifiers/multistatusItems.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/verifiers/multistatusItems.py 2008-11-28 19:45:46 UTC (rev 3416)
+++ CalDAVTester/branches/users/cdaboo/deployment/verifiers/multistatusItems.py 2008-11-28 19:46:58 UTC (rev 3417)
@@ -35,7 +35,7 @@
count = args.get("count", [])
prefix = args.get("prefix", [])
if len(prefix):
- prefix = prefix[0]
+ prefix = prefix[0] if prefix[0] != "-" else ""
else:
prefix = uri
okhrefs = [prefix + i for i in okhrefs]
@@ -53,7 +53,8 @@
doc = xml.dom.minidom.parseString( respdata )
ok_status_hrefs = []
bad_status_hrefs = []
- for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
+ multistatus = doc.getElementsByTagNameNS("DAV:", "multistatus" )
+ for response in ElementsByName(multistatus[0], "DAV:", "response"):
# Get href for this response
href = ElementsByName(response, "DAV:", "href")
Copied: CalDAVTester/branches/users/cdaboo/deployment/verifiers/propfindValues.py (from rev 3035, CalDAVTester/trunk/verifiers/propfindValues.py)
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/verifiers/propfindValues.py (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/verifiers/propfindValues.py 2008-11-28 19:46:58 UTC (rev 3417)
@@ -0,0 +1,138 @@
+##
+# Copyright (c) 2006-2007 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.
+#
+# DRI: Cyrus Daboo, cdaboo at apple.com
+##
+
+"""
+Verifier that checks a propfind response for regex matches to property values.
+"""
+
+import re
+
+from xml.dom.minidom import Element
+import xml.dom.minidom
+
+from utilities.xmlutils import ElementsByName
+
+class Verifier(object):
+
+ def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
+
+ # If no status verification requested, then assume all 2xx codes are OK
+ ignores = args.get("ignore", [])
+
+ # Get property arguments and split on $ delimited for name, value tuples
+ testprops = args.get("props", [])
+ props_match = []
+ for i in range(len(testprops)):
+ p = testprops[i]
+ if (p.find("$") != -1):
+ if p.find("$") != len(p) - 1:
+ props_match.append((p.split("$")[0], p.split("$")[1], True))
+ else:
+ props_match.append((p.split("$")[0], "", True))
+ elif (p.find("!") != -1):
+ if p.find("!") != len(p) - 1:
+ props_match.append((p.split("!")[0], p.split("!")[1], False))
+ else:
+ props_match.append((p.split("!")[0], "", False))
+
+ # Process the multistatus response, extracting all hrefs
+ # and comparing with the properties defined for this test. Report any
+ # mismatches.
+
+ # Must have MULTISTATUS response code
+ if response.status != 207:
+ return False, " HTTP Status for Request: %d\n" % (response.status,)
+
+ try:
+ doc = xml.dom.minidom.parseString( respdata )
+ except:
+ return False, " Could not parse proper XML response\n"
+
+ result = True
+ resulttxt = ""
+ for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
+
+ # Get href for this response
+ href = ElementsByName(response, "DAV:", "href")
+ if len(href) != 1:
+ return False, " Wrong number of DAV:href elements\n"
+ if href[0].firstChild is not None:
+ href = href[0].firstChild.data
+ else:
+ href = ""
+ if href in ignores:
+ continue
+
+ # Get all property status
+ ok_status_props = {}
+ propstatus = ElementsByName(response, "DAV:", "propstat")
+ for props in propstatus:
+ # Determine status for this propstat
+ status = ElementsByName(props, "DAV:", "status")
+ if len(status) == 1:
+ statustxt = status[0].firstChild.data
+ status = False
+ if statustxt.startswith("HTTP/1.1 ") and (len(statustxt) >= 10):
+ status = (statustxt[9] == "2")
+ else:
+ status = False
+
+ # Get properties for this propstat
+ prop = ElementsByName(props, "DAV:", "prop")
+ if len(prop) != 1:
+ return False, " Wrong number of DAV:prop elements\n"
+
+ def _removeEmptyNodes(node):
+ for child in tuple(node._get_childNodes()):
+ temp = child.toprettyxml("", "")
+ temp = temp.strip()
+ if not temp:
+ node.removeChild(child)
+ else:
+ _removeEmptyNodes(child)
+
+ for child in prop[0]._get_childNodes():
+ if isinstance(child, Element):
+ qname = (child.namespaceURI, child.localName)
+ fqname = qname[0] + qname[1]
+ if child.firstChild is not None:
+ # Copy sub-element data as text into one long string and strip leading/trailing space
+ _removeEmptyNodes(child)
+ value = ""
+ for p in child._get_childNodes():
+ value += p.toprettyxml("", "")
+ else:
+ value = None
+
+ if status:
+ ok_status_props[fqname] = value
+
+ # Look at each property we want to test and see if present
+ for propname, value, match in props_match:
+ if propname not in ok_status_props:
+ resulttxt += " Items not returned in report (OK) for %s: %s\n" % (href, propname,)
+ result = False
+ matched = re.match(value, ok_status_props[propname])
+ if match and not matched:
+ resulttxt += " Items not matching for %s: %s %s\n" % (href, propname, ok_status_props[propname])
+ result = False
+ elif not match and matched:
+ resulttxt += " Items incorrectly match for %s: %s %s\n" % (href, propname, ok_status_props[propname])
+ result = False
+
+ return result, resulttxt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081128/406ca305/attachment-0001.html>
More information about the calendarserver-changes
mailing list