[CalendarServer-changes] [3096] CalDAVTester/branches/release/CalDAVTester-1.3-dev
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 30 18:59:14 PDT 2008
Revision: 3096
http://trac.macosforge.org/projects/calendarserver/changeset/3096
Author: cdaboo at apple.com
Date: 2008-09-30 18:59:13 -0700 (Tue, 30 Sep 2008)
Log Message:
-----------
Merge r2403, r2709, r2711 from trunk.
Modified Paths:
--------------
CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/dropbox/1.xml
CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/dropbox.xml
CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/get.xml
CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/privateevents.xml
Added Paths:
-----------
CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/
CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics
CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/38.ics
CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/39.ics
Removed Paths:
-------------
CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics
Modified: CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/dropbox/1.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/dropbox/1.xml 2008-10-01 01:56:36 UTC (rev 3095)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/dropbox/1.xml 2008-10-01 01:59:13 UTC (rev 3096)
@@ -2,6 +2,5 @@
<D:propfind xmlns:D="DAV:" xmlns:A="http://calendarserver.org/ns/">
<D:prop>
<A:dropbox-home-URL/>
-<A:notifications-URL/>
</D:prop>
</D:propfind>
Deleted: CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/get/1.ics 2008-07-17 17:08:44 UTC (rev 2709)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics 2008-10-01 01:59:13 UTC (rev 3096)
@@ -1,42 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//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:54E181BC7CCC373042B28842 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T100000
-DURATION:PT1H
-DTSTAMP:20051222T205953Z
-SUMMARY:event 1
-END:VEVENT
-BEGIN:VEVENT
-UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
-DTSTART;TZID=US/Eastern:20060101T180000
-DURATION:PT1H
-DTSTAMP:20051222T210310Z
-SUMMARY:event 4
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-X-MULBERRY-ALARM-STATUS:PENDING
-X-MULBERRY-SPEAK-TEXT:
-END:VALARM
-END:VEVENT
-END:VCALENDAR
Copied: CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics (from rev 2709, CalDAVTester/trunk/Resource/get/1.ics)
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/get/1.ics 2008-10-01 01:59:13 UTC (rev 3096)
@@ -0,0 +1,42 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//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:54E181BC7CCC373042B28842 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+BEGIN:VEVENT
+UID:A3217B429B4D2FF2DC2EEE66 at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T180000
+DURATION:PT1H
+DTSTAMP:20051222T210310Z
+SUMMARY:event 4
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+X-MULBERRY-ALARM-STATUS:PENDING
+X-MULBERRY-SPEAK-TEXT:
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Copied: CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/38.ics (from rev 2711, CalDAVTester/trunk/Resource/privateevents/38.ics)
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/38.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/38.ics 2008-10-01 01:59:13 UTC (rev 3096)
@@ -0,0 +1,83 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//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:54E181BC7CCC373042B28842FFF at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event default access
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFA at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event public access
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFB at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event private access
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFC at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE:mailto:user02 at example.com
+DTSTAMP:20051222T205953Z
+LOCATION:confidential 1
+ORGANIZER:mailto:user01 at example.com
+SUMMARY:event confidential access 1
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFD at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+ATTENDEE:mailto:user02 at example.com
+DTSTAMP:20051222T205953Z
+LOCATION:restricted 1
+ORGANIZER:mailto:user01 at example.com
+SUMMARY:event restricted access 1
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Copied: CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/39.ics (from rev 2711, CalDAVTester/trunk/Resource/privateevents/39.ics)
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/39.ics (rev 0)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/Resource/privateevents/39.ics 2008-10-01 01:59:13 UTC (rev 3096)
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//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:54E181BC7CCC373042B28842FFF at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event default access
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFA at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event public access
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFC at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+END:VEVENT
+BEGIN:VEVENT
+UID:54E181BC7CCC373042B28842FFD at ninevah.local
+DTSTART;TZID=US/Eastern:20060101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+LOCATION:restricted 1
+SUMMARY:event restricted access 1
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/dropbox.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/dropbox.xml 2008-10-01 01:56:36 UTC (rev 3095)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/dropbox.xml 2008-10-01 01:59:13 UTC (rev 3096)
@@ -44,7 +44,6 @@
<arg>
<name>okprops</name>
<value>http://calendarserver.org/ns/dropbox-home-URL$<href xmlns="DAV:">$pathprefix:/dropbox/</href></value>
- <value>http://calendarserver.org/ns/notifications-URL$<href xmlns="DAV:">$pathprefix:/notifications/</href></value>
</arg>
</verify>
</request>
@@ -73,28 +72,6 @@
</verify>
</request>
</test>
- <test name='2'>
- <description>Look for properties</description>
- <request>
- <method>PROPFIND</method>
- <header>
- <name>Depth</name>
- <value>0</value>
- </header>
- <ruri>$pathprefix:/notifications/</ruri>
- <data>
- <content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/dropbox/2.xml</filepath>
- </data>
- <verify>
- <callback>propfindItems</callback>
- <arg>
- <name>okprops</name>
- <value>DAV:resourcetype$<collection/><notifications xmlns="http://calendarserver.org/ns/"/></value>
- </arg>
- </verify>
- </request>
- </test>
</test-suite>
<test-suite name='Drop Box Collection Create'>
<test name='1'>
Modified: CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/get.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/get.xml 2008-10-01 01:56:36 UTC (rev 3095)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/get.xml 2008-10-01 01:59:13 UTC (rev 3096)
@@ -24,7 +24,7 @@
<description>Test GET on collections to ensure proper directory listing, calendar aggregation behavior</description>
<start>
- <request end-delete="yes" print-response="yes">
+ <request end-delete="yes">
<method>PUT</method>
<ruri>1.ics</ruri>
<data>
@@ -117,6 +117,34 @@
</verify>
</request>
</test>
+ <test name='3'>
+ <description>GET on calendar collection without multiple VTIMEZONEs</description>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/delete/4.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$calendarpath1:/</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/get/1.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end/>
Modified: CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/privateevents.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/privateevents.xml 2008-10-01 01:56:36 UTC (rev 3095)
+++ CalDAVTester/branches/release/CalDAVTester-1.3-dev/scripts/tests/privateevents.xml 2008-10-01 01:59:13 UTC (rev 3096)
@@ -46,6 +46,58 @@
</request>
<request end-delete="yes">
<method>MKCALENDAR</method>
+ <ruri>$pathprefix:/rolledcalendar/</ruri>
+ </request>
+ <request>
+ <method>ACL</method>
+ <ruri>$pathprefix:/rolledcalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/privateevents/4.xml</filepath>
+ </data>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix:/rolledcalendar/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privateevents/5.ics</filepath>
+ </data>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix:/rolledcalendar/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privateevents/6.ics</filepath>
+ </data>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix:/rolledcalendar/3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privateevents/8.ics</filepath>
+ </data>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix:/rolledcalendar/4.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privateevents/10.ics</filepath>
+ </data>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix:/rolledcalendar/5.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/privateevents/12.ics</filepath>
+ </data>
+ </request>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
<ruri>$pathprefix:/copycalendar/</ruri>
</request>
<request>
@@ -3608,6 +3660,51 @@
</test>
</test-suite>
+ <test-suite name='Rolled up data tests' ignore='no'>
+ <test name='1'>
+ <description>get by user01</description>
+ <request print-response="no">
+ <method>GET</method>
+ <ruri>$pathprefix:/rolledcalendar/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/privateevents/38.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>get by user02</description>
+ <request user="$userid2:" pswd="$pswd2:" print-response="no">
+ <method>GET</method>
+ <ruri>$pathprefix:/rolledcalendar/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/privateevents/39.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>get by user03</description>
+ <request user="$userid3:" pswd="$pswd3:" print-response="no">
+ <method>GET</method>
+ <ruri>$pathprefix:/rolledcalendar/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/privateevents/39.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080930/19b13d7f/attachment-0001.html
More information about the calendarserver-changes
mailing list