From ada17934d845d8c7f1ae6a4ea37faa28fb4ee762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 3 Jun 2021 08:37:20 +0200 Subject: [PATCH] Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- tests/lib/AppFramework/Bootstrap/CoordinatorTest.php | 2 +- .../Bootstrap/RegistrationContextTest.php | 12 ------------ .../Middleware/Security/SecurityMiddlewareTest.php | 4 ++-- tests/lib/CapabilitiesManagerTest.php | 2 +- .../Collaboration/Resources/ProviderManagerTest.php | 4 ++-- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php index 05442455cb..d6ceefa426 100644 --- a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php +++ b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php @@ -89,7 +89,7 @@ class CoordinatorTest extends TestCase { ->with(\OCA\Settings\AppInfo\Application::class) ->willThrowException(new QueryException("")); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $this->coordinator->bootApp($appId); } diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index f97ac92e88..26ddf14787 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -60,8 +60,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerCapability') ->with($name); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerCapability($name); $this->context->delegateCapabilityRegistrations([ @@ -76,8 +74,6 @@ class RegistrationContextTest extends TestCase { $dispatcher->expects($this->once()) ->method('addServiceListener') ->with($event, $service, 0); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerEventListener($event, $service); $this->context->delegateEventListenerRegistrations($dispatcher); @@ -98,8 +94,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerService') ->with($service, $factory, $shared); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerService($service, $factory, $shared); $this->context->delegateContainerRegistrations([ @@ -117,8 +111,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerAlias') ->with($alias, $target); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerServiceAlias($alias, $target); $this->context->delegateContainerRegistrations([ @@ -136,8 +128,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerParameter') ->with($name, $value); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerParameter($name, $value); $this->context->delegateContainerRegistrations([ @@ -154,8 +144,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerMiddleware') ->with($name); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerMiddleware($name); $this->context->delegateMiddlewareRegistrations([ diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 076f6588d9..8f55f90d37 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -506,7 +506,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { ->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', @@ -576,7 +576,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { $this->middleware = $this->getMiddleware(false, false, false); $this->logger ->expects($this->once()) - ->method('logException'); + ->method('debug'); $response = $this->middleware->afterException( $this->controller, 'test', diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index 4909272c4a..ec07f3dfa3 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -149,7 +149,7 @@ class CapabilitiesManagerTest extends TestCase { }); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $res = $this->manager->getCapabilities(); diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/lib/Collaboration/Resources/ProviderManagerTest.php index 19a34962a5..01e45de9fd 100644 --- a/tests/lib/Collaboration/Resources/ProviderManagerTest.php +++ b/tests/lib/Collaboration/Resources/ProviderManagerTest.php @@ -82,7 +82,7 @@ class ProviderManagerTest extends TestCase { ->willThrowException(new QueryException('A meaningful error message')); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $this->providerManager->registerResourceProvider('InvalidResourceProvider'); $resourceProviders = $this->providerManager->getResourceProviders(); @@ -101,7 +101,7 @@ class ProviderManagerTest extends TestCase { ->willReturn($this->createMock(ResourceProvider::class)); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $this->providerManager->registerResourceProvider('InvalidResourceProvider'); $this->providerManager->registerResourceProvider(ResourceProvider::class);