From bd22de220dde617411859aa6fa5e93891e62f4bf Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Tue, 13 Feb 2007 14:53:10 +1300
Subject: [PATCH] Apply fixed times to the period of freebusy data requested in
 order to get reliable and repeatable results.

---
 .../regression-suite/832-freebusy.result      |  6 +--
 .../tests/regression-suite/832-freebusy.test  |  2 +-
 .../regression-suite/833-freebusy.result      |  6 +--
 .../tests/regression-suite/833-freebusy.test  |  2 +-
 .../834-Spec-FREEBUSY-1.result                | 39 +++++++++++++++++--
 .../regression-suite/834-Spec-FREEBUSY-1.test |  4 +-
 .../regression-suite/835-freebusy.result      |  6 +--
 .../tests/regression-suite/835-freebusy.test  |  2 +-
 8 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/testing/tests/regression-suite/832-freebusy.result b/testing/tests/regression-suite/832-freebusy.result
index 7a3130be..b1a6fa36 100644
--- a/testing/tests/regression-suite/832-freebusy.result
+++ b/testing/tests/regression-suite/832-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 1895
+Content-Length: 1892
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -11,6 +11,7 @@ DTSTAMP:yyyymmddThhmmssZ
 DTSTART:yyyymmddThhmmss
 DTEND:yyyymmddThhmmss
 FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/PT2H
+FREEBUSY:20061031T210000/PT1H
 FREEBUSY:20061102T210000/PT1H
 FREEBUSY:20061109T210000/PT1H
 FREEBUSY:20061116T210000/PT1H
@@ -36,6 +37,7 @@ FREEBUSY:20070329T210000/PT1H
 FREEBUSY:20070405T210000/PT1H
 FREEBUSY:20070412T210000/PT1H
 FREEBUSY:20070419T210000/PT1H
+FREEBUSY:20061101T233000/PT1H
 FREEBUSY:20061202T183000/PT2H
 FREEBUSY:20070102T183000/PT2H
 FREEBUSY:20070202T183000/PT2H
@@ -43,7 +45,6 @@ FREEBUSY:20070302T183000/PT2H
 FREEBUSY:20070402T183000/PT2H
 FREEBUSY:20070502T183000/PT2H
 FREEBUSY:20070602T183000/PT2H
-FREEBUSY:20070702T183000/PT2H
 FREEBUSY:20061117T030000/PT1H45M
 FREEBUSY:20061201T030000/PT1H45M
 FREEBUSY:20061215T030000/PT1H45M
@@ -61,7 +62,6 @@ FREEBUSY:20070518T030000/PT1H45M
 FREEBUSY:20070601T030000/PT1H45M
 FREEBUSY:20070615T030000/PT1H45M
 FREEBUSY:20070629T030000/PT1H45M
-FREEBUSY:20070713T030000/PT1H45M
 FREEBUSY:20061223T000000/PT2H
 FREEBUSY:20061223T030000/PT2H
 END:VFREEBUSY
diff --git a/testing/tests/regression-suite/832-freebusy.test b/testing/tests/regression-suite/832-freebusy.test
index 31bb5464..ff436bd9 100644
--- a/testing/tests/regression-suite/832-freebusy.test
+++ b/testing/tests/regression-suite/832-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1@example.net
+URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/833-freebusy.result b/testing/tests/regression-suite/833-freebusy.result
index 7a3130be..b1a6fa36 100644
--- a/testing/tests/regression-suite/833-freebusy.result
+++ b/testing/tests/regression-suite/833-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 1895
+Content-Length: 1892
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -11,6 +11,7 @@ DTSTAMP:yyyymmddThhmmssZ
 DTSTART:yyyymmddThhmmss
 DTEND:yyyymmddThhmmss
 FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/PT2H
+FREEBUSY:20061031T210000/PT1H
 FREEBUSY:20061102T210000/PT1H
 FREEBUSY:20061109T210000/PT1H
 FREEBUSY:20061116T210000/PT1H
@@ -36,6 +37,7 @@ FREEBUSY:20070329T210000/PT1H
 FREEBUSY:20070405T210000/PT1H
 FREEBUSY:20070412T210000/PT1H
 FREEBUSY:20070419T210000/PT1H
