aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php29
-rw-r--r--apps/dav/tests/unit/CalDAV/CalDavBackendTest.php93
2 files changed, 40 insertions, 82 deletions
diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
index eb0530a8b3d..8ac4aa37899 100644
--- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
+++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
@@ -33,7 +33,9 @@ use OCA\DAV\CalDAV\Proxy\ProxyMapper;
use OCA\DAV\Connector\Sabre\Principal;
use OCA\DAV\Events\CalendarCreatedEvent;
use OCA\DAV\Events\CalendarDeletedEvent;
+use OCA\DAV\Events\CalendarMovedToTrashEvent;
use OCA\DAV\Events\CalendarObjectCreatedEvent;
+use OCA\DAV\Events\SubscriptionCreatedEvent;
use OCP\App\IAppManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
@@ -66,9 +68,9 @@ abstract class AbstractCalDavBackend extends TestCase {
protected $userManager;
/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
protected $groupManager;
- /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */
- protected $dispatcher;
/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
+ protected $dispatcher;
+ /** @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */
protected $legacyDispatcher;
/** @var ISecureRandom */
@@ -147,11 +149,10 @@ abstract class AbstractCalDavBackend extends TestCase {
private function cleanupForPrincipal($principal): void {
$calendars = $this->backend->getCalendarsForUser($principal);
- $this->legacyDispatcher->expects(self::exactly(count($calendars)))
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarDeletedEvent;
- }));
+ $this->dispatcher->expects(self::any())
+ ->method('dispatchTyped');
+ $this->legacyDispatcher->expects(self::any())
+ ->method('dispatch');
foreach ($calendars as $calendar) {
$this->backend->deleteCalendar($calendar['id'], true);
}
@@ -162,11 +163,8 @@ abstract class AbstractCalDavBackend extends TestCase {
}
protected function createTestCalendar() {
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarCreatedEvent;
- }));
+ $this->dispatcher->expects(self::any())
+ ->method('dispatchTyped');
$this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', [
'{http://apple.com/ns/ical/}calendar-color' => '#1C4587FF'
@@ -221,11 +219,8 @@ END:VCALENDAR
EOD;
$uri0 = $this->getUniqueID('event');
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarObjectCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendarObject($calendarId, $uri0, $calData);
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
index 03abd554e2b..ffa74de19aa 100644
--- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -40,6 +40,8 @@ use OCA\DAV\Events\CalendarCreatedEvent;
use OCA\DAV\Events\CalendarDeletedEvent;
use OCA\DAV\Events\CalendarObjectCreatedEvent;
use OCA\DAV\Events\CalendarUpdatedEvent;
+use OCA\DAV\Events\SubscriptionDeletedEvent;
+use OCA\DAV\Events\SubscriptionUpdatedEvent;
use OCP\IConfig;
use OCP\IL10N;
use Sabre\DAV\Exception\NotFound;
@@ -63,11 +65,8 @@ class CalDavBackendTest extends AbstractCalDavBackend {
'{DAV:}displayname' => 'Unit test',
'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar used for unit testing'
]);
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarUpdatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->updateCalendar($calendarId, $patch);
$patch->commit();
$this->assertEquals(1, $this->backend->getCalendarsForUserCount(self::UNIT_TEST_USER));
@@ -78,11 +77,8 @@ class CalDavBackendTest extends AbstractCalDavBackend {
$this->assertEquals('User\'s displayname', $calendars[0]['{http://nextcloud.com/ns}owner-displayname']);
// delete the address book
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarDeletedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->deleteCalendar($calendars[0]['id'], true);
$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
self::assertEmpty($calendars);
@@ -191,11 +187,8 @@ END:VEVENT
END:VCALENDAR
EOD;
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarObjectCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendarObject($calendarId, $uri, $calData);
/** @var IACL $child */
@@ -239,11 +232,8 @@ END:VEVENT
END:VCALENDAR
EOD;
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarObjectCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendarObject($calendarId, $uri, $calData);
// get all the cards
@@ -279,21 +269,15 @@ DTEND;VALUE=DATE-TIME:20130912T140000Z
END:VEVENT
END:VCALENDAR
EOD;
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarUpdatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->updateCalendarObject($calendarId, $uri, $calData);
$calendarObject = $this->backend->getCalendarObject($calendarId, $uri);
$this->assertEquals($calData, $calendarObject['calendardata']);
// delete the card
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarDeletedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->deleteCalendarObject($calendarId, $uri);
$calendarObjects = $this->backend->getCalendarObjects($calendarId);
$this->assertCount(0, $calendarObjects);
@@ -386,25 +370,16 @@ END:VCALENDAR
EOD;
$uri0 = static::getUniqueID('card');
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarObjectCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendarObject($calendarId, $uri0, $calData[0]);
$uri1 = static::getUniqueID('card');
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarObjectCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendarObject($calendarId, $uri1, $calData[1]);
$uri2 = static::getUniqueID('card');
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarObjectCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendarObject($calendarId, $uri2, $calData[2]);
// get all the cards
@@ -431,23 +406,14 @@ EOD;
$this->assertEquals($calData[2], $calendarObjects[1]['calendardata']);
// delete the card
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarDeletedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->deleteCalendarObject($calendarId, $uri0);
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarDeletedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->deleteCalendarObject($calendarId, $uri1);
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarDeletedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->deleteCalendarObject($calendarId, $uri2);
$calendarObjects = $this->backend->getCalendarObjects($calendarId);
$this->assertCount(0, $calendarObjects);
@@ -530,11 +496,8 @@ EOD;
}
public function testPublications() {
- $this->dispatcher->expects(self::once())
- ->method('dispatchTyped')
- ->with(self::callback(function ($event) {
- return $event instanceof CalendarCreatedEvent;
- }));
+ $this->dispatcher->expects(self::atLeastOnce())
+ ->method('dispatchTyped');
$this->backend->createCalendar(self::UNIT_TEST_USER, 'Example', []);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 18:16:39 +0000