From 0b02a6d123b2014705998c94ddf3d460948d3eac Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 10 May 2016 17:26:44 -0700 Subject: initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import) --- .../dav/tests/Sabre/CalDAV/FreeBusyReportTest.php | 71 ++++++++++++++-------- 1 file changed, 44 insertions(+), 27 deletions(-) (limited to 'vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php') diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php index 93eca9ee9..84f05f3c0 100644 --- a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php +++ b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php @@ -30,6 +30,7 @@ DURATION:PT1H END:VEVENT END:VCALENDAR ics; + $obj2 = fopen('php://memory','r+'); fwrite($obj2,<< array( - 'obj1' => array( + $obj3 = << [ + 'obj1' => [ 'calendarid' => 1, 'uri' => 'event1.ics', 'calendardata' => $obj1, - ), - 'obj2' => array( + ], + 'obj2' => [ 'calendarid' => 1, 'uri' => 'event2.ics', 'calendardata' => $obj2 - ) - ), - ); + ], + 'obj3' => [ + 'calendarid' => 1, + 'uri' => 'event3.ics', + 'calendardata' => $obj3 + ] + ], + ]; - $caldavBackend = new Backend\Mock(array(), $calendarData); + $caldavBackend = new Backend\Mock([], $calendarData); - $calendar = new Calendar($caldavBackend, array( + $calendar = new Calendar($caldavBackend, [ 'id' => 1, 'uri' => 'calendar', 'principaluri' => 'principals/user1', - )); + '{' . Plugin::NS_CALDAV . '}calendar-timezone' => "BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nEND:VTIMEZONE\r\nEND:VCALENDAR", + ]); - $this->server = new DAV\Server(array($calendar)); + $this->server = new DAV\Server([$calendar]); - $request = new HTTP\Request(array( + $request = HTTP\Sapi::createFromServerArray([ 'REQUEST_URI' => '/calendar', - )); + ]); $this->server->httpRequest = $request; $this->server->httpResponse = new HTTP\ResponseMock(); $this->plugin = new Plugin(); $this->server->addPlugin($this->plugin); - $this->server->addPlugin(new DAVACL\Plugin()); } @@ -89,12 +104,14 @@ ics XML; - $dom = DAV\XMLUtil::loadDOMDocument($reportXML); - $this->plugin->report('{urn:ietf:params:xml:ns:caldav}free-busy-query', $dom); + $report = $this->server->xml->parse($reportXML, null, $rootElem); + $this->plugin->report($rootElem, $report); - $this->assertEquals('HTTP/1.1 200 OK', $this->server->httpResponse->status); - $this->assertEquals('text/calendar', $this->server->httpResponse->headers['Content-Type']); - $this->assertTrue(strpos($this->server->httpResponse->body,'BEGIN:VFREEBUSY')!==false); + $this->assertEquals(200, $this->server->httpResponse->status); + $this->assertEquals('text/calendar', $this->server->httpResponse->getHeader('Content-Type')); + $this->assertTrue(strpos($this->server->httpResponse->body, 'BEGIN:VFREEBUSY')!==false); + $this->assertTrue(strpos($this->server->httpResponse->body, '20111005T120000Z/20111005T130000Z')!==false); + $this->assertTrue(strpos($this->server->httpResponse->body, '20111006T100000Z/20111006T110000Z')!==false); } @@ -109,8 +126,8 @@ XML; XML; - $dom = DAV\XMLUtil::loadDOMDocument($reportXML); - $this->plugin->report('{urn:ietf:params:xml:ns:caldav}free-busy-query', $dom); + $report = $this->server->xml->parse($reportXML, null, $rootElem); + $this->plugin->report($rootElem, $report); } @@ -119,7 +136,7 @@ XML; */ function testFreeBusyReportWrongNode() { - $request = new HTTP\Request(array( + $request = HTTP\Sapi::createFromServerArray(array( 'REQUEST_URI' => '/', )); $this->server->httpRequest = $request; @@ -131,8 +148,8 @@ XML; XML; - $dom = DAV\XMLUtil::loadDOMDocument($reportXML); - $this->plugin->report('{urn:ietf:params:xml:ns:caldav}free-busy-query', $dom); + $report = $this->server->xml->parse($reportXML, null, $rootElem); + $this->plugin->report($rootElem, $report); } @@ -152,8 +169,8 @@ XML; XML; - $dom = DAV\XMLUtil::loadDOMDocument($reportXML); - $this->plugin->report('{urn:ietf:params:xml:ns:caldav}free-busy-query', $dom); + $report = $this->server->xml->parse($reportXML, null, $rootElem); + $this->plugin->report($rootElem, $report); } } -- cgit v1.2.3