+FREEBUSY:20061101T233000/PT1H
 FREEBUSY:20061202T183000/PT2H
 FREEBUSY:20070102T183000/PT2H
 FREEBUSY:20070202T183000/PT2H
@@ -43,7 +45,6 @@ FREEBUSY:20070302T183000/PT2H
 FREEBUSY:20070402T183000/PT2H
 FREEBUSY:20070502T183000/PT2H
 FREEBUSY:20070602T183000/PT2H
-FREEBUSY:20070702T183000/PT2H
 FREEBUSY:20061117T030000/PT1H45M
 FREEBUSY:20061201T030000/PT1H45M
 FREEBUSY:20061215T030000/PT1H45M
@@ -61,7 +62,6 @@ FREEBUSY:20070518T030000/PT1H45M
 FREEBUSY:20070601T030000/PT1H45M
 FREEBUSY:20070615T030000/PT1H45M
 FREEBUSY:20070629T030000/PT1H45M
-FREEBUSY:20070713T030000/PT1H45M
 FREEBUSY:20061223T000000/PT2H
 FREEBUSY:20061223T030000/PT2H
 END:VFREEBUSY
diff --git a/testing/tests/regression-suite/833-freebusy.test b/testing/tests/regression-suite/833-freebusy.test
index 562250f5..33f2ff02 100644
--- a/testing/tests/regression-suite/833-freebusy.test
+++ b/testing/tests/regression-suite/833-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1/home/
+URL=http://mycaldav/freebusy.php/user1/home/?start=20061001T000000&finish=20070630T235959
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/834-Spec-FREEBUSY-1.result b/testing/tests/regression-suite/834-Spec-FREEBUSY-1.result
index 89f2f286..fb1ef429 100644
--- a/testing/tests/regression-suite/834-Spec-FREEBUSY-1.result
+++ b/testing/tests/regression-suite/834-Spec-FREEBUSY-1.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 928
+Content-Length: 1957
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -8,8 +8,8 @@ PRODID:-//Catalyst.Net.NZ//NONSGML AWL Calendar//EN
 VERSION:2.0
 BEGIN:VFREEBUSY
 DTSTAMP:yyyymmddThhmmssZ
-DTSTART:20061004T140000Z
-DTEND:20070105T220000Z
+DTSTART:20061001T000000Z
+DTEND:20070630T235959Z
 FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/PT2H
 FREEBUSY:20061031T210000/PT1H
 FREEBUSY:20061101T210000/PT1H
@@ -23,15 +23,48 @@ FREEBUSY:20061214T210000/PT1H
 FREEBUSY:20061221T210000/PT1H
 FREEBUSY:20061228T210000/PT1H
 FREEBUSY:20070104T210000/PT1H
+FREEBUSY:20070111T210000/PT1H
+FREEBUSY:20070118T210000/PT1H
+FREEBUSY:20070125T210000/PT1H
+FREEBUSY:20070201T210000/PT1H
+FREEBUSY:20070208T210000/PT1H
+FREEBUSY:20070215T210000/PT1H
+FREEBUSY:20070222T210000/PT1H
+FREEBUSY:20070301T210000/PT1H
+FREEBUSY:20070308T210000/PT1H
+FREEBUSY:20070315T210000/PT1H
+FREEBUSY:20070322T210000/PT1H
+FREEBUSY:20070329T210000/PT1H
+FREEBUSY:20070405T210000/PT1H
+FREEBUSY:20070412T210000/PT1H
+FREEBUSY:20070419T210000/PT1H
 FREEBUSY:20061101T233000/PT1H
 FREEBUSY:20061102T183000/PT2H
 FREEBUSY:20061202T183000/PT2H
 FREEBUSY:20070102T183000/PT2H
+FREEBUSY:20070202T183000/PT2H
+FREEBUSY:20070302T183000/PT2H
+FREEBUSY:20070402T183000/PT2H
+FREEBUSY:20070502T183000/PT2H
+FREEBUSY:20070602T183000/PT2H
 FREEBUSY:20061103T030000/PT1H45M
 FREEBUSY:20061117T030000/PT1H45M
 FREEBUSY:20061201T030000/PT1H45M
 FREEBUSY:20061215T030000/PT1H45M
 FREEBUSY:20061229T030000/PT1H45M
