<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15159] CalDAVTester/trunk/scripts/tests/CalDAV/server-info.xml</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15159">15159</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-30 01:41:09 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to latest draft.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVserverinfoxml">CalDAVTester/trunk/scripts/tests/CalDAV/server-info.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCalDAVserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/server-info.xml (15158 => 15159)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/server-info.xml        2015-09-29 11:46:02 UTC (rev 15158)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/server-info.xml        2015-09-30 08:41:09 UTC (rev 15159)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">                                         <callback>header</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>header</name>
</span><del>-                                                <value>server-info-token</value>
</del><ins>+                                                <value>server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">                                         <callback>header</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>header</name>
</span><del>-                                                <value>server-info-token</value>
</del><ins>+                                                <value>server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">                                         <callback>header</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>header</name>
</span><del>-                                                <value>server-info-token</value>
</del><ins>+                                                <value>server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -80,122 +80,157 @@
</span><span class="cx">                                         <callback>header</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>header</name>
</span><del>-                                                <value>server-info-token</value>
</del><ins>+                                                <value>server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><ins>+                <test name='5'>
+                        <description>OPTIONS on root resource with header</description>
+                        <request>
+                                <method>OPTIONS</method>
+                                <ruri>$root:</ruri>
+                                <header>
+                                        <name>server-info-token</name>
+                                        <value>*</value>
+                                </header>
+                                <verify>
+                                        <callback>header</callback>
+                                        <arg>
+                                                <name>header</name>
+                                                <value>server-info-url</value>
+                                        </arg>
+                                </verify>
+                                <grabheader>
+                                        <name>server-info-url</name>
+                                        <variable>$serverinfo_href:</variable>
+                                </grabheader>
+                        </request>
+                </test>
</ins><span class="cx">         </test-suite>
</span><span class="cx">
</span><del>-        <test-suite name='PROPFINDs'>
</del><ins>+        <test-suite name='GET'>
</ins><span class="cx">                 <test name='1'>
</span><del>-                        <description>PROPFIND on principal collection resourc</description>
</del><ins>+                        <description>GET on resource</description>
</ins><span class="cx">                         <request>
</span><del>-                                <method>PROPFIND</method>
-                                <ruri>$principalcollection:</ruri>
-                                <header>
-                                        <name>Depth</name>
-                                        <value>0</value>
-                                </header>
-                                <data>
-                                        <content-type>application/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CalDAV/serverinfo/1.xml</filepath>
-                                </data>
</del><ins>+                                <method>GET</method>
+                                <ruri>$serverinfo_href:</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>xmlElementMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>$verify-property-prefix:/{DAV:}server-info-href</value>
</del><ins>+                                                <value>/{DAV:}server-info/{DAV:}token</value>
+                                                <value>/{DAV:}server-info/{DAV:}features</value>
+                                                <value>/{DAV:}server-info/{DAV:}features/{DAV:}class-1</value>
+                                                <value>/{DAV:}server-info/{DAV:}applications/{DAV:}application/{DAV:}name[=caldav]</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><ins>+                                <grabelement>
+                                        <name>/{DAV:}server-info/{DAV:}token</name>
+                                        <variable>$server-info-token:</variable>
+                                </grabelement>
</ins><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><ins>+        </test-suite>
+
+        <test-suite name='Conditional OPTIONS'>
+                <test name='1'>
+                        <description>OPTIONS on root resource with correct header</description>
+                        <request>
+                                <method>OPTIONS</method>
+                                <ruri>$root:</ruri>
+                                <header>
+                                        <name>Server-Info-Token</name>
+                                        <value>$server-info-token:</value>
+                                </header>
+                                <verify>
+                                        <callback>header</callback>
+                                        <arg>
+                                                <name>header</name>
+                                                <value>!server-info-url</value>
+                                        </arg>
+                                </verify>
+                        </request>
+                </test>
</ins><span class="cx">                 <test name='2'>
</span><del>-                        <description>PROPFIND on principal resource</description>
</del><ins>+                        <description>OPTIONS on root resource with incorrect header</description>
</ins><span class="cx">                         <request>
</span><del>-                                <method>PROPFIND</method>
-                                <ruri>$principal1:</ruri>
</del><ins>+                                <method>OPTIONS</method>
+                                <ruri>$root:</ruri>
</ins><span class="cx">                                 <header>
</span><del>-                                        <name>Depth</name>
-                                        <value>0</value>
</del><ins>+                                        <name>Server-Info-Token</name>
+                                        <value>foobar</value>
</ins><span class="cx">                                 </header>
</span><del>-                                <data>
-                                        <content-type>application/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CalDAV/serverinfo/1.xml</filepath>
-                                </data>
</del><span class="cx">                                 <verify>
</span><del>-                                        <callback>xmlElementMatch</callback>
</del><ins>+                                        <callback>header</callback>
</ins><span class="cx">                                         <arg>
</span><del>-                                                <name>exists</name>
-                                                <value>$verify-property-prefix:/{DAV:}server-info-href</value>
</del><ins>+                                                <name>header</name>
+                                                <value>server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='3'>
-                        <description>PROPFIND on home resource</description>
</del><ins>+        </test-suite>
+
+        <test-suite name='Conditional REPORT'>
+                <test name='1'>
+                        <description>Calendar home sync with correct header</description>
</ins><span class="cx">                         <request>
</span><del>-                                <method>PROPFIND</method>
</del><ins>+                                <method>REPORT</method>
</ins><span class="cx">                                 <ruri>$calendarhome1:/</ruri>
</span><span class="cx">                                 <header>
</span><del>-                                        <name>Depth</name>
-                                        <value>0</value>
</del><ins>+                                        <name>Server-Info-Token</name>
+                                        <value>$server-info-token:</value>
</ins><span class="cx">                                 </header>
</span><span class="cx">                                 <data>
</span><del>-                                        <content-type>application/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CalDAV/serverinfo/1.xml</filepath>
</del><ins>+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><del>-                                        <callback>xmlElementMatch</callback>
</del><ins>+                                        <callback>header</callback>
</ins><span class="cx">                                         <arg>
</span><del>-                                                <name>exists</name>
-                                                <value>$verify-property-prefix:/{DAV:}server-info-href</value>
</del><ins>+                                                <name>header</name>
+                                                <value>!server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><del>-                                <grabelement>
-                                        <name>$verify-property-prefix:/{DAV:}server-info-href/{DAV:}href</name>
-                                        <variable>$serverinfo_href:</variable>
-                                </grabelement>
</del><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='4' ignore='yes'>
-                        <description>PROPFIND on root resource</description>
</del><ins>+                <test name='2'>
+                        <description>Calendar home sync with incorrect header</description>
</ins><span class="cx">                         <request>
</span><del>-                                <method>PROPFIND</method>
-                                <ruri>$root:</ruri>
</del><ins>+                                <method>REPORT</method>
+                                <ruri>$calendarhome1:/</ruri>
</ins><span class="cx">                                 <header>
</span><del>-                                        <name>Depth</name>
-                                        <value>0</value>
</del><ins>+                                        <name>Server-Info-Token</name>
+                                        <value>foobar</value>
</ins><span class="cx">                                 </header>
</span><span class="cx">                                 <data>
</span><del>-                                        <content-type>application/xml; charset=utf-8</content-type>
-                                        <filepath>Resource/CalDAV/serverinfo/1.xml</filepath>
</del><ins>+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
</ins><span class="cx">                                 </data>
</span><span class="cx">                                 <verify>
</span><del>-                                        <callback>xmlElementMatch</callback>
</del><ins>+                                        <callback>header</callback>
</ins><span class="cx">                                         <arg>
</span><del>-                                                <name>notexists</name>
-                                                <value>$verify-property-prefix:/{DAV:}server-info-href</value>
</del><ins>+                                                <name>header</name>
+                                                <value>server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-        </test-suite>
-
-        <test-suite name='GET'>
-                <test name='1'>
-                        <description>GET on resource</description>
</del><ins>+                <test name='3'>
+                        <description>Calendar home sync with no header</description>
</ins><span class="cx">                         <request>
</span><del>-                                <method>GET</method>
-                                <ruri>$serverinfo_href:</ruri>
</del><ins>+                                <method>REPORT</method>
+                                <ruri>$calendarhome1:/</ruri>
+                                <data>
+                                        <content-type>text/xml; charset=utf-8</content-type>
+                                        <filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
+                                </data>
</ins><span class="cx">                                 <verify>
</span><del>-                                        <callback>xmlElementMatch</callback>
</del><ins>+                                        <callback>header</callback>
</ins><span class="cx">                                         <arg>
</span><del>-                                                <name>exists</name>
-                                                <value>/{DAV:}server-info/{DAV:}token</value>
-                                                <value>/{DAV:}server-info/{DAV:}features</value>
-                                                <value>/{DAV:}server-info/{DAV:}features/{DAV:}class-1</value>
-                                                <value>/{DAV:}server-info/{DAV:}applications/{DAV:}application/{DAV:}name[=caldav]</value>
</del><ins>+                                                <name>header</name>
+                                                <value>!server-info-url</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span></span></pre>
</div>
</div>
</body>
</html>