[CalendarServer-changes] [10641] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 4 08:50:24 PST 2013
Revision: 10641
http://trac.calendarserver.org//changeset/10641
Author: cdaboo at apple.com
Date: 2013-02-04 08:50:24 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
Test that duplicate UIDs are disallowed in calendar collections.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/4.ics
CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/5.ics
CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics
CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics
CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml
CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/duplicate-uids/
CalDAVTester/trunk/Resource/CalDAV/duplicate-uids/1.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/10.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/11.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/12.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/13.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/14.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/15.ics
CalDAVTester/trunk/Resource/CalDAV/floating/put/9.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/51.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/52.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/53.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/54.ics
CalDAVTester/trunk/Resource/CalDAV/privateevents/55.ics
CalDAVTester/trunk/scripts/tests/CalDAV/duplicate_uids.xml
Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/4.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/4.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -2,7 +2,7 @@
VERSION:2.0
PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTODO
-UID:put-1 at example.com
+UID:put-3 at example.com
DUE:20110427T000000Z
DTSTAMP:20110427T000000Z
SUMMARY:todo 1
Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/5.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/put/5.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -2,7 +2,7 @@
VERSION:2.0
PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VTODO
-UID:put-1 at example.com
+UID:put-3 at example.com
DUE:20110427T000000Z
DTSTAMP:20110427T000000Z
SUMMARY:todo 1
Modified: CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/default-alarms/sharing/8.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -2,7 +2,7 @@
VERSION:2.0
PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
BEGIN:VEVENT
-UID:put-2 at example.com
+UID:put-sharing-2 at example.com
DTSTART:$now.year.1:0427T080000Z
DURATION:P1DT
DTSTAMP:20110427T000000Z
Added: CalDAVTester/trunk/Resource/CalDAV/duplicate-uids/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/duplicate-uids/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/duplicate-uids/1.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,29 @@
+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:$now.year.1:0101T100000
+DURATION:PT1H
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/10.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/10.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/10.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+BEGIN:VEVENT
+DTSTAMP:20060202T205550Z
+DTSTART;VALUE=DATE:$now.year.1:0102
+SUMMARY:event 2
+UID:event10 at example.local
+STATUS:TENTATIVE
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/11.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/11.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/11.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+BEGIN:VEVENT
+DTSTAMP:20060202T205550Z
+DTSTART:$now.year.1:0101T010000
+DTEND:$now.year.1:0101T020000
+SUMMARY:event 3
+UID:event11 at example.local
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/12.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/12.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/12.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+BEGIN:VEVENT
+DTSTAMP:20060202T205550Z
+DTSTART:$now.year.1:0102T010000
+DTEND:$now.year.1:0102T020000
+SUMMARY:event 4
+UID:event12 at example.local
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/13.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/13.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/13.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//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:20060202T205550Z
+DTSTART;TZID="US/Eastern":$now.year.1:0101T000000
+DTEND;TZID="US/Eastern":$now.year.1:0101T010000
+SUMMARY:event 5
+UID:event13 at example.local
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/14.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/14.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/14.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Pacific
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20060202T205550Z
+DTSTART;TZID="US/Pacific":$now.year.1:0101T000000
+DTEND;TZID="US/Pacific":$now.year.1:0101T010000
+SUMMARY:event 6
+UID:event14 at example.local
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/15.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/15.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/15.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:GMT
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:BST
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:GMT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20060202T205550Z
+DTSTART;TZID="GMT":$now.year.1:0101T000000
+DTEND;TZID="GMT":$now.year.1:0101T010000
+SUMMARY:event 7
+UID:event15 at example.local
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/floating/put/9.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/floating/put/9.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/floating/put/9.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-WR-CALNAME:CalDAV tests
+BEGIN:VEVENT
+DTSTAMP:20060202T205550Z
+DTSTART;VALUE=DATE:$now.year.1:0101
+SUMMARY:event 1
+UID:event9 at example.local
+STATUS:TENTATIVE
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/38.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -20,14 +20,14 @@
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFF at ninevah.local
+UID:54E181BC7CCC373042B28842FFF-51 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
SUMMARY:event default access
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFA at ninevah.local
+UID:54E181BC7CCC373042B28842FFA-52 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
@@ -39,7 +39,7 @@
END:VALARM
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFB at ninevah.local
+UID:54E181BC7CCC373042B28842FFB-53 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
@@ -51,7 +51,7 @@
END:VALARM
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFC at ninevah.local
+UID:54E181BC7CCC373042B28842FFC-54 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
@@ -66,7 +66,7 @@
END:VALARM
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFD at ninevah.local
+UID:54E181BC7CCC373042B28842FFD-55 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
ATTENDEE;CN=$username2:;RSVP=TRUE;SCHEDULE-STATUS=1.2;EMAIL=$email2::$cuaddrurn2:
Modified: CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/39.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -20,14 +20,14 @@
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFF at ninevah.local
+UID:54E181BC7CCC373042B28842FFF-51 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
SUMMARY:event default access
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFA at ninevah.local
+UID:54E181BC7CCC373042B28842FFA-52 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
@@ -39,13 +39,13 @@
END:VALARM
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFC at ninevah.local
+UID:54E181BC7CCC373042B28842FFC-54 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
END:VEVENT
BEGIN:VEVENT
-UID:54E181BC7CCC373042B28842FFD at ninevah.local
+UID:54E181BC7CCC373042B28842FFD-55 at ninevah.local
DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
DURATION:PT1H
DTSTAMP:20051222T205953Z
Added: CalDAVTester/trunk/Resource/CalDAV/privateevents/51.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/51.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/51.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,30 @@
+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
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event default access
+UID:54E181BC7CCC373042B28842FFF-51 at ninevah.local
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/privateevents/52.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/52.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/52.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-CALENDARSERVER-ACCESS:PUBLIC
+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
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event public access
+UID:54E181BC7CCC373042B28842FFA-52 at ninevah.local
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/privateevents/53.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/53.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/53.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,36 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-CALENDARSERVER-ACCESS:PRIVATE
+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
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event private access
+UID:54E181BC7CCC373042B28842FFB-53 at ninevah.local
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/privateevents/54.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/54.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/54.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,39 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-CALENDARSERVER-ACCESS:CONFIDENTIAL
+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
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event confidential access 1
+LOCATION:confidential 1
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
+UID:54E181BC7CCC373042B28842FFC-54 at ninevah.local
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/privateevents/55.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/privateevents/55.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/privateevents/55.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,39 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+X-CALENDARSERVER-ACCESS:RESTRICTED
+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
+DTSTART;TZID=US/Eastern:$now.year.1:0101T100000
+DURATION:PT1H
+SUMMARY:event restricted access 1
+LOCATION:restricted 1
+ORGANIZER:$cuaddr1:
+ATTENDEE:$cuaddr2:
+UID:54E181BC7CCC373042B28842FFD-55 at ninevah.local
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:Test
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VEVENT
+END:VCALENDAR
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/1.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -20,14 +20,14 @@
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
-UID:user01-uid
+UID:user01-inject-uid
DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
DURATION:PT1H
DTSTAMP:20051222T210310Z
SUMMARY:event 1-inject
END:VEVENT
BEGIN:X-CALENDARSERVER-PERUSER
-UID:user01-uid
+UID:user01-inject-uid
X-CALENDARSERVER-PERUSER-UID:user01
BEGIN:X-CALENDARSERVER-PERINSTANCE
BEGIN:VALARM
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/2.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -20,7 +20,7 @@
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
-UID:user02-uid
+UID:user02-inject-uid
DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
DURATION:PT1H
DTSTAMP:20051222T210310Z
Modified: CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/Resource/CalDAV/sharing/peruser-data/inject/3.ics 2013-02-04 16:50:24 UTC (rev 10641)
@@ -20,14 +20,14 @@
END:DAYLIGHT
END:VTIMEZONE
BEGIN:VEVENT
-UID:user02-uid
+UID:user02-inject-uid
DTSTART;TZID=US/Eastern:$now.year.1:0101T180000
DURATION:PT1H
DTSTAMP:20051222T210310Z
SUMMARY:event 2-inject
END:VEVENT
BEGIN:X-CALENDARSERVER-PERUSER
-UID:user02-uid
+UID:user02-inject-uid
X-CALENDARSERVER-PERUSER-UID:user01
BEGIN:X-CALENDARSERVER-PERINSTANCE
BEGIN:VALARM
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -72,6 +72,7 @@
<feature>implicit-scheduling</feature> <!-- CalDAV scheduling - implicit -->
<feature>managed-attachments</feature> <!-- CalDAV Managed Attachments -->
<feature>maskuid</feature> <!-- maskuid extension -->
+ <feature>no-duplicate-uids</feature> <!-- duplicate UIDs in same home not supported -->
<feature>partitioning</feature> <!-- Partitioned server -->
<feature>partstat-timestamp</feature> <!-- Time stamps when PARTSTAT changes extension -->
<feature>private-comments</feature> <!-- private-comments extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -72,6 +72,7 @@
<feature>implicit-scheduling</feature> <!-- CalDAV scheduling - implicit -->
<feature>managed-attachments</feature> <!-- CalDAV Managed Attachments -->
<feature>maskuid</feature> <!-- maskuid extension -->
+ <feature>no-duplicate-uids</feature> <!-- duplicate UIDs in same home not supported -->
<!-- <feature>partitioning</feature> --> <!-- Partitioned server -->
<feature>partstat-timestamp</feature> <!-- Time stamps when PARTSTAT changes extension -->
<feature>private-comments</feature> <!-- private-comments extension -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -73,6 +73,7 @@
<feature>managed-attachments</feature> <!-- CalDAV Managed Attachments -->
<feature>maskuid</feature> <!-- maskuid extension -->
<!-- <feature>partitioning</feature> --> <!-- Partitioned server -->
+ <feature>no-duplicate-uids</feature> <!-- duplicate UIDs in same home not supported -->
<feature>partstat-timestamp</feature> <!-- Time stamps when PARTSTAT changes extension -->
<feature>private-comments</feature> <!-- private-comments extension -->
<feature>private-events</feature> <!-- private-events extension -->
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -66,7 +66,7 @@
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarhome2:/visibletouser01/hidden1.ics</ruri>
- <data>
+ <data generate="yes">
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/acls/16.ics</filepath>
</data>
@@ -94,7 +94,7 @@
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarhome2:/notvisibletouser01/hidden1.ics</ruri>
- <data>
+ <data generate="yes">
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/acls/16.ics</filepath>
</data>
@@ -126,7 +126,7 @@
<request user="$userid2:" pswd="$pswd2:">
<method>PUT</method>
<ruri>$calendarhome2:/calreadtoauth/1.ics</ruri>
- <data>
+ <data generate="yes">
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/acls/16.ics</filepath>
</data>
@@ -155,7 +155,7 @@
</require-feature>
<method>PUT</method>
<ruri>$calendarhome2:/colreadtoauth/1.ics</ruri>
- <data>
+ <data generate="yes">
<content-type>text/calendar; charset=utf-8</content-type>
<filepath>Resource/CalDAV/acls/16.ics</filepath>
</data>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -48,6 +48,9 @@
<ruri>$calendarhome1:/calendar2/</ruri>
</request>
<request>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<method>PUT</method>
<ruri>$calendarhome1:/calendar2/2_2.ics</ruri>
<data>
@@ -64,6 +67,9 @@
</data>
</request>
<request>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<method>PUT</method>
<ruri>$calendarhome1:/calendar2/3.ics</ruri>
<data>
@@ -80,6 +86,9 @@
</data>
</request>
<request>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<method>PUT</method>
<ruri>$calendarhome1:/calendar2/4.ics</ruri>
<data>
@@ -110,6 +119,9 @@
<require-feature>
<feature>COPY Method</feature>
</require-feature>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<test name='1' ignore='no'>
<description>COPY within same calendar to new resource</description>
@@ -412,6 +424,9 @@
</request>
</test>
<test name='5'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>MOVE to different calendar, existing resource with overwrite</description>
<request print-response='no'>
<method>PROPFIND</method>
@@ -454,6 +469,9 @@
</request>
</test>
<test name='6'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>MOVE to different calendar, existing resource without overwrite</description>
<request>
<method>MOVE</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -224,6 +224,9 @@
<name>Destination</name>
<value>$host:$calendarhome1:/movecopy/3.ics</value>
</header>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>PROPFIND</method>
@@ -276,6 +279,9 @@
<require-feature>
<feature>COPY Method</feature>
</require-feature>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>Check for CTag change on COPY of new resource</description>
<request>
<method>COPY</method>
@@ -284,6 +290,9 @@
<name>Destination</name>
<value>$host:$calendarpath1:/2.ics</value>
</header>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>PROPFIND</method>
@@ -332,6 +341,9 @@
<require-feature>
<feature>COPY Method</feature>
</require-feature>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>Check for CTag change on COPY of existing resource</description>
<request>
<method>COPY</method>
@@ -340,6 +352,9 @@
<name>Destination</name>
<value>$host:$calendarpath1:/2.ics</value>
</header>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
</request>
<request>
<method>PROPFIND</method>
@@ -388,10 +403,13 @@
<require-feature>
<feature>MOVE Method</feature>
</require-feature>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>Check for no CTag change on failed MOVE of existing resource</description>
<request>
<method>MOVE</method>
- <ruri>$calendarpath1:/2.ics</ruri>
+ <ruri>$calendarpath1:/1.ics</ruri>
<header>
<name>Destination</name>
<value>$host:$calendarhome1:/movecopy/2.ics</value>
@@ -451,6 +469,13 @@
</grabproperty>
</request>
</test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$calendarhome1:/movecopy/</ruri>
+ </request>
+ </test>
</test-suite>
<test-suite name='Scheduling' ignore='no'>
@@ -751,10 +776,6 @@
<end>
<request>
- <method>DELETE</method>
- <ruri>$calendarhome1:/movecopy/</ruri>
- </request>
- <request>
<method>DELETEALL</method>
<ruri>$calendarpath1:/</ruri>
</request>
Added: CalDAVTester/trunk/scripts/tests/CalDAV/duplicate_uids.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/duplicate_uids.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/duplicate_uids.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -0,0 +1,73 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 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 that duplicate UIDs in calendar home are disallowed</description>
+
+ <require-feature>
+ <feature>caldav</feature>
+ <feature>no-duplicate-uids</feature>
+ </require-feature>
+
+ <start>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
+ <ruri>$calendarhome1:/testing/</ruri>
+ </request>
+ </start>
+
+ <test-suite name='Create duplicate'>
+ <test name='1'>
+ <description>PUT to one calendar</description>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/duplicate-uids/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT to another calendar</description>
+ <request end-delete="yes">
+ <method>PUT</method>
+ <ruri>$calendarhome1:/testing/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/duplicate-uids/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
+ <value>{urn:ietf:params:xml:ns:caldav}unique-scheduling-object-resource</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -239,6 +239,9 @@
<require-feature>
<feature>COPY Method</feature>
</require-feature>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>COPY</description>
<request print-response='no' end-delete='yes'>
<method>COPY</method>
@@ -523,6 +526,9 @@
<require-feature>
<feature>COPY Method</feature>
</require-feature>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>COPY</description>
<request print-response='no' end-delete='yes'>
<method>COPY</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -46,6 +46,9 @@
<ruri>$calendarhome1:/calendar2/</ruri>
</request>
<request>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<method>PUT</method>
<ruri>$calendarhome1:/calendar2/6.ics</ruri>
<data>
@@ -641,6 +644,9 @@
</request>
</test>
<test name='7'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>COPY from calendar with duplicate uids</description>
<request print-response='no'>
<method>COPY</method>
@@ -905,6 +911,9 @@
</request>
</test>
<test name='7'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<description>MOVE from calendar with duplicate uids</description>
<request print-response='no'>
<method>MOVE</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -99,7 +99,7 @@
<ruri>$calendarhome1:/calendar-us/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/9.ics</filepath>
</data>
</request>
<request>
@@ -107,7 +107,7 @@
<ruri>$calendarhome1:/calendar-us/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/2.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/10.ics</filepath>
</data>
</request>
<request>
@@ -115,7 +115,7 @@
<ruri>$calendarhome1:/calendar-us/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/3.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/11.ics</filepath>
</data>
</request>
<request>
@@ -123,7 +123,7 @@
<ruri>$calendarhome1:/calendar-us/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/4.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/12.ics</filepath>
</data>
</request>
<request>
@@ -131,7 +131,7 @@
<ruri>$calendarhome1:/calendar-us/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/5.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/13.ics</filepath>
</data>
</request>
<request>
@@ -139,7 +139,7 @@
<ruri>$calendarhome1:/calendar-us/6.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/6.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/14.ics</filepath>
</data>
</request>
<request>
@@ -147,7 +147,7 @@
<ruri>$calendarhome1:/calendar-us/7.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/floating/put/7.txt</filepath>
+ <filepath>Resource/CalDAV/floating/put/15.ics</filepath>
</data>
</request>
</start>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -116,7 +116,7 @@
<ruri>$calendarhome1:/rolledcalendar/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privateevents/5.ics</filepath>
+ <filepath>Resource/CalDAV/privateevents/51.ics</filepath>
</data>
</request>
<request>
@@ -124,7 +124,7 @@
<ruri>$calendarhome1:/rolledcalendar/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privateevents/6.ics</filepath>
+ <filepath>Resource/CalDAV/privateevents/52.ics</filepath>
</data>
</request>
<request>
@@ -132,7 +132,7 @@
<ruri>$calendarhome1:/rolledcalendar/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privateevents/8.ics</filepath>
+ <filepath>Resource/CalDAV/privateevents/53.ics</filepath>
</data>
</request>
<request>
@@ -140,7 +140,7 @@
<ruri>$calendarhome1:/rolledcalendar/4.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privateevents/10.ics</filepath>
+ <filepath>Resource/CalDAV/privateevents/54.ics</filepath>
</data>
</request>
<request>
@@ -148,7 +148,7 @@
<ruri>$calendarhome1:/rolledcalendar/5.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/privateevents/12.ics</filepath>
+ <filepath>Resource/CalDAV/privateevents/55.ics</filepath>
</data>
</request>
<request end-delete="yes">
@@ -3164,6 +3164,9 @@
</test-suite>
<test-suite name='COPY tests' ignore='no'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<test name='1'>
<description>copy to calendar</description>
<request print-response="no">
@@ -3309,6 +3312,9 @@
</test-suite>
<test-suite name='COPY PUBLIC tests' ignore='no'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<test name='1'>
<description>multiget by user01</description>
<request print-response="no">
@@ -3390,6 +3396,9 @@
</test-suite>
<test-suite name='COPY CONFIDENTIAL all data tests' ignore='no'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<test name='1'>
<description>multiget by user01</description>
<request print-response="no">
@@ -3480,6 +3489,9 @@
</test-suite>
<test-suite name='COPY RESTRICTED all data tests' ignore='no'>
+ <exclude-feature>
+ <feature>no-duplicate-uids</feature>
+ </exclude-feature>
<test name='1'>
<description>multiget by user01</description>
<request print-response="no">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2013-02-02 20:11:04 UTC (rev 10640)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml 2013-02-04 16:50:24 UTC (rev 10641)
@@ -54,7 +54,7 @@
<ruri>$calendarhome1:/synccalendar2/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/4.txt</filepath>
</data>
</request>
<request>
@@ -62,7 +62,7 @@
<ruri>$calendarhome1:/synccalendar2/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/2.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/5.txt</filepath>
</data>
</request>
</start>
@@ -1641,7 +1641,7 @@
<ruri>$calendarhome1:/synccalendar2/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/3.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/6.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1722,7 +1722,7 @@
<ruri>$calendarhome1:/synccalendar2/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/4.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1802,7 +1802,7 @@
<ruri>$calendarhome1:/synccalendar2/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/3.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/6.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1905,7 +1905,7 @@
<ruri>$calendarhome1:/synccalendar2/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/4.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -1998,7 +1998,7 @@
<ruri>$calendarhome1:/synccalendar3/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/7.txt</filepath>
</data>
</request>
<request>
@@ -2006,7 +2006,7 @@
<ruri>$calendarhome1:/synccalendar3/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/2.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/8.txt</filepath>
</data>
</request>
<request end-delete="yes">
@@ -2018,7 +2018,7 @@
<ruri>$calendarhome1:/synccalendar4/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/10.txt</filepath>
</data>
</request>
<request>
@@ -2026,7 +2026,7 @@
<ruri>$calendarhome1:/synccalendar4/2.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/2.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/11.txt</filepath>
</data>
</request>
</test>
@@ -2105,7 +2105,7 @@
<ruri>$calendarhome1:/synccalendar3/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/3.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/9.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -2197,7 +2197,7 @@
<ruri>$calendarhome1:/synccalendar3/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/7.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -2345,7 +2345,7 @@
<ruri>$calendarhome1:/synccalendar4/3.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/3.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/12.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
@@ -2448,7 +2448,7 @@
<ruri>$calendarhome1:/synccalendar4/1.ics</ruri>
<data>
<content-type>text/calendar; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/reports/put/1.txt</filepath>
+ <filepath>Resource/CalDAV/reports/put/10.txt</filepath>
</data>
<verify>
<callback>statusCode</callback>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130204/07979ce0/attachment-0001.html>
More information about the calendarserver-changes
mailing list