<!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>[15130] CalDAVTester/trunk</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/15130">15130</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-17 11:04:16 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>New RSCALE tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkREADMEtxt">CalDAVTester/trunk/README.txt</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVrscalexml">CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml</a></li>
<li><a href="#CalDAVTestertrunkverifiersfreeBusypy">CalDAVTester/trunk/verifiers/freeBusy.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/bad/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalebad1ics">CalDAVTester/trunk/Resource/CalDAV/rscale/bad/1.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalebad2ics">CalDAVTester/trunk/Resource/CalDAV/rscale/bad/2.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/</li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthday1xml">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthday2ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthday3ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthday4ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthday5ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/5.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthly1xml">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthly2ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthly3ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthly4ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalechinesemonthly5ics">CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/5.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscaleethiopic1xml">CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscaleethiopic2ics">CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/2.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/</li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly1xml">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly2ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly3ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly4ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly5ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/5.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianyearly1xml">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/1.xml</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianyearly2ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/2.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianyearly3ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/3.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianyearly4ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/4.ics</a></li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalegregorianyearly5ics">CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/5.ics</a></li>
<li>CalDAVTester/trunk/Resource/CalDAV/rscale/supported/</li>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscalesupported1xml">CalDAVTester/trunk/Resource/CalDAV/rscale/supported/1.xml</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkResourceCalDAVrscale1ics">CalDAVTester/trunk/Resource/CalDAV/rscale/1.ics</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkREADMEtxt"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/README.txt (15129 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/README.txt 2015-09-17 17:55:04 UTC (rev 15129)
+++ CalDAVTester/trunk/README.txt 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -535,6 +535,10 @@
</span><span class="cx"> A set of iCalendar PERIOD values for FBTYPE=BUSY-UNAVAILABLE
</span><span class="cx"> periods expected in the response.
</span><span class="cx">
</span><ins>+ Argument: 'duration'
+ If present the period values being checked use duration rather then
+ end time.
+
</ins><span class="cx"> Example:
</span><span class="cx">
</span><span class="cx"> <verify>
</span></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscale1ics"></a>
<div class="delfile"><h4>Deleted: CalDAVTester/trunk/Resource/CalDAV/rscale/1.ics (15129 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/1.ics 2015-09-17 17:55:04 UTC (rev 15129)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/1.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//PYVOBJECT//NONSGML Version 1//EN
-BEGIN:VEVENT
-UID:$uid1:
-DTSTART;VALUE=DATE:$now.year.1:0427
-DURATION:P1DT
-DTSTAMP:20051222T205953Z
-SUMMARY:event 1
-RRULE:RSCALE=CHINESE;FREQ=YEARLY
-END:VEVENT
-END:VCALENDAR
</del></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalebad1ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/bad/1.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/bad/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/bad/1.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=FOOBAR;FREQ=YEARLY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalebad2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/bad/2.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/bad/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/bad/2.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:$now.year.1:0427
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=YEARLY;SKIP=FOOBAR
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthday1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/1.xml (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/1.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:time-range start="20160101T000000Z" end="20170101T000000Z"/>
+</C:free-busy-query>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthday2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/2.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/2.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160308
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;BYMONTHDAY=30;SKIP=OMIT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthday3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/3.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/3.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160308
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;BYMONTHDAY=30;SKIP=FORWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthday4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/4.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/4.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160308
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;BYMONTHDAY=30;SKIP=BACKWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthday5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/5.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthday/5.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160308
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;BYMONTHDAY=30
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthly1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/1.xml (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/1.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:time-range start="20160101T000000Z" end="20170101T000000Z"/>
+</C:free-busy-query>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthly2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/2.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/2.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160109
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;SKIP=OMIT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthly3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/3.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/3.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160109
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;SKIP=FORWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthly4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/4.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/4.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160109
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY;SKIP=BACKWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalechinesemonthly5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/5.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/chinese/monthly/5.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160109
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=CHINESE;FREQ=MONTHLY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscaleethiopic1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/1.xml (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/1.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:time-range start="20150101T000000Z" end="20170101T000000Z"/>
+</C:free-busy-query>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscaleethiopic2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/2.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/ethiopic/2.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20140910
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=ETHIOPIC;FREQ=YEARLY;BYMONTH=13;BYMONTHDAY=-1;COUNT=6
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/1.xml (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/1.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:time-range start="20160101T000000Z" end="20170101T000000Z"/>
+</C:free-busy-query>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/2.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/2.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160131
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=MONTHLY;SKIP=OMIT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/3.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/3.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160131
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=MONTHLY;SKIP=FORWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/4.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/4.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160131
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=MONTHLY;SKIP=BACKWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianmonthly5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/5.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/monthly/5.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160131
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=MONTHLY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianyearly1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/1.xml (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/1.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<C:free-busy-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<C:time-range start="20160101T000000Z" end="20200601T000000Z"/>
+</C:free-busy-query>
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianyearly2ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/2.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/2.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160229
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=YEARLY;SKIP=OMIT
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianyearly3ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/3.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/3.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160229
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=YEARLY;SKIP=FORWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianyearly4ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/4.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/4.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160229
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=YEARLY;SKIP=BACKWARD
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalegregorianyearly5ics"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/5.ics (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/gregorian/yearly/5.ics 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:$uid1:
+DTSTART;VALUE=DATE:20160229
+DURATION:P1DT
+DTSTAMP:20051222T205953Z
+SUMMARY:event 1
+RRULE:RSCALE=GREGORIAN;FREQ=YEARLY
+END:VEVENT
+END:VCALENDAR
</ins></span></pre></div>
<a id="CalDAVTestertrunkResourceCalDAVrscalesupported1xml"></a>
<div class="addfile"><h4>Added: CalDAVTester/trunk/Resource/CalDAV/rscale/supported/1.xml (0 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/Resource/CalDAV/rscale/supported/1.xml (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/rscale/supported/1.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+<C:supported-rscale-set/>
+</D:prop>
+</D:propfind>
</ins></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVrscalexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml (15129 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml 2015-09-17 17:55:04 UTC (rev 15129)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -23,24 +23,109 @@
</span><span class="cx">
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>caldav</feature>
</span><ins>+ <feature>rscale</feature>
</ins><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start/>
</span><span class="cx">
</span><del>- <test-suite name='PUT VEVENT'>
</del><ins>+ <test-suite name='PROPFIND supported-rscale-set'>
</ins><span class="cx"> <test name='1'>
</span><del>- <description>PUT event with RSCALE</description>
</del><ins>+ <description>PROPFIND on home resource</description>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$calendarhome1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/supported/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{$CALDAV:}supported-rscale-set/{$CALDAV:}supported-rscale[=GREGORIAN]</value>
+ <value>$verify-property-prefix:/{$CALDAV:}supported-rscale-set/{$CALDAV:}supported-rscale[=CHINESE]</value>
+ </arg>
+ </verify>
+ </request>
+ <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/CalDAV/rscale/supported/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{$CALDAV:}supported-rscale-set/{$CALDAV:}supported-rscale[=GREGORIAN]</value>
+ <value>$verify-property-prefix:/{$CALDAV:}supported-rscale-set/{$CALDAV:}supported-rscale[=CHINESE]</value>
+ </arg>
+ </verify>
+ </request>
+ <request>
+ <method>PROPFIND</method>
+ <ruri>$inboxpath1:/</ruri>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/supported/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>xmlElementMatch</callback>
+ <arg>
+ <name>exists</name>
+ <value>$verify-property-prefix:/{$CALDAV:}supported-rscale-set/{$CALDAV:}supported-rscale[=GREGORIAN]</value>
+ <value>$verify-property-prefix:/{$CALDAV:}supported-rscale-set/{$CALDAV:}supported-rscale[=CHINESE]</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Bad data'>
+ <test name='1'>
+ <description>PUT event with invalid RSCALE value</description>
</ins><span class="cx"> <request end-delete='yes'>
</span><span class="cx"> <method>PUT</method>
</span><span class="cx"> <ruri>$calendarpath1:/1.ics</ruri>
</span><span class="cx"> <data>
</span><span class="cx"> <content-type>text/calendar; charset=utf-8</content-type>
</span><del>- <filepath>Resource/CalDAV/rscale/1.ics</filepath>
</del><ins>+ <filepath>Resource/CalDAV/rscale/bad/1.ics</filepath>
</ins><span class="cx"> </data>
</span><span class="cx"> <verify>
</span><span class="cx"> <callback>prepostcondition</callback>
</span><span class="cx"> <arg>
</span><span class="cx"> <name>error</name>
</span><ins>+ <value>{urn:ietf:params:xml:ns:caldav}supported-rscale</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT event with invalid SKIP value</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/bad/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>prepostcondition</callback>
+ <arg>
+ <name>error</name>
</ins><span class="cx"> <value>{urn:ietf:params:xml:ns:caldav}valid-calendar-data</value>
</span><span class="cx"> </arg>
</span><span class="cx"> </verify>
</span><span class="lines">@@ -48,6 +133,676 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><ins>+ <test-suite name='Gregorian Monthly Skip'>
+ <test name='1'>
+ <description>PUT event Gregorian;Monthly;SKIP=OMIT</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160131T000000Z/P1D</value>
+ <value>20160331T000000Z/P1D</value>
+ <value>20160531T000000Z/P1D</value>
+ <value>20160731T000000Z/P1D</value>
+ <value>20160831T000000Z/P1D</value>
+ <value>20161031T000000Z/P1D</value>
+ <value>20161231T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT event Gregorian;Monthly;SKIP=FORWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160131T000000Z/P1D</value>
+ <value>20160301T000000Z/P1D</value>
+ <value>20160331T000000Z/P1D</value>
+ <value>20160501T000000Z/P1D</value>
+ <value>20160531T000000Z/P1D</value>
+ <value>20160701T000000Z/P1D</value>
+ <value>20160731T000000Z/P1D</value>
+ <value>20160831T000000Z/P1D</value>
+ <value>20161001T000000Z/P1D</value>
+ <value>20161031T000000Z/P1D</value>
+ <value>20161201T000000Z/P1D</value>
+ <value>20161231T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PUT event Gregorian;Monthly;SKIP=BACKWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160131T000000Z/P1D</value>
+ <value>20160229T000000Z/P1D</value>
+ <value>20160331T000000Z/P1D</value>
+ <value>20160430T000000Z/P1D</value>
+ <value>20160531T000000Z/P1D</value>
+ <value>20160630T000000Z/P1D</value>
+ <value>20160731T000000Z/P1D</value>
+ <value>20160831T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161031T000000Z/P1D</value>
+ <value>20161130T000000Z/P1D</value>
+ <value>20161231T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PUT event Gregorian;Monthly;SKIP default</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160131T000000Z/P1D</value>
+ <value>20160331T000000Z/P1D</value>
+ <value>20160531T000000Z/P1D</value>
+ <value>20160731T000000Z/P1D</value>
+ <value>20160831T000000Z/P1D</value>
+ <value>20161031T000000Z/P1D</value>
+ <value>20161231T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Gregorian Yearly Skip'>
+ <test name='1'>
+ <description>PUT event Gregorian;Yearly;SKIP=OMIT</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160229T000000Z/P1D</value>
+ <value>20200229T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT event Gregorian;Yearly;SKIP=FORWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160229T000000Z/P1D</value>
+ <value>20170301T000000Z/P1D</value>
+ <value>20180301T000000Z/P1D</value>
+ <value>20190301T000000Z/P1D</value>
+ <value>20200229T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PUT event Gregorian;Yearly;SKIP=BACKWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160229T000000Z/P1D</value>
+ <value>20170228T000000Z/P1D</value>
+ <value>20180228T000000Z/P1D</value>
+ <value>20190228T000000Z/P1D</value>
+ <value>20200229T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PUT event Gregorian;Yearly;SKIP default</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/gregorian/yearly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160229T000000Z/P1D</value>
+ <value>20200229T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Chinese Monthly Skip'>
+ <test name='1'>
+ <description>PUT event Chinese;Monthly;SKIP=OMIT</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160109T000000Z/P1D</value>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT event Chinese;Monthly;SKIP=FORWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160109T000000Z/P1D</value>
+ <value>20160208T000000Z/P1D</value>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160407T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160605T000000Z/P1D</value>
+ <value>20160704T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160901T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161129T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PUT event Chinese;Monthly;SKIP=BACKWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160109T000000Z/P1D</value>
+ <value>20160207T000000Z/P1D</value>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160406T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160604T000000Z/P1D</value>
+ <value>20160703T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160831T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161128T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PUT event Chinese;Monthly;SKIP default</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthly/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160109T000000Z/P1D</value>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Chinese MonthDay Skip'>
+ <test name='1'>
+ <description>PUT event Chinese;MonthDay;SKIP=OMIT</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>PUT event Chinese;MonthDay;SKIP=FORWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/3.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160407T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160605T000000Z/P1D</value>
+ <value>20160704T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160901T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161129T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>PUT event Chinese;MonthDay;SKIP=BACKWARD</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160406T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160604T000000Z/P1D</value>
+ <value>20160703T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160831T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161128T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='4'>
+ <description>PUT event Chinese;MonthDay;SKIP default</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/5.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/chinese/monthday/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20160308T000000Z/P1D</value>
+ <value>20160506T000000Z/P1D</value>
+ <value>20160802T000000Z/P1D</value>
+ <value>20160930T000000Z/P1D</value>
+ <value>20161030T000000Z/P1D</value>
+ <value>20161228T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
+ <test-suite name='Ethiopic, Last Day Of Year'>
+ <test name='1'>
+ <description>PUT event Ethipoic;Yearly;Month=13</description>
+ <request end-delete='yes'>
+ <method>PUT</method>
+ <ruri>$calendarpath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/ethiopic/2.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ <request>
+ <method>REPORT</method>
+ <ruri>$calendarpath1:/</ruri>
+ <data>
+ <content-type>text/xml; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/rscale/ethiopic/1.xml</filepath>
+ </data>
+ <verify>
+ <callback>freeBusy</callback>
+ <arg>
+ <name>duration</name>
+ </arg>
+ <arg>
+ <name>busy</name>
+ <value>20150911T000000Z/P1D</value>
+ <value>20160910T000000Z/P1D</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ </test-suite>
+
</ins><span class="cx"> <end/>
</span><span class="cx">
</span><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersfreeBusypy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/freeBusy.py (15129 => 15130)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/freeBusy.py 2015-09-17 17:55:04 UTC (rev 15129)
+++ CalDAVTester/trunk/verifiers/freeBusy.py 2015-09-17 18:04:16 UTC (rev 15130)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> busy = args.get("busy", [])
</span><span class="cx"> tentative = args.get("tentative", [])
</span><span class="cx"> unavailable = args.get("unavailable", [])
</span><ins>+ duration = args.get("duration") is not None
</ins><span class="cx">
</span><span class="cx"> # Parse data as calendar object
</span><span class="cx"> try:
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> periods = fp.getValue().getValues()
</span><span class="cx"> # Convert start/duration to start/end
</span><span class="cx"> for i in range(len(periods)):
</span><del>- periods[i].getValue().setUseDuration(False)
</del><ins>+ periods[i].getValue().setUseDuration(duration)
</ins><span class="cx"> # Check param
</span><span class="cx"> fbtype = "BUSY"
</span><span class="cx"> if fp.hasParameter("FBTYPE"):
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> # Compare all periods
</span><span class="cx"> if len(busyp.symmetric_difference(busy)):
</span><del>- raise ValueError("Busy periods do not match")
</del><ins>+ raise ValueError("Busy periods do not match: {}".format(busyp.symmetric_difference(busy)))
</ins><span class="cx"> elif len(tentativep.symmetric_difference(tentative)):
</span><span class="cx"> raise ValueError("Busy-tentative periods do not match")
</span><span class="cx"> elif len(unavailablep.symmetric_difference(unavailable)):
</span></span></pre>
</div>
</div>
</body>
</html>