[CalendarServer-changes] [9830] CalDAVTester/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Sep 20 16:21:28 PDT 2012


Revision: 9830
          http://trac.calendarserver.org//changeset/9830
Author:   dre at apple.com
Date:     2012-09-20 16:21:28 -0700 (Thu, 20 Sep 2012)
Log Message:
-----------
Tests for X-WR-CALNAME

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
    CalDAVTester/trunk/verifiers/calendarDataMatch.py

Added Paths:
-----------
    CalDAVTester/trunk/Resource/CalDAV/proppatches/10.xml
    CalDAVTester/trunk/Resource/CalDAV/proppatches/11.xml
    CalDAVTester/trunk/Resource/CalDAV/proppatches/12.xml

Added: CalDAVTester/trunk/Resource/CalDAV/proppatches/10.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/proppatches/10.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/proppatches/10.xml	2012-09-20 23:21:28 UTC (rev 9830)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:displayname>LompyWickets</D:displayname>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Added: CalDAVTester/trunk/Resource/CalDAV/proppatches/11.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/proppatches/11.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/proppatches/11.xml	2012-09-20 23:21:28 UTC (rev 9830)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propertyupdate xmlns:D="DAV:">
+<D:set>
+<D:prop>
+<D:displayname>calendar</D:displayname>
+</D:prop>
+</D:set>
+</D:propertyupdate>

Added: CalDAVTester/trunk/Resource/CalDAV/proppatches/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/proppatches/12.xml	                        (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/proppatches/12.xml	2012-09-20 23:21:28 UTC (rev 9830)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:displayname/>
+</D:prop>
+</D:propfind>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2012-09-20 23:20:35 UTC (rev 9829)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2012-09-20 23:21:28 UTC (rev 9830)
@@ -263,6 +263,114 @@
 				</verify>
 			</request>
 		</test>
+        <test name='7'>
+            <require-feature>
+                <feature>directory listing</feature>
+            </require-feature>
+            <description>Update of displayname property</description>
+            <request print-response="no">
+                <method>PROPPATCH</method>
+                <ruri>$calendarpath1:/</ruri>
+                <data>
+                    <content-type>text/xml; charset=utf-8</content-type>
+                    <filepath>Resource/CalDAV/proppatches/10.xml</filepath>
+                </data>
+                <verify>
+                    <callback>propfindItems</callback>
+                    <arg>
+                        <name>okprops</name>
+                        <value>{DAV:}displayname</value>
+                    </arg>
+                </verify>
+            </request>
+            <request print-response="no">
+                <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/CalDAV/proppatches/12.xml</filepath>
+                </data>
+                <verify>
+                    <callback>propfindItems</callback>
+                    <arg>
+                        <name>okprops</name>
+                        <value>{DAV:}displayname$LompyWickets</value>
+                    </arg>
+                </verify>
+            </request>
+            <request print-response="no">
+                <method>GET</method>
+                <ruri>$calendarpath1:/</ruri>
+                <verify>
+                    <callback>statusCode</callback>
+                </verify>
+                <verify>
+                    <callback>dataString</callback>
+                    <arg>
+                        <name>contains</name>
+                        <value>X-WR-CALNAME:LompyWickets</value>
+                    </arg>
+                </verify>
+            </request>
+        </test>
+        <test name='8'>
+            <require-feature>
+                <feature>directory listing</feature>
+            </require-feature>
+            <description>Another update of displayname property</description>
+            <request print-response="no">
+                <method>PROPPATCH</method>
+                <ruri>$calendarpath1:/</ruri>
+                <data>
+                    <content-type>text/xml; charset=utf-8</content-type>
+                    <filepath>Resource/CalDAV/proppatches/11.xml</filepath>
+                </data>
+                <verify>
+                    <callback>propfindItems</callback>
+                    <arg>
+                        <name>okprops</name>
+                        <value>{DAV:}displayname</value>
+                    </arg>
+                </verify>
+            </request>
+            <request print-response="no">
+                <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/CalDAV/proppatches/12.xml</filepath>
+                </data>
+                <verify>
+                    <callback>propfindItems</callback>
+                    <arg>
+                        <name>okprops</name>
+                        <value>{DAV:}displayname$calendar</value>
+                    </arg>
+                </verify>
+            </request>
+            <request print-response="no">
+                <method>GET</method>
+                <ruri>$calendarpath1:/</ruri>
+                <verify>
+                    <callback>statusCode</callback>
+                </verify>
+                <verify>
+                    <callback>dataString</callback>
+                    <arg>
+                        <name>contains</name>
+                        <value>X-WR-CALNAME:calendar</value>
+                    </arg>
+                </verify>
+            </request>
+        </test>
 	</test-suite>
 	
 	<test-suite name='GET on home'>

Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py
===================================================================
--- CalDAVTester/trunk/verifiers/calendarDataMatch.py	2012-09-20 23:20:35 UTC (rev 9829)
+++ CalDAVTester/trunk/verifiers/calendarDataMatch.py	2012-09-20 23:21:28 UTC (rev 9830)
@@ -38,6 +38,7 @@
         filters.append("DTSTAMP")
         filters.append("CREATED")
         filters.append("LAST-MODIFIED")
+        filters.append("X-WR-CALNAME")
 
         # status code must be 200, 201, 207
         if response.status not in (200, 201, 207):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120920/d7b3e8c5/attachment-0001.html>


More information about the calendarserver-changes mailing list