Skip to content

Bugfix/noid/adjust unit tests #27374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 3 commits into from
Jun 7, 2021
Merged

Bugfix/noid/adjust unit tests #27374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
181aab4
Fix warnings about logException
nickvergessen Jun 4, 2021
e1e5026
Fix dispatcher handling in CalDavBackendTest
nickvergessen Jun 4, 2021
e238b93
Code style fixes
MorrisJobke Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
use OCA\DAV\CalDAV\CalDavBackend;
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\CalendarObjectCreatedEvent;
use OCP\App\IAppManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
Expand Down Expand Up @@ -66,9 +63,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 */
Expand Down Expand Up @@ -147,11 +144,10 @@ public function cleanUpBackend() {

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');
Copy link
Member Author

@nickvergessen nickvergessen Jun 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChristophWurst feel free to fix this differently if you want to specific, I failed to list all the classes and do the counting correctly.

foreach ($calendars as $calendar) {
$this->backend->deleteCalendar($calendar['id'], true);
}
Expand All @@ -162,11 +158,8 @@ private function cleanupForPrincipal($principal): void {
}

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'
Expand Down Expand Up @@ -221,11 +214,8 @@ protected function createEvent($calendarId, $start = '20130912T130000Z', $end =
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);

Expand Down
94 changes: 26 additions & 68 deletions apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@
use DateTimeZone;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CalDAV\Calendar;
use OCA\DAV\Events\CalendarCreatedEvent;
use OCA\DAV\Events\CalendarDeletedEvent;
use OCA\DAV\Events\CalendarObjectCreatedEvent;
use OCA\DAV\Events\CalendarUpdatedEvent;
use OCP\IConfig;
use OCP\IL10N;
use Sabre\DAV\Exception\NotFound;
Expand All @@ -63,11 +60,8 @@ public function testCalendarOperations() {
'{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));
Expand All @@ -78,11 +72,8 @@ public function testCalendarOperations() {
$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);
Expand Down Expand Up @@ -191,11 +182,8 @@ public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead,
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 */
Expand Down Expand Up @@ -239,11 +227,8 @@ public function testCalendarObjectsOperations() {
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
Expand Down Expand Up @@ -279,21 +264,15 @@ public function testCalendarObjectsOperations() {
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);
Expand Down Expand Up @@ -386,25 +365,16 @@ public function testMultiCalendarObjects() {
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
Expand All @@ -431,23 +401,14 @@ public function testMultiCalendarObjects() {
$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);
Expand Down Expand Up @@ -530,11 +491,8 @@ public function testSyncSupport() {
}

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', []);

Expand Down
2 changes: 1 addition & 1 deletion tests/lib/AppFramework/Bootstrap/CoordinatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function testBootAppNotLoadable(): void {
->with(\OCA\Settings\AppInfo\Application::class)
->willThrowException(new QueryException(""));
$this->logger->expects($this->once())
->method('logException');
->method('error');

$this->coordinator->bootApp($appId);
}
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function testRegisterCapability(): void {
->method('registerCapability')
->with($name);
$this->logger->expects($this->never())
->method('logException');
->method('error');

$this->context->for('myapp')->registerCapability($name);
$this->context->delegateCapabilityRegistrations([
Expand All @@ -77,7 +77,7 @@ public function testRegisterEventListener(): void {
->method('addServiceListener')
->with($event, $service, 0);
$this->logger->expects($this->never())
->method('logException');
->method('error');

$this->context->for('myapp')->registerEventListener($event, $service);
$this->context->delegateEventListenerRegistrations($dispatcher);
Expand All @@ -99,7 +99,7 @@ public function testRegisterService(bool $shared): void {
->method('registerService')
->with($service, $factory, $shared);
$this->logger->expects($this->never())
->method('logException');
->method('error');

$this->context->for('myapp')->registerService($service, $factory, $shared);
$this->context->delegateContainerRegistrations([
Expand All @@ -118,7 +118,7 @@ public function testRegisterServiceAlias(): void {
->method('registerAlias')
->with($alias, $target);
$this->logger->expects($this->never())
->method('logException');
->method('error');

$this->context->for('myapp')->registerServiceAlias($alias, $target);
$this->context->delegateContainerRegistrations([
Expand All @@ -137,7 +137,7 @@ public function testRegisterParameter(): void {
->method('registerParameter')
->with($name, $value);
$this->logger->expects($this->never())
->method('logException');
->method('error');

$this->context->for('myapp')->registerParameter($name, $value);
$this->context->delegateContainerRegistrations([
Expand All @@ -155,7 +155,7 @@ public function testRegisterMiddleware(): void {
->method('registerMiddleware')
->with($name);
$this->logger->expects($this->never())
->method('logException');
->method('error');

$this->context->for('myapp')->registerMiddleware($name);
$this->context->delegateMiddlewareRegistrations([
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ public function testAfterExceptionReturnsRedirectForNotLoggedInUser() {
->willReturn('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp');
$this->logger
->expects($this->once())
->method('logException');
->method('debug');
$response = $this->middleware->afterException(
$this->controller,
'test',
Expand Down Expand Up @@ -576,7 +576,7 @@ public function testAfterExceptionReturnsTemplateResponse(SecurityException $exc
$this->middleware = $this->getMiddleware(false, false, false);
$this->logger
->expects($this->once())
->method('logException');
->method('debug');
$response = $this->middleware->afterException(
$this->controller,
'test',
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/CapabilitiesManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function testInvalidCapability() {
});

$this->logger->expects($this->once())
->method('logException');
->method('error');

$res = $this->manager->getCapabilities();

Expand Down
4 changes: 2 additions & 2 deletions tests/lib/Collaboration/Resources/ProviderManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function testGetResourceProvidersInvalidProvider(): void {
->willThrowException(new QueryException('A meaningful error message'));

$this->logger->expects($this->once())
->method('logException');
->method('error');

$this->providerManager->registerResourceProvider('InvalidResourceProvider');
$resourceProviders = $this->providerManager->getResourceProviders();
Expand All @@ -101,7 +101,7 @@ public function testGetResourceProvidersValidAndInvalidProvider(): void {
->willReturn($this->createMock(ResourceProvider::class));

$this->logger->expects($this->once())
->method('logException');
->method('error');

$this->providerManager->registerResourceProvider('InvalidResourceProvider');
$this->providerManager->registerResourceProvider(ResourceProvider::class);
Expand Down