[CalendarServer-changes] [11138] CalDAVTester/trunk/scripts/tests
source_changes at macosforge.org
source_changes at macosforge.org
Mon May 6 10:31:11 PDT 2013
Revision: 11138
http://trac.calendarserver.org//changeset/11138
Author: cdaboo at apple.com
Date: 2013-05-06 10:31:11 -0700 (Mon, 06 May 2013)
Log Message:
-----------
Tweaks for scheduling-in-the-store.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml
CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml
CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml
CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml
CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -418,6 +418,9 @@
<arg>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}getetag</value>
+ </arg>
+ <arg>
+ <name>notexists</name>
<value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
</arg>
</verify>
@@ -429,10 +432,6 @@
<name>$verify-property-prefix:/{DAV:}getetag</name>
<variable>$etag:</variable>
</grabelement>
- <grabelement>
- <name>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</name>
- <variable>$data:</variable>
- </grabelement>
</request>
</test>
<test name='2' ignore='no'>
@@ -456,27 +455,6 @@
</verify>
</request>
</test>
- <test name='3' ignore='no'>
- <description>Check valid data against returned data</description>
- <request>
- <method>GET</method>
- <ruri>$href:</ruri>
- <verify>
- <callback>calendarDataMatch</callback>
- <arg>
- <name>data</name>
- <value>$data:</value>
- </arg>
- </verify>
- <verify>
- <callback>header</callback>
- <arg>
- <name>ETag</name>
- <value>$etag:</value>
- </arg>
- </verify>
- </request>
- </test>
<test name='-1' ignore='no'>
<description>Clean up</description>
<request>
@@ -560,7 +538,6 @@
<arg>
<name>exists</name>
<value>$verify-property-prefix:/{DAV:}getetag</value>
- <value>$verify-property-prefix:/{urn:ietf:params:xml:ns:caldav}calendar-data</value>
</arg>
</verify>
<grabheader>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -727,7 +727,7 @@
</verify>
</request>
</test>
- <test name='9'>
+ <test name='9' ignore="yes">
<description>COPY from calendar with different uid onto existing resource</description>
<request print-response='no'>
<method>COPY</method>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -56,7 +56,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp$<transparent xmlns="urn:ietf:params:xml:ns:caldav"/>]]></value>
+ <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp$<opaque xmlns="urn:ietf:params:xml:ns:caldav"/>]]></value>
</arg>
</verify>
</request>
@@ -156,7 +156,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp$<transparent xmlns="urn:ietf:params:xml:ns:caldav"/>]]></value>
+ <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp$<opaque xmlns="urn:ietf:params:xml:ns:caldav"/>]]></value>
</arg>
</verify>
</request>
@@ -177,7 +177,7 @@
<verify>
<callback>dataString</callback>
<arg>
- <name>notcontains</name>
+ <name>contains</name>
<value>$calendarhome1:/testcalendar2/</value>
</arg>
</verify>
@@ -190,7 +190,7 @@
<ruri>$calendarhome1:/testcalendar2/</ruri>
<data>
<content-type>text/xml; charset=utf-8</content-type>
- <filepath>Resource/CalDAV/implicit/calendartransp/2.xml</filepath>
+ <filepath>Resource/CalDAV/implicit/calendartransp/4.xml</filepath>
</data>
<verify>
<callback>propfindItems</callback>
@@ -218,7 +218,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp$<opaque xmlns="urn:ietf:params:xml:ns:caldav"/>]]></value>
+ <value><![CDATA[{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp$<transparent xmlns="urn:ietf:params:xml:ns:caldav"/>]]></value>
</arg>
</verify>
</request>
@@ -239,7 +239,7 @@
<verify>
<callback>dataString</callback>
<arg>
- <name>contains</name>
+ <name>notcontains</name>
<value>$calendarhome1:/testcalendar2</value>
</arg>
</verify>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitfreebusy.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -47,7 +47,7 @@
</request>
</start>
- <test-suite name='Cancel an instance' ignore='no'>
+ <test-suite name='Organizer invites Attendee and checks free busy' ignore='no'>
<test name='1'>
<description>Organizer invites Attendee</description>
<request print-response='no'>
@@ -354,7 +354,7 @@
</test>
</test-suite>
- <test-suite name='Cancel an instance - auto-accept' ignore='no'>
+ <test-suite name='Organizer invites auto-accept Attendee and checks free busy' ignore='no'>
<test name='1'>
<description>Organizer invites Resource</description>
<request print-response='no'>
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -289,7 +289,7 @@
</verify>
</request>
</test>
- <test name="Set ACLs">
+ <test name="Set ACLs" ignore="yes">
<request user="$userid2:" pswd="$pswd2:" print-response="no">
<method>ACL</method>
<ruri>$calendarpath2:/</ruri>
@@ -315,7 +315,7 @@
</test>
</test-suite>
- <test-suite name='Writer as organizer - no scheduling' ignore='no'>
+ <test-suite name='Writer as organizer - no scheduling' ignore='yes'>
<test name='1' ignore='no'>
<description>Writer can read existing event</description>
<request print-response="no">
@@ -372,7 +372,7 @@
</test>
</test-suite>
- <test-suite name='Writer as attendee - no scheduling' ignore='no'>
+ <test-suite name='Writer as attendee - no scheduling' ignore='yes'>
<test name='1' ignore='no'>
<description>Writer can read existing item</description>
<request print-response="no">
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -72,7 +72,7 @@
<callback>propfindItems</callback>
<arg>
<name>okprops</name>
- <value><![CDATA[{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set$<href xmlns="DAV:">$calendarpath1:</href>]]></value>
+ <value><![CDATA[{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set$<href xmlns="DAV:">$calendarpath1:/</href>]]></value>
</arg>
</verify>
</request>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -1,6 +1,6 @@
<?xml version="1.0" standalone="no"?>
-<!DOCTYPE CardDAVtest SYSTEM "CardDAVtest.dtd">
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
<!--
Copyright (c) 2006-2013 Apple Inc. All rights reserved.
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml 2013-05-06 17:01:04 UTC (rev 11137)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml 2013-05-06 17:31:11 UTC (rev 11138)
@@ -77,7 +77,7 @@
</request>
</start>
- <test-suite name='COPY'>
+ <test-suite name='COPY' ignore="yes">
<test name='1'>
<description>COPY within same addressbook with different name</description>
<request end-delete="no" print-response="no">
@@ -140,7 +140,10 @@
</verify>
</request>
</test>
- <test name='4'>
+ </test-suite>
+
+ <test-suite name="MOVE">
+ <test name='1'>
<description>MOVE within same addressbook to new resource</description>
<request print-response="no">
<method>MOVE</method>
@@ -158,7 +161,7 @@
</verify>
</request>
</test>
- <test name='5'>
+ <test name='2'>
<description>MOVE within same addressbook to existing resource with overwrite</description>
<request print-response="no">
<method>MOVE</method>
@@ -180,7 +183,7 @@
</verify>
</request>
</test>
- <test name='6'>
+ <test name='3'>
<description>MOVE within same addressbook to existing resource without overwrite</description>
<request print-response="no">
<method>MOVE</method>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130506/9d9d2783/attachment-0001.html>
More information about the calendarserver-changes
mailing list