Revision: 2093 http://trac.macosforge.org/projects/calendarserver/changeset/2093 Author: cdaboo@apple.com Date: 2008-01-07 14:17:17 -0800 (Mon, 07 Jan 2008) Log Message: ----------- Tests for filtering of data on GET for X-CALENDARSERVER-ACCESS. Modified Paths: -------------- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/10.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/11.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/12.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/13.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/3.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/5.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/6.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/7.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/8.ics CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/9.ics CalDAVTester/branches/users/cdaboo/private_events-2082/scripts/tests/privateevents.xml Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/10.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/10.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/10.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -25,7 +25,15 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event confidential access 1 +LOCATION:confidential 1 +ORGANIZER:mailto:user01@example.com +ATTENDEE:mailto:user02@example.com UID:54E181BC7CCC373042B28842FFC@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/11.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/11.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/11.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -24,7 +24,15 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event confidential access 2 +LOCATION:confidential 2 +ORGANIZER:mailto:user01@example.com +ATTENDEE:mailto:user02@example.com UID:54E181BC7CCC373042B28842FFC@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/12.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/12.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/12.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -25,7 +25,15 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event restricted access 1 +LOCATION:restricted 1 +ORGANIZER:mailto:user01@example.com +ATTENDEE:mailto:user02@example.com UID:54E181BC7CCC373042B28842FFD@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/13.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/13.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/13.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -24,7 +24,15 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event restricted access 2 +LOCATION:restricted 2 +ORGANIZER:mailto:user01@example.com +ATTENDEE:mailto:user02@example.com UID:54E181BC7CCC373042B28842FFD@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/3.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/3.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/3.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -27,7 +27,7 @@ CREATED:20060101T150000Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event 3 UID:54E181BC7CCC373042B28842@ninevah.local ORGANIZER;CN=User 01:$cuaddralt1: ATTENDEE;CN=User 02;RSVP=TRUE:$cuaddralt2: Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/5.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/5.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/5.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -24,7 +24,7 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event default access UID:54E181BC7CCC373042B28842FFF@ninevah.local END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/6.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/6.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/6.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -25,7 +25,12 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event public access UID:54E181BC7CCC373042B28842FFA@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/7.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/7.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/7.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -24,7 +24,12 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event public access UID:54E181BC7CCC373042B28842FFA@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/8.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/8.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/8.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -25,7 +25,12 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event private access UID:54E181BC7CCC373042B28842FFB@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/9.ics =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/9.ics 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/Resource/privateevents/9.ics 2008-01-07 22:17:17 UTC (rev 2093) @@ -24,7 +24,12 @@ DTSTAMP:20051222T205953Z DTSTART;TZID=US/Eastern:20060101T100000 DURATION:PT1H -SUMMARY:event 1 +SUMMARY:event private access UID:54E181BC7CCC373042B28842FFB@ninevah.local +BEGIN:VALARM +ACTION:DISPLAY +DESCRIPTION:Test +TRIGGER;RELATED=START:-PT10M +END:VALARM END:VEVENT END:VCALENDAR Modified: CalDAVTester/branches/users/cdaboo/private_events-2082/scripts/tests/privateevents.xml =================================================================== --- CalDAVTester/branches/users/cdaboo/private_events-2082/scripts/tests/privateevents.xml 2008-01-07 22:14:30 UTC (rev 2092) +++ CalDAVTester/branches/users/cdaboo/private_events-2082/scripts/tests/privateevents.xml 2008-01-07 22:17:17 UTC (rev 2093) @@ -429,6 +429,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -446,6 +450,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -463,6 +471,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -601,6 +613,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -618,6 +634,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -635,6 +655,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -666,6 +690,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -683,6 +711,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PUBLIC</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event public access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -717,6 +749,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PRIVATE</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event private access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -888,6 +924,10 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:PRIVATE</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event private access</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -968,6 +1008,13 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event confidential access 1</value> + <value>LOCATION:confidential 1</value> + <value>ORGANIZER:mailto:user01@example.com</value> + <value>ATTENDEE:mailto:user02@example.com</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -985,7 +1032,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> </arg> + <arg> + <name>notcontains</name> + <value>SUMMARY:</value> + <value>LOCATION:</value> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1002,7 +1059,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> </arg> + <arg> + <name>notcontains</name> + <value>SUMMARY:</value> + <value>LOCATION:</value> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1148,6 +1215,13 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event confidential access 2</value> + <value>LOCATION:confidential 2</value> + <value>ORGANIZER:mailto:user01@example.com</value> + <value>ATTENDEE:mailto:user02@example.com</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -1165,7 +1239,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> </arg> + <arg> + <name>notcontains</name> + <value>SUMMARY:</value> + <value>LOCATION:</value> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1182,7 +1266,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:CONFIDENTIAL</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> </arg> + <arg> + <name>notcontains</name> + <value>SUMMARY:</value> + <value>LOCATION:</value> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1234,6 +1328,13 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:RESTRICTED</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event restricted access 1</value> + <value>LOCATION:restricted 1</value> + <value>ORGANIZER:mailto:user01@example.com</value> + <value>ATTENDEE:mailto:user02@example.com</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -1251,7 +1352,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:RESTRICTED</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event restricted access 1</value> + <value>LOCATION:restricted 1</value> </arg> + <arg> + <name>notcontains</name> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1268,7 +1379,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:RESTRICTED</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event restricted access 1</value> + <value>LOCATION:restricted 1</value> </arg> + <arg> + <name>notcontains</name> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1417,6 +1538,13 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:RESTRICTED</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event restricted access 2</value> + <value>LOCATION:restricted 2</value> + <value>ORGANIZER:mailto:user01@example.com</value> + <value>ATTENDEE:mailto:user02@example.com</value> + <value>BEGIN:VALARM</value> </arg> </verify> </request> @@ -1434,7 +1562,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:RESTRICTED</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event restricted access 2</value> + <value>LOCATION:restricted 2</value> </arg> + <arg> + <name>notcontains</name> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test> @@ -1451,7 +1589,17 @@ <arg> <name>contains</name> <value>X-CALENDARSERVER-ACCESS:RESTRICTED</value> + <value>VERSION:2.0</value> + <value>DTSTART;TZID=US/Eastern:20060101T100000</value> + <value>SUMMARY:event restricted access 2</value> + <value>LOCATION:restricted 2</value> </arg> + <arg> + <name>notcontains</name> + <value>ORGANIZER:</value> + <value>ATTENDEE:</value> + <value>BEGIN:VALARM</value> + </arg> </verify> </request> </test>
participants (1)
-
source_changes＠macosforge.org