1 files changed, 41 insertions, 48 deletions

diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
index f20df96f7a2..84de6ec88e2 100644
--- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
+++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php
@@ -1,25 +1,8 @@
 <?php
 
 /**
- * @copyright 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Tests\Contacts\ContactsMenu;
@@ -27,42 +10,42 @@ namespace Tests\Contacts\ContactsMenu;
 use OC\App\AppManager;
 use OC\Contacts\ContactsMenu\ActionProviderStore;
 use OC\Contacts\ContactsMenu\Providers\EMailProvider;
+use OC\Contacts\ContactsMenu\Providers\LocalTimeProvider;
+use OC\Contacts\ContactsMenu\Providers\ProfileProvider;
 use OCP\App\IAppManager;
 use OCP\AppFramework\QueryException;
 use OCP\Contacts\ContactsMenu\IProvider;
-use OCP\ILogger;
 use OCP\IServerContainer;
 use OCP\IUser;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class ActionProviderStoreTest extends TestCase {
-
-	/** @var IServerContainer|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IServerContainer|MockObject */
 	private $serverContainer;
 
-	/** @var IAppManager|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var IAppManager|MockObject */
 	private $appManager;
 
-	/** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-
-	/** @var ActionProviderStore */
-	private $actionProviderStore;
+	private ActionProviderStore $actionProviderStore;
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->serverContainer = $this->createMock(IServerContainer::class);
 		$this->appManager = $this->createMock(AppManager::class);
-		$this->logger = $this->createMock(ILogger::class);
+		$logger = $this->createMock(LoggerInterface::class);
 
-		$this->actionProviderStore = new ActionProviderStore($this->serverContainer, $this->appManager, $this->logger);
+		$this->actionProviderStore = new ActionProviderStore($this->serverContainer, $this->appManager, $logger);
 	}
 
-	public function testGetProviders() {
+	public function testGetProviders(): void {
 		$user = $this->createMock(IUser::class);
-		$provider1 = $this->createMock(EMailProvider::class);
-		$provider2 = $this->createMock(IProvider::class);
+		$provider1 = $this->createMock(ProfileProvider::class);
+		$provider2 = $this->createMock(LocalTimeProvider::class);
+		$provider3 = $this->createMock(EMailProvider::class);
+		$provider4 = $this->createMock(IProvider::class);
 
 		$this->appManager->expects($this->once())
 			->method('getEnabledAppsForUser')
@@ -76,22 +59,28 @@ class ActionProviderStoreTest extends TestCase {
 					'OCA\Contacts\Provider1',
 				],
 			]);
-		$this->serverContainer->expects($this->exactly(2))
-			->method('query')
+		$this->serverContainer->expects($this->exactly(4))
+			->method('get')
 			->willReturnMap([
-				[EMailProvider::class, true, $provider1],
-				['OCA\Contacts\Provider1', true, $provider2]
+				[ProfileProvider::class, $provider1],
+				[LocalTimeProvider::class, $provider2],
+				[EMailProvider::class, $provider3],
+				['OCA\Contacts\Provider1', $provider4]
 			]);
 
 		$providers = $this->actionProviderStore->getProviders($user);
 
-		$this->assertCount(2, $providers);
-		$this->assertInstanceOf(EMailProvider::class, $providers[0]);
+		$this->assertCount(4, $providers);
+		$this->assertInstanceOf(ProfileProvider::class, $providers[0]);
+		$this->assertInstanceOf(LocalTimeProvider::class, $providers[1]);
+		$this->assertInstanceOf(EMailProvider::class, $providers[2]);
 	}
 
-	public function testGetProvidersOfAppWithIncompleInfo() {
+	public function testGetProvidersOfAppWithIncompleInfo(): void {
 		$user = $this->createMock(IUser::class);
-		$provider1 = $this->createMock(EMailProvider::class);
+		$provider1 = $this->createMock(ProfileProvider::class);
+		$provider2 = $this->createMock(LocalTimeProvider::class);
+		$provider3 = $this->createMock(EMailProvider::class);
 
 		$this->appManager->expects($this->once())
 			->method('getEnabledAppsForUser')
@@ -101,20 +90,24 @@ class ActionProviderStoreTest extends TestCase {
 			->method('getAppInfo')
 			->with('contacts')
 			->willReturn([/* Empty info.xml */]);
-		$this->serverContainer->expects($this->once())
-			->method('query')
+		$this->serverContainer->expects($this->exactly(3))
+			->method('get')
 			->willReturnMap([
-				[EMailProvider::class, true, $provider1],
+				[ProfileProvider::class, $provider1],
+				[LocalTimeProvider::class, $provider2],
+				[EMailProvider::class, $provider3],
 			]);
 
 		$providers = $this->actionProviderStore->getProviders($user);
 
-		$this->assertCount(1, $providers);
-		$this->assertInstanceOf(EMailProvider::class, $providers[0]);
+		$this->assertCount(3, $providers);
+		$this->assertInstanceOf(ProfileProvider::class, $providers[0]);
+		$this->assertInstanceOf(LocalTimeProvider::class, $providers[1]);
+		$this->assertInstanceOf(EMailProvider::class, $providers[2]);
 	}
 
 
-	public function testGetProvidersWithQueryException() {
+	public function testGetProvidersWithQueryException(): void {
 		$this->expectException(\Exception::class);
 
 		$user = $this->createMock(IUser::class);
@@ -123,7 +116,7 @@ class ActionProviderStoreTest extends TestCase {
 			->with($user)
 			->willReturn([]);
 		$this->serverContainer->expects($this->once())
-			->method('query')
+			->method('get')
 			->willThrowException(new QueryException());
 
 		$this->actionProviderStore->getProviders($user);