[CalendarServer-changes] [4894] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 4 12:37:40 PST 2010
Revision: 4894
http://trac.macosforge.org/projects/calendarserver/changeset/4894
Author: cdaboo at apple.com
Date: 2010-01-04 12:37:37 -0800 (Mon, 04 Jan 2010)
Log Message:
-----------
Tests for sync REPORT support and add-member support.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
CalDAVTester/trunk/scripts/server/serverinfo-template.xml
CalDAVTester/trunk/scripts/server/serverinfo.xml
CalDAVTester/trunk/scripts/server/sslserverinfo.xml
CalDAVTester/trunk/scripts/tests/caldavtest.dtd
CalDAVTester/trunk/src/caldavtest.py
CalDAVTester/trunk/src/request.py
CalDAVTester/trunk/src/xmlDefs.py
Added Paths:
-----------
CalDAVTester/trunk/Resource/add-member/
CalDAVTester/trunk/Resource/add-member/1.xml
CalDAVTester/trunk/Resource/reports/sync/
CalDAVTester/trunk/Resource/reports/sync/1.xml
CalDAVTester/trunk/Resource/reports/sync/2.xml
CalDAVTester/trunk/Resource/reports/sync/3.xml
CalDAVTester/trunk/Resource/reports/sync/4.xml
CalDAVTester/trunk/scripts/tests/add-member.xml
CalDAVTester/trunk/scripts/tests/sync-report.xml
Added: CalDAVTester/trunk/Resource/add-member/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/add-member/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/add-member/1.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:add-member/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/reports/sync/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/sync/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/reports/sync/1.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:supported-report-set/>
+</D:prop>
+</D:propfind>
Added: CalDAVTester/trunk/Resource/reports/sync/2.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/sync/2.xml (rev 0)
+++ CalDAVTester/trunk/Resource/reports/sync/2.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:sync-collection xmlns:D="DAV:">
+<D:sync-token/>
+</D:sync-collection>
Added: CalDAVTester/trunk/Resource/reports/sync/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/sync/3.xml (rev 0)
+++ CalDAVTester/trunk/Resource/reports/sync/3.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:sync-collection xmlns:D="DAV:">
+<D:sync-token>$synctoken1:</D:sync-token>
+</D:sync-collection>
Added: CalDAVTester/trunk/Resource/reports/sync/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/reports/sync/4.xml (rev 0)
+++ CalDAVTester/trunk/Resource/reports/sync/4.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:sync-collection xmlns:D="DAV:">
+<D:sync-token>$synctoken2:</D:sync-token>
+</D:sync-collection>
Modified: CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/scripts/server/serverinfo-partitioning.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -24,6 +24,7 @@
<authtype>basic</authtype>
<features>
+ <feature>add-member</feature> <!-- Add-member used to create resources -->
<feature>auto-accept</feature> <!-- Auto-accept for rooms & locations -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
@@ -38,6 +39,7 @@
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<feature>proxy-authz</feature> <!-- sudo user extension -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>well-known</feature> <!-- well-known feature -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -24,6 +24,7 @@
<authtype>%(authtype)s</authtype>
<features>
+ <feature>add-member</feature> <!-- Add-member used to create resources -->
<feature>auto-accept</feature> <!-- Auto-accept for rooms & locations -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
@@ -38,6 +39,7 @@
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<feature>proxy-authz</feature> <!-- sudo user extension -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>well-known</feature> <!-- well-known feature -->
Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -24,6 +24,7 @@
<authtype>basic</authtype>
<features>
+ <feature>add-member</feature> <!-- Add-member used to create resources -->
<feature>auto-accept</feature> <!-- Auto-accept for rooms & locations -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
@@ -38,6 +39,7 @@
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<feature>proxy-authz</feature> <!-- sudo user extension -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>well-known</feature> <!-- well-known feature -->
Modified: CalDAVTester/trunk/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/scripts/server/sslserverinfo.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -25,6 +25,7 @@
<ssl/>
<features>
+ <feature>add-member</feature> <!-- Add-member used to create resources -->
<feature>auto-accept</feature> <!-- Auto-accept for rooms & locations -->
<feature>ctag</feature> <!-- ctag extension -->
<feature>current-user-principal</feature> <!-- current-user-principal extension -->
@@ -39,6 +40,7 @@
<feature>proxy</feature> <!-- calendar-user-proxy extension -->
<feature>proxy-authz</feature> <!-- sudo user extension -->
<feature>quota</feature> <!-- WebDAV QUOTA -->
+ <feature>sync-report</feature> <!-- WebDAV collection sync REPORT -->
<feature>timezone-service</feature> <!-- Timezone service extension -->
<feature>vavailability</feature> <!-- VAVAILABILITY on inbox -->
<feature>well-known</feature> <!-- well-known feature -->
Added: CalDAVTester/trunk/scripts/tests/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/add-member.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/add-member.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,127 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2008 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 PUT method in CalDAV</description>
+
+ <require-feature>
+ <feature>add-member</feature>
+ </require-feature>
+
+ <start/>
+
+ <test-suite name='DAV:add-member property'>
+ <test name='1'>
+ <description>PROPFIND on calendar</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/add-member/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>okprops</name>
+ <value><![CDATA[DAV:add-member$<href>$calendarpath1:/;add-member</href>]]></value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PROPFIND on calendar home</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/add-member/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindItems</callback>
+ <arg>
+ <name>badprops</name>
+ <value>DAV:add-member</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='POST VEVENT' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>POST non-recurring timed event</description>
+ <request print-response='no'>
+ <method>POST</method>
+ <ruri>$calendarpath1:/;add-member</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/recurrenceput/1.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ <arg>status</arg>
+ <value>201</value>
+ </verify>
+ <verify>
+ <callback>header</callback>
+ <arg>
+ <name>header</name>
+ <value>Location</value>
+ </arg>
+ </verify>
+ <grabheader>
+ <name>Location</name>
+ <variable>$posted:</variable>
+ </grabheader>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <request>
+ <method>GET</method>
+ <ruri>$posted:/</ruri>
+ <verify>
+ <callback>dataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/recurrenceput/1.txt</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <end>
+ <request>
+ <method>DELETEALL</method>
+ <ruri>$calendarpath1:/</ruri>
+ </request>
+ </end>
+
+</caldavtest>
Modified: CalDAVTester/trunk/scripts/tests/caldavtest.dtd
===================================================================
--- CalDAVTester/trunk/scripts/tests/caldavtest.dtd 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/scripts/tests/caldavtest.dtd 2010-01-04 20:37:37 UTC (rev 4894)
@@ -25,7 +25,7 @@
<!ELEMENT start (request*)>
<!ELEMENT end (request*)>
- <!ELEMENT request (method, ruri+, header*, data?, verify*, grabheader*, grabproperty*)>
+ <!ELEMENT request (method, ruri+, header*, data?, verify*, grabheader*, grabproperty*, grabelement*)>
<!ATTLIST request auth (yes|no) "yes"
user CDATA ""
pswd CDATA ""
@@ -53,6 +53,8 @@
<!ELEMENT property (#PCDATA)>
<!ELEMENT variable (#PCDATA)>
+ <!ELEMENT grabelement (name, variable)>
+
<!ELEMENT test-suite (require-feature?, test*)>
<!ATTLIST test-suite name CDATA #REQUIRED
ignore (yes|no) "no">
Added: CalDAVTester/trunk/scripts/tests/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/sync-report.xml (rev 0)
+++ CalDAVTester/trunk/scripts/tests/sync-report.xml 2010-01-04 20:37:37 UTC (rev 4894)
@@ -0,0 +1,360 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
+
+<!--
+ Copyright (c) 2006-2009 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>
+ <require-feature>
+ <feature>sync-report</feature>
+ </require-feature>
+
+ <start>
+ <request end-delete="yes">
+ <method>MKCALENDAR</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/synccalendar/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/reports/put/1.txt</filepath>
+ </data>
+ </request>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/synccalendar/2.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/reports/put/2.txt</filepath>
+ </data>
+ </request>
+ </start>
+
+ <test-suite name='support-report-set' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>Not on calendar-home</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>props</name>
+ <value>DAV:supported-report-set!.*sync-collection.*</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>On calendar</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>propfindValues</callback>
+ <arg>
+ <name>props</name>
+ <value>DAV:supported-report-set$.*sync-collection.*</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='simple reports - empty token' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>initial query</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>new resource</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/synccalendar/3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/reports/put/3.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ <value>3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>remove resource new resource</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/synccalendar/3.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>changed resource</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/synccalendar/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/reports/put/1.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='simple reports - diff token' ignore='no'>
+ <test name='1' ignore='no'>
+ <description>initial query - grab token</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/2.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ <value>2.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='2' ignore='no'>
+ <description>new resource</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/synccalendar/3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/reports/put/3.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>3.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken2:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='3' ignore='no'>
+ <description>remove resource (treated as new)</description>
+ <request>
+ <method>DELETE</method>
+ <ruri>$pathprefix1:/synccalendar/3.ics</ruri>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='4' ignore='no'>
+ <description>remove resource (treated as old)</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/4.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>badhrefs</name>
+ <value>3.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='5' ignore='no'>
+ <description>changed resource</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pathprefix1:/synccalendar/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/reports/put/1.txt</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ <arg>
+ <name>okhrefs</name>
+ <value>1.ics</value>
+ </arg>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ <test name='6' ignore='no'>
+ <description>no change</description>
+ <request print-response='no'>
+ <method>REPORT</method>
+ <ruri>$pathprefix1:/synccalendar/</ruri>
+ <data substitutions='yes'>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/reports/sync/3.xml</filepath>
+ </data>
+ <verify>
+ <callback>multistatusItems</callback>
+ </verify>
+ <grabelement>
+ <name>/{DAV:}multistatus/{DAV:}sync-token</name>
+ <variable>$synctoken1:</variable>
+ </grabelement>
+ </request>
+ </test>
+ </test-suite>
+
+ <end/>
+
+</caldavtest>
Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/src/caldavtest.py 2010-01-04 20:37:37 UTC (rev 4894)
@@ -18,17 +18,17 @@
Class to encapsulate a single caldav test run.
"""
+from cStringIO import StringIO
from src.manager import manager
from src.request import data
from src.request import request
from src.request import stats
from src.testsuite import testsuite
from utilities.xmlutils import ElementsByName
-
from xml.dom.minicompat import NodeList
from xml.dom.minidom import Element
from xml.dom.minidom import Node
-
+from xml.etree.ElementTree import ElementTree
import httplib
import rfc822
import socket
@@ -429,6 +429,16 @@
else:
self.manager.server_info.addextrasubs({variable: propvalue.encode("utf-8")})
+ if req.grabelement:
+ for elementpath, variable in req.grabelement:
+ # grab the property here
+ elementvalue = self.extractElement(elementpath, respdata)
+ if elementvalue == None:
+ result = False
+ resulttxt += "\Element %s was not extracted from response\n" % (elementpath,)
+ else:
+ self.manager.server_info.addextrasubs({variable: elementvalue.encode("utf-8")})
+
return result, resulttxt, response, respdata
def verifyrequest( self, req, uri, response, respdata ):
@@ -527,4 +537,31 @@
if fqname == propertyname:
return value
- return None
\ No newline at end of file
+ return None
+
+
+ def extractElement(self, elementpath, respdata):
+
+ try:
+ tree = ElementTree()
+ tree.parse(StringIO(respdata))
+ except:
+ return None
+
+ # Strip off the top-level item
+ if elementpath[0] == '/':
+ elementpath = elementpath[1:]
+ splits = elementpath.split('/', 1)
+ root = splits[0]
+ if tree.getroot().tag != root:
+ return None
+ elif len(splits) == 1:
+ return tree.getroot().text
+ else:
+ elementpath = splits[1]
+
+ e = tree.find(elementpath)
+ if e is not None:
+ return e.text
+ else:
+ return None
Modified: CalDAVTester/trunk/src/request.py
===================================================================
--- CalDAVTester/trunk/src/request.py 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/src/request.py 2010-01-04 20:37:37 UTC (rev 4894)
@@ -127,7 +127,7 @@
"""
__slots__ = ['manager', 'auth', 'user', 'pswd', 'end_delete', 'print_response',
'method', 'headers', 'ruris', 'ruri', 'data', 'datasubs', 'verifiers',
- 'grabheader', 'grabproperty']
+ 'grabheader', 'grabproperty', 'grabelement']
def __init__( self, manager ):
self.manager = manager
@@ -145,12 +145,13 @@
self.verifiers = []
self.grabheader = []
self.grabproperty = []
+ self.grabelement = []
def __str__(self):
return "Method: %s; uris: %s" % (self.method, self.ruris if len(self.ruris) > 1 else self.ruri,)
def getURI( self, si ):
- return self.ruri
+ return si.extrasubs(self.ruri)
def getHeaders( self, si ):
hdrs = self.headers
@@ -259,6 +260,7 @@
fd.close()
if self.datasubs:
data = str(self.manager.server_info.subs(data))
+ data = self.manager.server_info.extrasubs(data)
return data
def parseXML( self, node ):
@@ -284,9 +286,11 @@
self.verifiers.append(verify(self.manager))
self.verifiers[-1].parseXML( child )
elif child._get_localName() == src.xmlDefs.ELEMENT_GRABHEADER:
- self.parseGrabHeader(child)
+ self.parseGrab(child, self.grabheader)
elif child._get_localName() == src.xmlDefs.ELEMENT_GRABPROPERTY:
- self.parseGrabProperty(child)
+ self.parseGrab(child, self.grabproperty)
+ elif child._get_localName() == src.xmlDefs.ELEMENT_GRABELEMENT:
+ self.parseGrab(child, self.grabelement)
def parseHeader(self, node):
@@ -312,31 +316,18 @@
parseList = staticmethod( parseList )
- def parseGrabHeader(self, node):
+ def parseGrab(self, node, appendto):
- header = None
+ name = None
variable = None
for child in node._get_childNodes():
- if child._get_localName() == src.xmlDefs.ELEMENT_NAME:
- header = child.firstChild.data.encode("utf-8")
+ if child._get_localName() in (src.xmlDefs.ELEMENT_NAME, src.xmlDefs.ELEMENT_PROPERTY):
+ name = child.firstChild.data.encode("utf-8")
elif child._get_localName() == src.xmlDefs.ELEMENT_VARIABLE:
variable = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
- if (header is not None) and (variable is not None):
- self.grabheader.append((header, variable))
-
- def parseGrabProperty(self, node):
-
- property = None
- variable = None
- for child in node._get_childNodes():
- if child._get_localName() == src.xmlDefs.ELEMENT_PROPERTY:
- property = child.firstChild.data.encode("utf-8")
- elif child._get_localName() == src.xmlDefs.ELEMENT_VARIABLE:
- variable = self.manager.server_info.subs(child.firstChild.data.encode("utf-8"))
-
- if (property is not None) and (variable is not None):
- self.grabproperty.append((property, variable))
+ if (name is not None) and (variable is not None):
+ appendto.append((name, variable))
class data( object ):
"""
Modified: CalDAVTester/trunk/src/xmlDefs.py
===================================================================
--- CalDAVTester/trunk/src/xmlDefs.py 2010-01-04 20:31:57 UTC (rev 4893)
+++ CalDAVTester/trunk/src/xmlDefs.py 2010-01-04 20:37:37 UTC (rev 4894)
@@ -32,6 +32,7 @@
ELEMENT_FEATURES = "features"
ELEMENT_FEATURE = "feature"
ELEMENT_FILEPATH = "filepath"
+ELEMENT_GRABELEMENT = "grabelement"
ELEMENT_GRABHEADER = "grabheader"
ELEMENT_GRABPROPERTY = "grabproperty"
ELEMENT_HEADER = "header"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100104/5fdb4849/attachment-0001.html>
More information about the calendarserver-changes
mailing list