[CalendarServer-changes] [14362] CalDAVTester/trunk

[source_changes at macosforge.org]

Revision: 14362
          http://trac.calendarserver.org//changeset/14362
Author:   cdaboo at apple.com
Date:     2015-02-02 13:07:30 -0800 (Mon, 02 Feb 2015)
Log Message:
-----------
Fix some tests.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/freebusy-url/
    CalDAVTester/trunk/Resource/CalDAV/freebusy-url/1.ics
    CalDAVTester/trunk/Resource/CalDAV/freebusy-url/2.ics

Added: CalDAVTester/trunk/Resource/CalDAV/freebusy-url/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/freebusy-url/1.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/freebusy-url/1.ics	2015-02-02 21:07:30 UTC (rev 14362)
@@ -0,0 +1,31 @@
+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:20051228T232517Z
+DTSTART;TZID=US/Eastern:$now.1:T090000
+DURATION:PT1H
+LOCATION:Durham
+SUMMARY:Meeting 1
+UID:$uid1:
+END:VEVENT
+END:VCALENDAR

Added: CalDAVTester/trunk/Resource/CalDAV/freebusy-url/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/freebusy-url/2.ics	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/freebusy-url/2.ics	2015-02-02 21:07:30 UTC (rev 14362)
@@ -0,0 +1,13 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20051228T232517Z
+DTSTART;VALUE=DATE:$now.1:
+DURATION:P1D
+LOCATION:Durham
+SUMMARY:Meeting 1
+UID:$uid2:
+END:VEVENT
+END:VCALENDAR

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml	2015-02-02 20:47:39 UTC (rev 14361)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/freebusy-url.xml	2015-02-02 21:07:30 UTC (rev 14362)
@@ -47,7 +47,7 @@
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/freebusy/1.ics</filepath>
+					<filepath>Resource/CalDAV/freebusy-url/1.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -61,7 +61,7 @@
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
-					<filepath>Resource/CalDAV/freebusy/2.ics</filepath>
+					<filepath>Resource/CalDAV/freebusy-url/2.ics</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
@@ -77,7 +77,7 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>$now.0:T000000Z/$now.1:T000000Z</value>
+						<value>$now.1:T000000Z/$now.2:T000000Z</value>
 					</arg>
 				</verify>
 			</request>
@@ -91,7 +91,7 @@
 					<callback>freeBusy</callback>
 					<arg>
 						<name>busy</name>
-						<value>$now.0:T000000Z/$now.1:T000000Z</value>
+						<value>$now.1:T000000Z/$now.2:T000000Z</value>
 					</arg>
 				</verify>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml	2015-02-02 20:47:39 UTC (rev 14361)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitgroup.xml	2015-02-02 21:07:30 UTC (rev 14362)
@@ -561,7 +561,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Recurring invite two members group, then remove member to split' only='yes'>
+	<test-suite name='Recurring invite two members group, then remove member to split'>
 		<test name='1'>
 			<description>Add group members</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150202/e77d6f18/attachment.html>