<!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>[12186] CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.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/12186">12186</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-12-21 14:48:59 -0800 (Sat, 21 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint: cross-pod direct sharing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVsharingdirectxml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestspodCalDAVsharingdirectxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml (12185 => 12186)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml 2013-12-21 22:48:15 UTC (rev 12185)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml 2013-12-21 22:48:59 UTC (rev 12186)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx"> </request>
</span><span class="cx"> </start>
</span><span class="cx">
</span><del>- <test-suite name='Read-write calendar' ignore='no'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='Read-write calendar'>
+ <test name='1'>
</ins><span class="cx"> <description>Add puser02 as read write for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> </test>
</span><span class="cx"> <test name='3'>
</span><span class="cx"> <description>Shared calendar exists</description>
</span><del>- <pause/>
</del><span class="cx"> <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
</span><span class="cx"> <method>PROPFIND</method>
</span><span class="cx"> <ruri>$sharedcalendar:/</ruri>
</span><span class="lines">@@ -303,10 +302,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Change to read-only calendar' ignore='yes'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='Change to read-only calendar'>
+ <test name='1'>
</ins><span class="cx"> <description>Clear user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -322,14 +321,14 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>Add user02 as read-only for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/sharing/direct/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -438,10 +437,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Removal of direct share' ignore='yes'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='Removal of direct share'>
+ <test name='1'>
</ins><span class="cx"> <description>Remove direct share</description>
</span><del>- <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
</del><ins>+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$sharedcalendar:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -495,10 +494,10 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Direct share not allowed' ignore='yes'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='Direct share not allowed'>
+ <test name='1'>
</ins><span class="cx"> <description>Clear user02 as read-only proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-read/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -530,15 +529,15 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Using non __uids__ path' ignore='yes'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='Using non __uids__ path'>
+ <test name='1'>
</ins><span class="cx"> <description>Add user02 as read write for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/sharing/direct/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -624,9 +623,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>Remove direct share</description>
</span><del>- <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
</del><ins>+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$sharedcalendar2:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -634,9 +633,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='7' ignore='no'>
</del><ins>+ <test name='7'>
</ins><span class="cx"> <description>Clear user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -654,15 +653,15 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <test-suite name='Calendar color' ignore='yes'>
- <test name='1' ignore='no'>
</del><ins>+ <test-suite name='Calendar color'>
+ <test name='1'>
</ins><span class="cx"> <description>Add user02 as read write for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/xml; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/calendaruserproxy/3.xml</filepath>
</del><ins>+ <filepath>Resource/CalDAV-pod/sharing/direct/1.xml</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>propfindItems</callback>
</span><span class="lines">@@ -673,9 +672,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='2' ignore='no'>
</del><ins>+ <test name='2'>
</ins><span class="cx"> <description>Change the color</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$calendarhomealt1:/shared/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -727,9 +726,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='5' ignore='no'>
</del><ins>+ <test name='5'>
</ins><span class="cx"> <description>Remove direct share</description>
</span><del>- <request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
</del><ins>+ <request host2="yes" user="$puserid2:" pswd="$ppswd2:">
</ins><span class="cx"> <method>DELETE</method>
</span><span class="cx"> <ruri>$sharedcalendar2:/</ruri>
</span><span class="cx"> <verify>
</span><span class="lines">@@ -737,9 +736,9 @@
</span><span class="cx"> </verify>
</span><span class="cx"> </request>
</span><span class="cx"> </test>
</span><del>- <test name='6' ignore='no'>
</del><ins>+ <test name='6'>
</ins><span class="cx"> <description>Clear user02 as read-write proxy for user01</description>
</span><del>- <request print-response="no">
</del><ins>+ <request>
</ins><span class="cx"> <method>PROPPATCH</method>
</span><span class="cx"> <ruri>$principal1:calendar-proxy-write/</ruri>
</span><span class="cx"> <data>
</span><span class="lines">@@ -757,6 +756,15 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <end/>
</del><ins>+ <end>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$pnotificationpath2:/</ruri>
+ </request>
+ </end>
</ins><span class="cx">
</span><span class="cx"> </caldavtest>
</span></span></pre>
</div>
</div>
</body>
</html>