+FREEBUSY:20070112T030000/PT1H45M
+FREEBUSY:20070126T030000/PT1H45M
+FREEBUSY:20070209T030000/PT1H45M
+FREEBUSY:20070223T030000/PT1H45M
+FREEBUSY:20070309T030000/PT1H45M
+FREEBUSY:20070323T030000/PT1H45M
+FREEBUSY:20070406T030000/PT1H45M
+FREEBUSY:20070420T030000/PT1H45M
+FREEBUSY:20070504T030000/PT1H45M
+FREEBUSY:20070518T030000/PT1H45M
+FREEBUSY:20070601T030000/PT1H45M
+FREEBUSY:20070615T030000/PT1H45M
+FREEBUSY:20070629T030000/PT1H45M
 FREEBUSY:20061223T030000/PT2H
 END:VFREEBUSY
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/834-Spec-FREEBUSY-1.test b/testing/tests/regression-suite/834-Spec-FREEBUSY-1.test
index 627d58e0..33d0aaba 100644
--- a/testing/tests/regression-suite/834-Spec-FREEBUSY-1.test
+++ b/testing/tests/regression-suite/834-Spec-FREEBUSY-1.test
@@ -14,8 +14,8 @@ AUTH=manager1:manager1
 BEGINDATA
 <?xml version="1.0" encoding="utf-8" ?>
 <C:free-busy-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-  <C:time-range start="20061004T140000Z"
-                  end="20070105T220000Z"/>
+  <C:time-range start="20061001T000000Z"
+                  end="20070630T235959Z"/>
 </C:free-busy-query>
 ENDDATA
 
diff --git a/testing/tests/regression-suite/835-freebusy.result b/testing/tests/regression-suite/835-freebusy.result
index 6b5accad..df0e8ca2 100644
--- a/testing/tests/regression-suite/835-freebusy.result
+++ b/testing/tests/regression-suite/835-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 1865
+Content-Length: 1862
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -11,6 +11,7 @@ DTSTAMP:yyyymmddThhmmssZ
 DTSTART:yyyymmddThhmmss
 DTEND:yyyymmddThhmmss
 FREEBUSY;FBTYPE=BUSY-TENTATIVE:20061223T060000/PT2H
+FREEBUSY:20061031T210000/PT1H
 FREEBUSY:20061102T210000/PT1H
 FREEBUSY:20061109T210000/PT1H
 FREEBUSY:20061116T210000/PT1H
@@ -36,6 +37,7 @@ FREEBUSY:20070329T210000/PT1H
 FREEBUSY:20070405T210000/PT1H
 FREEBUSY:20070412T210000/PT1H
 FREEBUSY:20070419T210000/PT1H
+FREEBUSY:20061101T233000/PT1H
 FREEBUSY:20061202T183000/PT2H
 FREEBUSY:20070102T183000/PT2H
 FREEBUSY:20070202T183000/PT2H
@@ -43,7 +45,6 @@ FREEBUSY:20070302T183000/PT2H
 FREEBUSY:20070402T183000/PT2H
 FREEBUSY:20070502T183000/PT2H
 FREEBUSY:20070602T183000/PT2H
-FREEBUSY:20070702T183000/PT2H
 FREEBUSY:20061117T030000/PT1H45M
 FREEBUSY:20061201T030000/PT1H45M
 FREEBUSY:20061215T030000/PT1H45M
@@ -61,7 +62,6 @@ FREEBUSY:20070518T030000/PT1H45M
 FREEBUSY:20070601T030000/PT1H45M
 FREEBUSY:20070615T030000/PT1H45M
 FREEBUSY:20070629T030000/PT1H45M
-FREEBUSY:20070713T030000/PT1H45M
 FREEBUSY:20061223T030000/PT2H
 END:VFREEBUSY
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/835-freebusy.test b/testing/tests/regression-suite/835-freebusy.test
index 0509d2c6..e801d661 100644
--- a/testing/tests/regression-suite/835-freebusy.test
+++ b/testing/tests/regression-suite/835-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1/home/
+URL=http://mycaldav/freebusy.php/user1/home/?start=20061001T000000&finish=20070630T235959
 HEAD
 
 AUTH=manager1:manager1