mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24238 from owncloud/caldav-test-event-in-far-future 

Test an event in the far future
This commit is contained in:
Joas Schilling 2016-05-02 10:42:47 +02:00
parent 5a62c74495 dda942a917
commit b8650be732
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/appinfo/database.xml
View File

@ -259,11 +259,13 @@ CREATE TABLE calendarobjects (
<name>firstoccurence</name> <name>firstoccurence</name>
<type>integer</type> <type>integer</type>
<unsigned>true</unsigned> <unsigned>true</unsigned>
<length>11</length>
</field> </field>
<field> <field>
<name>lastoccurence</name> <name>lastoccurence</name>
<type>integer</type> <type>integer</type>
<unsigned>true</unsigned> <unsigned>true</unsigned>
<length>11</length>
</field> </field>
<field> <field>
<name>uid</name> <name>uid</name>

2
apps/dav/appinfo/info.xml
View File

@ -5,7 +5,7 @@
<description>ownCloud WebDAV endpoint</description> <description>ownCloud WebDAV endpoint</description>
<licence>AGPL</licence> <licence>AGPL</licence>
<author>owncloud.org</author> <author>owncloud.org</author>
<version>0.2.3</version> <version>0.2.4</version>
<default_enable/> <default_enable/>
<types> <types>
<filesystem/> <filesystem/>

8
apps/dav/tests/unit/caldav/caldavbackendtest.php
View File

@ -328,6 +328,7 @@ EOD;
$events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z'); $events[0] = $this->createEvent($calendarId, '20130912T130000Z', '20130912T140000Z');
$events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z'); $events[1] = $this->createEvent($calendarId, '20130912T150000Z', '20130912T170000Z');
$events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z'); $events[2] = $this->createEvent($calendarId, '20130912T173000Z', '20130912T220000Z');
$events[3] = $this->createEvent($calendarId, '21130912T130000Z', '22130912T130000Z');
$result = $this->backend->calendarQuery($calendarId, [ $result = $this->backend->calendarQuery($calendarId, [
'name' => '', 'name' => '',
@ -351,11 +352,12 @@ EOD;
public function providesCalendarQueryParameters() { public function providesCalendarQueryParameters() {
return [ return [
'all' => [[0, 1, 2], [], []], 'all' => [[0, 1, 2, 3], [], []],
'only-todos' => [[], ['name' => 'VTODO'], []], 'only-todos' => [[], ['name' => 'VTODO'], []],
'only-events' => [[0, 1, 2], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],], 'only-events' => [[0, 1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => null], 'prop-filters' => []]],],
'start' => [[1, 2], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],], 'start' => [[1, 2, 3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],], 'end' => [[0], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => null, 'end' => new DateTime('2013-09-12 14:00:00', new DateTimeZone('UTC'))], 'prop-filters' => []]],],
'future' => [[3], [], [['name' => 'VEVENT', 'is-not-defined' => false, 'comp-filters' => [], 'time-range' => ['start' => new DateTime('2099-09-12 14:00:00', new DateTimeZone('UTC')), 'end' => null], 'prop-filters' => []]],],
]; ];
} }