nextcloud / server

tests/lib/Authentication/Token/PublicKeyTokenTest.php

Indentation +12 added lines, -12 removed lines

@@ -13,17 +13,17 @@
 use Test\TestCase;
 
 class PublicKeyTokenTest extends TestCase {
-	public function testSetScopeAsArray(): void {
-		$scope = [IToken::SCOPE_FILESYSTEM => false];
-		$token = new PublicKeyToken();
-		$token->setScope($scope);
-		$this->assertEquals(json_encode($scope), $token->getScope());
-		$this->assertEquals($scope, $token->getScopeAsArray());
-	}
+    public function testSetScopeAsArray(): void {
+        $scope = [IToken::SCOPE_FILESYSTEM => false];
+        $token = new PublicKeyToken();
+        $token->setScope($scope);
+        $this->assertEquals(json_encode($scope), $token->getScope());
+        $this->assertEquals($scope, $token->getScopeAsArray());
+    }
 
-	public function testDefaultScope(): void {
-		$scope = [IToken::SCOPE_FILESYSTEM => true];
-		$token = new PublicKeyToken();
-		$this->assertEquals($scope, $token->getScopeAsArray());
-	}
+    public function testDefaultScope(): void {
+        $scope = [IToken::SCOPE_FILESYSTEM => true];
+        $token = new PublicKeyToken();
+        $this->assertEquals($scope, $token->getScopeAsArray());
+    }
 }

tests/lib/Authentication/Token/RemoteWipeTest.php

Indentation +146 added lines, -146 removed lines

@@ -24,150 +24,150 @@
 use Test\TestCase;
 
 class RemoteWipeTest extends TestCase {
-	/** @var ITokenProvider|MockObject */
-	private $tokenProvider;
-
-	/** @var IEventDispatcher|MockObject */
-	private $eventDispatcher;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var RemoteWipe */
-	private $remoteWipe;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->tokenProvider = $this->createMock(IProvider::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->remoteWipe = new RemoteWipe(
-			$this->tokenProvider,
-			$this->eventDispatcher,
-			$this->logger
-		);
-	}
-
-	public function testMarkNonWipableTokenForWipe(): void {
-		$token = $this->createMock(IToken::class);
-		$result = $this->remoteWipe->markTokenForWipe($token);
-		$this->assertFalse($result);
-	}
-
-	public function testMarkTokenForWipe(): void {
-		$token = $this->createMock(IWipeableToken::class);
-		$token->expects($this->once())
-			->method('wipe');
-
-		$this->tokenProvider->expects($this->once())
-			->method('updateToken')
-			->with($token);
-
-		$result = $this->remoteWipe->markTokenForWipe($token);
-		$this->assertTrue($result);
-	}
-
-	public function testMarkAllTokensForWipeNoWipeableToken(): void {
-		/** @var IUser|MockObject $user */
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('user123');
-		$token1 = $this->createMock(IToken::class);
-		$token2 = $this->createMock(IToken::class);
-		$this->tokenProvider->expects($this->once())
-			->method('getTokenByUser')
-			->with('user123')
-			->willReturn([$token1, $token2]);
-
-		$result = $this->remoteWipe->markAllTokensForWipe($user);
-
-		$this->assertFalse($result);
-	}
-
-	public function testMarkAllTokensForWipe(): void {
-		/** @var IUser|MockObject $user */
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('user123');
-		$token1 = $this->createMock(IToken::class);
-		$token2 = $this->createMock(IWipeableToken::class);
-		$this->tokenProvider->expects($this->once())
-			->method('getTokenByUser')
-			->with('user123')
-			->willReturn([$token1, $token2]);
-		$token2->expects($this->once())
-			->method('wipe');
-		$this->tokenProvider->expects($this->once())
-			->method('updateToken')
-			->with($token2);
-
-		$result = $this->remoteWipe->markAllTokensForWipe($user);
-
-		$this->assertTrue($result);
-	}
-
-	public function testStartWipingNotAWipeToken(): void {
-		$token = $this->createMock(IToken::class);
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->with('tk1')
-			->willReturn($token);
-		$this->eventDispatcher->expects($this->never())
-			->method('dispatch');
-
-		$result = $this->remoteWipe->start('tk1');
-
-		$this->assertFalse($result);
-	}
-
-	public function testStartWiping(): void {
-		$token = $this->createMock(IToken::class);
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->with('tk1')
-			->willThrowException(new WipeTokenException($token));
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatch');
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatch')
-			->with(RemoteWipeStarted::class, $this->equalTo(new RemoteWipeStarted($token)));
-
-		$result = $this->remoteWipe->start('tk1');
-
-		$this->assertTrue($result);
-	}
-
-	public function testFinishWipingNotAWipeToken(): void {
-		$token = $this->createMock(IToken::class);
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->with('tk1')
-			->willReturn($token);
-		$this->eventDispatcher->expects($this->never())
-			->method('dispatch');
-
-		$result = $this->remoteWipe->finish('tk1');
-
-		$this->assertFalse($result);
-	}
-
-	public function startFinishWiping() {
-		$token = $this->createMock(IToken::class);
-		$this->tokenProvider->expects($this->once())
-			->method('getToken')
-			->with('tk1')
-			->willThrowException(new WipeTokenException($token));
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatch');
-		$this->tokenProvider->expects($this->once())
-			->method('invalidateToken')
-			->with($token);
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatch')
-			->with(RemoteWipeFinished::class, $this->equalTo(new RemoteWipeFinished($token)));
-
-		$result = $this->remoteWipe->finish('tk1');
-
-		$this->assertTrue($result);
-	}
+    /** @var ITokenProvider|MockObject */
+    private $tokenProvider;
+
+    /** @var IEventDispatcher|MockObject */
+    private $eventDispatcher;
+
+    /** @var LoggerInterface|MockObject */
+    private $logger;
+
+    /** @var RemoteWipe */
+    private $remoteWipe;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->tokenProvider = $this->createMock(IProvider::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->remoteWipe = new RemoteWipe(
+            $this->tokenProvider,
+            $this->eventDispatcher,
+            $this->logger
+        );
+    }
+
+    public function testMarkNonWipableTokenForWipe(): void {
+        $token = $this->createMock(IToken::class);
+        $result = $this->remoteWipe->markTokenForWipe($token);
+        $this->assertFalse($result);
+    }
+
+    public function testMarkTokenForWipe(): void {
+        $token = $this->createMock(IWipeableToken::class);
+        $token->expects($this->once())
+            ->method('wipe');
+
+        $this->tokenProvider->expects($this->once())
+            ->method('updateToken')
+            ->with($token);
+
+        $result = $this->remoteWipe->markTokenForWipe($token);
+        $this->assertTrue($result);
+    }
+
+    public function testMarkAllTokensForWipeNoWipeableToken(): void {
+        /** @var IUser|MockObject $user */
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('user123');
+        $token1 = $this->createMock(IToken::class);
+        $token2 = $this->createMock(IToken::class);
+        $this->tokenProvider->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('user123')
+            ->willReturn([$token1, $token2]);
+
+        $result = $this->remoteWipe->markAllTokensForWipe($user);
+
+        $this->assertFalse($result);
+    }
+
+    public function testMarkAllTokensForWipe(): void {
+        /** @var IUser|MockObject $user */
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('user123');
+        $token1 = $this->createMock(IToken::class);
+        $token2 = $this->createMock(IWipeableToken::class);
+        $this->tokenProvider->expects($this->once())
+            ->method('getTokenByUser')
+            ->with('user123')
+            ->willReturn([$token1, $token2]);
+        $token2->expects($this->once())
+            ->method('wipe');
+        $this->tokenProvider->expects($this->once())
+            ->method('updateToken')
+            ->with($token2);
+
+        $result = $this->remoteWipe->markAllTokensForWipe($user);
+
+        $this->assertTrue($result);
+    }
+
+    public function testStartWipingNotAWipeToken(): void {
+        $token = $this->createMock(IToken::class);
+        $this->tokenProvider->expects($this->once())
+            ->method('getToken')
+            ->with('tk1')
+            ->willReturn($token);
+        $this->eventDispatcher->expects($this->never())
+            ->method('dispatch');
+
+        $result = $this->remoteWipe->start('tk1');
+
+        $this->assertFalse($result);
+    }
+
+    public function testStartWiping(): void {
+        $token = $this->createMock(IToken::class);
+        $this->tokenProvider->expects($this->once())
+            ->method('getToken')
+            ->with('tk1')
+            ->willThrowException(new WipeTokenException($token));
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatch');
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(RemoteWipeStarted::class, $this->equalTo(new RemoteWipeStarted($token)));
+
+        $result = $this->remoteWipe->start('tk1');
+
+        $this->assertTrue($result);
+    }
+
+    public function testFinishWipingNotAWipeToken(): void {
+        $token = $this->createMock(IToken::class);
+        $this->tokenProvider->expects($this->once())
+            ->method('getToken')
+            ->with('tk1')
+            ->willReturn($token);
+        $this->eventDispatcher->expects($this->never())
+            ->method('dispatch');
+
+        $result = $this->remoteWipe->finish('tk1');
+
+        $this->assertFalse($result);
+    }
+
+    public function startFinishWiping() {
+        $token = $this->createMock(IToken::class);
+        $this->tokenProvider->expects($this->once())
+            ->method('getToken')
+            ->with('tk1')
+            ->willThrowException(new WipeTokenException($token));
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatch');
+        $this->tokenProvider->expects($this->once())
+            ->method('invalidateToken')
+            ->with($token);
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatch')
+            ->with(RemoteWipeFinished::class, $this->equalTo(new RemoteWipeFinished($token)));
+
+        $result = $this->remoteWipe->finish('tk1');
+
+        $this->assertTrue($result);
+    }
 }

tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php

Indentation +76 added lines, -76 removed lines

@@ -11,80 +11,80 @@
 use Test\TestCase;
 
 class LinkActionTest extends TestCase {
-	private LinkAction $action;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->action = new LinkAction();
-	}
-
-	public function testSetIcon(): void {
-		$icon = 'icon-test';
-
-		$this->action->setIcon($icon);
-		$json = $this->action->jsonSerialize();
-
-		$this->assertArrayHasKey('icon', $json);
-		$this->assertEquals($json['icon'], $icon);
-	}
-
-	public function testGetSetName(): void {
-		$name = 'Jane Doe';
-
-		$this->assertEmpty($this->action->getName());
-		$this->action->setName($name);
-		$this->assertEquals($name, $this->action->getName());
-	}
-
-	public function testGetSetPriority(): void {
-		$prio = 50;
-
-		$this->assertEquals(10, $this->action->getPriority());
-		$this->action->setPriority($prio);
-		$this->assertEquals($prio, $this->action->getPriority());
-	}
-
-	public function testSetHref(): void {
-		$this->action->setHref('/some/url');
-
-		$json = $this->action->jsonSerialize();
-		$this->assertArrayHasKey('hyperlink', $json);
-		$this->assertEquals('/some/url', $json['hyperlink']);
-	}
-
-	public function testJsonSerialize(): void {
-		$this->action->setIcon('icon-contacts');
-		$this->action->setName('Nickie Works');
-		$this->action->setPriority(33);
-		$this->action->setHref('example.com');
-		$this->action->setAppId('contacts');
-		$expected = [
-			'title' => 'Nickie Works',
-			'icon' => 'icon-contacts',
-			'hyperlink' => 'example.com',
-			'appId' => 'contacts',
-		];
-
-		$json = $this->action->jsonSerialize();
-
-		$this->assertEquals($expected, $json);
-	}
-
-	public function testJsonSerializeNoAppName(): void {
-		$this->action->setIcon('icon-contacts');
-		$this->action->setName('Nickie Works');
-		$this->action->setPriority(33);
-		$this->action->setHref('example.com');
-		$expected = [
-			'title' => 'Nickie Works',
-			'icon' => 'icon-contacts',
-			'hyperlink' => 'example.com',
-			'appId' => '',
-		];
-
-		$json = $this->action->jsonSerialize();
-
-		$this->assertEquals($expected, $json);
-	}
+    private LinkAction $action;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->action = new LinkAction();
+    }
+
+    public function testSetIcon(): void {
+        $icon = 'icon-test';
+
+        $this->action->setIcon($icon);
+        $json = $this->action->jsonSerialize();
+
+        $this->assertArrayHasKey('icon', $json);
+        $this->assertEquals($json['icon'], $icon);
+    }
+
+    public function testGetSetName(): void {
+        $name = 'Jane Doe';
+
+        $this->assertEmpty($this->action->getName());
+        $this->action->setName($name);
+        $this->assertEquals($name, $this->action->getName());
+    }
+
+    public function testGetSetPriority(): void {
+        $prio = 50;
+
+        $this->assertEquals(10, $this->action->getPriority());
+        $this->action->setPriority($prio);
+        $this->assertEquals($prio, $this->action->getPriority());
+    }
+
+    public function testSetHref(): void {
+        $this->action->setHref('/some/url');
+
+        $json = $this->action->jsonSerialize();
+        $this->assertArrayHasKey('hyperlink', $json);
+        $this->assertEquals('/some/url', $json['hyperlink']);
+    }
+
+    public function testJsonSerialize(): void {
+        $this->action->setIcon('icon-contacts');
+        $this->action->setName('Nickie Works');
+        $this->action->setPriority(33);
+        $this->action->setHref('example.com');
+        $this->action->setAppId('contacts');
+        $expected = [
+            'title' => 'Nickie Works',
+            'icon' => 'icon-contacts',
+            'hyperlink' => 'example.com',
+            'appId' => 'contacts',
+        ];
+
+        $json = $this->action->jsonSerialize();
+
+        $this->assertEquals($expected, $json);
+    }
+
+    public function testJsonSerializeNoAppName(): void {
+        $this->action->setIcon('icon-contacts');
+        $this->action->setName('Nickie Works');
+        $this->action->setPriority(33);
+        $this->action->setHref('example.com');
+        $expected = [
+            'title' => 'Nickie Works',
+            'icon' => 'icon-contacts',
+            'hyperlink' => 'example.com',
+            'appId' => '',
+        ];
+
+        $json = $this->action->jsonSerialize();
+
+        $this->assertEquals($expected, $json);
+    }
 }

tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php

Indentation +57 added lines, -57 removed lines

@@ -16,70 +16,70 @@
 use Test\TestCase;
 
 class EMailproviderTest extends TestCase {
-	/** @var IActionFactory|MockObject */
-	private $actionFactory;
+    /** @var IActionFactory|MockObject */
+    private $actionFactory;
 
-	/** @var IURLGenerator|MockObject */
-	private $urlGenerator;
+    /** @var IURLGenerator|MockObject */
+    private $urlGenerator;
 
-	private EMailProvider $provider;
+    private EMailProvider $provider;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->actionFactory = $this->createMock(IActionFactory::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->actionFactory = $this->createMock(IActionFactory::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
 
-		$this->provider = new EMailProvider($this->actionFactory, $this->urlGenerator);
-	}
+        $this->provider = new EMailProvider($this->actionFactory, $this->urlGenerator);
+    }
 
-	public function testProcess(): void {
-		$entry = $this->createMock(IEntry::class);
-		$action = $this->createMock(ILinkAction::class);
-		$iconUrl = 'https://example.com/img/actions/icon.svg';
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->willReturn('img/actions/icon.svg');
-		$this->urlGenerator->expects($this->once())
-			->method('getAbsoluteURL')
-			->with('img/actions/icon.svg')
-			->willReturn($iconUrl);
-		$entry->expects($this->once())
-			->method('getEMailAddresses')
-			->willReturn([
-				'user@example.com',
-			]);
-		$this->actionFactory->expects($this->once())
-			->method('newEMailAction')
-			->with($this->equalTo($iconUrl), $this->equalTo('user@example.com'), $this->equalTo('user@example.com'))
-			->willReturn($action);
-		$entry->expects($this->once())
-			->method('addAction')
-			->with($action);
+    public function testProcess(): void {
+        $entry = $this->createMock(IEntry::class);
+        $action = $this->createMock(ILinkAction::class);
+        $iconUrl = 'https://example.com/img/actions/icon.svg';
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->willReturn('img/actions/icon.svg');
+        $this->urlGenerator->expects($this->once())
+            ->method('getAbsoluteURL')
+            ->with('img/actions/icon.svg')
+            ->willReturn($iconUrl);
+        $entry->expects($this->once())
+            ->method('getEMailAddresses')
+            ->willReturn([
+                'user@example.com',
+            ]);
+        $this->actionFactory->expects($this->once())
+            ->method('newEMailAction')
+            ->with($this->equalTo($iconUrl), $this->equalTo('user@example.com'), $this->equalTo('user@example.com'))
+            ->willReturn($action);
+        $entry->expects($this->once())
+            ->method('addAction')
+            ->with($action);
 
-		$this->provider->process($entry);
-	}
+        $this->provider->process($entry);
+    }
 
-	public function testProcessEmptyAddress(): void {
-		$entry = $this->createMock(IEntry::class);
-		$iconUrl = 'https://example.com/img/actions/icon.svg';
-		$this->urlGenerator->expects($this->once())
-			->method('imagePath')
-			->willReturn('img/actions/icon.svg');
-		$this->urlGenerator->expects($this->once())
-			->method('getAbsoluteURL')
-			->with('img/actions/icon.svg')
-			->willReturn($iconUrl);
-		$entry->expects($this->once())
-			->method('getEMailAddresses')
-			->willReturn([
-				'',
-			]);
-		$this->actionFactory->expects($this->never())
-			->method('newEMailAction');
-		$entry->expects($this->never())
-			->method('addAction');
+    public function testProcessEmptyAddress(): void {
+        $entry = $this->createMock(IEntry::class);
+        $iconUrl = 'https://example.com/img/actions/icon.svg';
+        $this->urlGenerator->expects($this->once())
+            ->method('imagePath')
+            ->willReturn('img/actions/icon.svg');
+        $this->urlGenerator->expects($this->once())
+            ->method('getAbsoluteURL')
+            ->with('img/actions/icon.svg')
+            ->willReturn($iconUrl);
+        $entry->expects($this->once())
+            ->method('getEMailAddresses')
+            ->willReturn([
+                '',
+            ]);
+        $this->actionFactory->expects($this->never())
+            ->method('newEMailAction');
+        $entry->expects($this->never())
+            ->method('addAction');
 
-		$this->provider->process($entry);
-	}
+        $this->provider->process($entry);
+    }
 }

tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php

Indentation +99 added lines, -99 removed lines

@@ -22,103 +22,103 @@
 use Test\TestCase;
 
 class ActionProviderStoreTest extends TestCase {
-	/** @var IServerContainer|MockObject */
-	private $serverContainer;
-
-	/** @var IAppManager|MockObject */
-	private $appManager;
-
-	private ActionProviderStore $actionProviderStore;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->serverContainer = $this->createMock(IServerContainer::class);
-		$this->appManager = $this->createMock(AppManager::class);
-		$logger = $this->createMock(LoggerInterface::class);
-
-		$this->actionProviderStore = new ActionProviderStore($this->serverContainer, $this->appManager, $logger);
-	}
-
-	public function testGetProviders(): void {
-		$user = $this->createMock(IUser::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')
-			->with($user)
-			->willReturn(['contacts']);
-		$this->appManager->expects($this->once())
-			->method('getAppInfo')
-			->with('contacts')
-			->willReturn([
-				'contactsmenu' => [
-					'OCA\Contacts\Provider1',
-				],
-			]);
-		$this->serverContainer->expects($this->exactly(4))
-			->method('get')
-			->willReturnMap([
-				[ProfileProvider::class, $provider1],
-				[LocalTimeProvider::class, $provider2],
-				[EMailProvider::class, $provider3],
-				['OCA\Contacts\Provider1', $provider4]
-			]);
-
-		$providers = $this->actionProviderStore->getProviders($user);
-
-		$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(): void {
-		$user = $this->createMock(IUser::class);
-		$provider1 = $this->createMock(ProfileProvider::class);
-		$provider2 = $this->createMock(LocalTimeProvider::class);
-		$provider3 = $this->createMock(EMailProvider::class);
-
-		$this->appManager->expects($this->once())
-			->method('getEnabledAppsForUser')
-			->with($user)
-			->willReturn(['contacts']);
-		$this->appManager->expects($this->once())
-			->method('getAppInfo')
-			->with('contacts')
-			->willReturn([/* Empty info.xml */]);
-		$this->serverContainer->expects($this->exactly(3))
-			->method('get')
-			->willReturnMap([
-				[ProfileProvider::class, $provider1],
-				[LocalTimeProvider::class, $provider2],
-				[EMailProvider::class, $provider3],
-			]);
-
-		$providers = $this->actionProviderStore->getProviders($user);
-
-		$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(): void {
-		$this->expectException(\Exception::class);
-
-		$user = $this->createMock(IUser::class);
-		$this->appManager->expects($this->once())
-			->method('getEnabledAppsForUser')
-			->with($user)
-			->willReturn([]);
-		$this->serverContainer->expects($this->once())
-			->method('get')
-			->willThrowException(new QueryException());
-
-		$this->actionProviderStore->getProviders($user);
-	}
+    /** @var IServerContainer|MockObject */
+    private $serverContainer;
+
+    /** @var IAppManager|MockObject */
+    private $appManager;
+
+    private ActionProviderStore $actionProviderStore;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->serverContainer = $this->createMock(IServerContainer::class);
+        $this->appManager = $this->createMock(AppManager::class);
+        $logger = $this->createMock(LoggerInterface::class);
+
+        $this->actionProviderStore = new ActionProviderStore($this->serverContainer, $this->appManager, $logger);
+    }
+
+    public function testGetProviders(): void {
+        $user = $this->createMock(IUser::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')
+            ->with($user)
+            ->willReturn(['contacts']);
+        $this->appManager->expects($this->once())
+            ->method('getAppInfo')
+            ->with('contacts')
+            ->willReturn([
+                'contactsmenu' => [
+                    'OCA\Contacts\Provider1',
+                ],
+            ]);
+        $this->serverContainer->expects($this->exactly(4))
+            ->method('get')
+            ->willReturnMap([
+                [ProfileProvider::class, $provider1],
+                [LocalTimeProvider::class, $provider2],
+                [EMailProvider::class, $provider3],
+                ['OCA\Contacts\Provider1', $provider4]
+            ]);
+
+        $providers = $this->actionProviderStore->getProviders($user);
+
+        $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(): void {
+        $user = $this->createMock(IUser::class);
+        $provider1 = $this->createMock(ProfileProvider::class);
+        $provider2 = $this->createMock(LocalTimeProvider::class);
+        $provider3 = $this->createMock(EMailProvider::class);
+
+        $this->appManager->expects($this->once())
+            ->method('getEnabledAppsForUser')
+            ->with($user)
+            ->willReturn(['contacts']);
+        $this->appManager->expects($this->once())
+            ->method('getAppInfo')
+            ->with('contacts')
+            ->willReturn([/* Empty info.xml */]);
+        $this->serverContainer->expects($this->exactly(3))
+            ->method('get')
+            ->willReturnMap([
+                [ProfileProvider::class, $provider1],
+                [LocalTimeProvider::class, $provider2],
+                [EMailProvider::class, $provider3],
+            ]);
+
+        $providers = $this->actionProviderStore->getProviders($user);
+
+        $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(): void {
+        $this->expectException(\Exception::class);
+
+        $user = $this->createMock(IUser::class);
+        $this->appManager->expects($this->once())
+            ->method('getEnabledAppsForUser')
+            ->with($user)
+            ->willReturn([]);
+        $this->serverContainer->expects($this->once())
+            ->method('get')
+            ->willThrowException(new QueryException());
+
+        $this->actionProviderStore->getProviders($user);
+    }
 }

tests/lib/Contacts/ContactsMenu/EntryTest.php

Indentation +89 added lines, -89 removed lines

@@ -12,93 +12,93 @@
 use Test\TestCase;
 
 class EntryTest extends TestCase {
-	private Entry $entry;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->entry = new Entry();
-	}
-
-	public function testSetId(): void {
-		$this->entry->setId(123);
-		$this->addToAssertionCount(1);
-	}
-
-	public function testSetGetFullName(): void {
-		$fn = 'Danette Chaille';
-		$this->assertEquals('', $this->entry->getFullName());
-		$this->entry->setFullName($fn);
-		$this->assertEquals($fn, $this->entry->getFullName());
-	}
-
-	public function testAddGetEMailAddresses(): void {
-		$this->assertEmpty($this->entry->getEMailAddresses());
-		$this->entry->addEMailAddress('user@example.com');
-		$this->assertEquals(['user@example.com'], $this->entry->getEMailAddresses());
-	}
-
-	public function testAddAndSortAction(): void {
-		// Three actions, two with equal priority
-		$action1 = new LinkAction();
-		$action2 = new LinkAction();
-		$action3 = new LinkAction();
-		$action1->setPriority(10);
-		$action1->setName('Bravo');
-
-		$action2->setPriority(0);
-		$action2->setName('Batman');
-
-		$action3->setPriority(10);
-		$action3->setName('Alfa');
-
-		$this->entry->addAction($action1);
-		$this->entry->addAction($action2);
-		$this->entry->addAction($action3);
-		$sorted = $this->entry->getActions();
-
-		$this->assertSame($action3, $sorted[0]);
-		$this->assertSame($action1, $sorted[1]);
-		$this->assertSame($action2, $sorted[2]);
-	}
-
-	public function testSetGetProperties(): void {
-		$props = [
-			'prop1' => 123,
-			'prop2' => 'string',
-		];
-
-		$this->entry->setProperties($props);
-
-		$this->assertNull($this->entry->getProperty('doesntexist'));
-		$this->assertEquals(123, $this->entry->getProperty('prop1'));
-		$this->assertEquals('string', $this->entry->getProperty('prop2'));
-	}
-
-	public function testJsonSerialize(): void {
-		$expectedJson = [
-			'id' => '123',
-			'fullName' => 'Guadalupe Frisbey',
-			'topAction' => null,
-			'actions' => [],
-			'lastMessage' => '',
-			'avatar' => null,
-			'emailAddresses' => ['user@example.com'],
-			'profileTitle' => null,
-			'profileUrl' => null,
-			'status' => null,
-			'statusMessage' => null,
-			'statusMessageTimestamp' => null,
-			'statusIcon' => null,
-			'isUser' => false,
-			'uid' => null,
-		];
-
-		$this->entry->setId(123);
-		$this->entry->setFullName('Guadalupe Frisbey');
-		$this->entry->addEMailAddress('user@example.com');
-		$json = $this->entry->jsonSerialize();
-
-		$this->assertEquals($expectedJson, $json);
-	}
+    private Entry $entry;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->entry = new Entry();
+    }
+
+    public function testSetId(): void {
+        $this->entry->setId(123);
+        $this->addToAssertionCount(1);
+    }
+
+    public function testSetGetFullName(): void {
+        $fn = 'Danette Chaille';
+        $this->assertEquals('', $this->entry->getFullName());
+        $this->entry->setFullName($fn);
+        $this->assertEquals($fn, $this->entry->getFullName());
+    }
+
+    public function testAddGetEMailAddresses(): void {
+        $this->assertEmpty($this->entry->getEMailAddresses());
+        $this->entry->addEMailAddress('user@example.com');
+        $this->assertEquals(['user@example.com'], $this->entry->getEMailAddresses());
+    }
+
+    public function testAddAndSortAction(): void {
+        // Three actions, two with equal priority
+        $action1 = new LinkAction();
+        $action2 = new LinkAction();
+        $action3 = new LinkAction();
+        $action1->setPriority(10);
+        $action1->setName('Bravo');
+
+        $action2->setPriority(0);
+        $action2->setName('Batman');
+
+        $action3->setPriority(10);
+        $action3->setName('Alfa');
+
+        $this->entry->addAction($action1);
+        $this->entry->addAction($action2);
+        $this->entry->addAction($action3);
+        $sorted = $this->entry->getActions();
+
+        $this->assertSame($action3, $sorted[0]);
+        $this->assertSame($action1, $sorted[1]);
+        $this->assertSame($action2, $sorted[2]);
+    }
+
+    public function testSetGetProperties(): void {
+        $props = [
+            'prop1' => 123,
+            'prop2' => 'string',
+        ];
+
+        $this->entry->setProperties($props);
+
+        $this->assertNull($this->entry->getProperty('doesntexist'));
+        $this->assertEquals(123, $this->entry->getProperty('prop1'));
+        $this->assertEquals('string', $this->entry->getProperty('prop2'));
+    }
+
+    public function testJsonSerialize(): void {
+        $expectedJson = [
+            'id' => '123',
+            'fullName' => 'Guadalupe Frisbey',
+            'topAction' => null,
+            'actions' => [],
+            'lastMessage' => '',
+            'avatar' => null,
+            'emailAddresses' => ['user@example.com'],
+            'profileTitle' => null,
+            'profileUrl' => null,
+            'status' => null,
+            'statusMessage' => null,
+            'statusMessageTimestamp' => null,
+            'statusIcon' => null,
+            'isUser' => false,
+            'uid' => null,
+        ];
+
+        $this->entry->setId(123);
+        $this->entry->setFullName('Guadalupe Frisbey');
+        $this->entry->addEMailAddress('user@example.com');
+        $json = $this->entry->jsonSerialize();
+
+        $this->assertEquals($expectedJson, $json);
+    }
 }

tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php

Indentation +24 added lines, -24 removed lines

@@ -12,36 +12,36 @@
 use Test\TestCase;
 
 class ActionFactoryTest extends TestCase {
-	private ActionFactory $actionFactory;
+    private ActionFactory $actionFactory;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->actionFactory = new ActionFactory();
-	}
+        $this->actionFactory = new ActionFactory();
+    }
 
-	public function testNewLinkAction(): void {
-		$icon = 'icon-test';
-		$name = 'Test';
-		$href = 'some/url';
+    public function testNewLinkAction(): void {
+        $icon = 'icon-test';
+        $name = 'Test';
+        $href = 'some/url';
 
-		$action = $this->actionFactory->newLinkAction($icon, $name, $href);
+        $action = $this->actionFactory->newLinkAction($icon, $name, $href);
 
-		$this->assertInstanceOf(IAction::class, $action);
-		$this->assertEquals($name, $action->getName());
-		$this->assertEquals(10, $action->getPriority());
-	}
+        $this->assertInstanceOf(IAction::class, $action);
+        $this->assertEquals($name, $action->getName());
+        $this->assertEquals(10, $action->getPriority());
+    }
 
-	public function testNewEMailAction(): void {
-		$icon = 'icon-test';
-		$name = 'Test';
-		$href = 'user@example.com';
+    public function testNewEMailAction(): void {
+        $icon = 'icon-test';
+        $name = 'Test';
+        $href = 'user@example.com';
 
-		$action = $this->actionFactory->newEMailAction($icon, $name, $href);
+        $action = $this->actionFactory->newEMailAction($icon, $name, $href);
 
-		$this->assertInstanceOf(IAction::class, $action);
-		$this->assertEquals($name, $action->getName());
-		$this->assertEquals(10, $action->getPriority());
-		$this->assertEquals('mailto:user@example.com', $action->getHref());
-	}
+        $this->assertInstanceOf(IAction::class, $action);
+        $this->assertEquals($name, $action->getName());
+        $this->assertEquals(10, $action->getPriority());
+        $this->assertEquals('mailto:user@example.com', $action->getHref());
+    }
 }

tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php

Indentation +198 added lines, -198 removed lines

@@ -21,202 +21,202 @@
  * @group DB
  */
 class PartitionedQueryBuilderTest extends TestCase {
-	private IDBConnection $connection;
-	private ShardConnectionManager $shardConnectionManager;
-	private AutoIncrementHandler $autoIncrementHandler;
-
-	protected function setUp(): void {
-		if (PHP_INT_SIZE < 8) {
-			$this->markTestSkipped('Test requires 64bit');
-		}
-		$this->connection = Server::get(IDBConnection::class);
-		$this->shardConnectionManager = Server::get(ShardConnectionManager::class);
-		$this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
-
-		$this->setupFileCache();
-	}
-
-	protected function tearDown(): void {
-		$this->cleanupDb();
-		parent::tearDown();
-	}
-
-
-	private function getQueryBuilder(): PartitionedQueryBuilder {
-		$builder = $this->connection->getQueryBuilder();
-		if ($builder instanceof PartitionedQueryBuilder) {
-			return $builder;
-		} else {
-			return new PartitionedQueryBuilder($builder, [], $this->shardConnectionManager, $this->autoIncrementHandler);
-		}
-	}
-
-	private function setupFileCache(): void {
-		$this->cleanupDb();
-		$query = $this->getQueryBuilder();
-		$query->insert('storages')
-			->values([
-				'numeric_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'id' => $query->createNamedParameter('test1'),
-			]);
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('filecache')
-			->values([
-				'storage' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'path' => $query->createNamedParameter('file1'),
-				'path_hash' => $query->createNamedParameter(md5('file1')),
-			]);
-		$query->executeStatement();
-		$fileId = $query->getLastInsertId();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('filecache_extended')
-			->hintShardKey('storage', 1001001)
-			->values([
-				'fileid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-				'upload_time' => $query->createNamedParameter(1234, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->insert('mounts')
-			->values([
-				'storage_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
-				'user_id' => $query->createNamedParameter('partitioned_test'),
-				'mount_point' => $query->createNamedParameter('/mount/point'),
-				'mount_provider_class' => $query->createNamedParameter('test'),
-				'root_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
-			]);
-		$query->executeStatement();
-	}
-
-	private function cleanupDb(): void {
-		$query = $this->getQueryBuilder();
-		$query->delete('storages')
-			->where($query->expr()->gt('numeric_id', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)));
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('filecache')
-			->where($query->expr()->gt('storage', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)))
-			->runAcrossAllShards();
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('filecache_extended')
-			->runAcrossAllShards();
-		$query->executeStatement();
-
-		$query = $this->getQueryBuilder();
-		$query->delete('mounts')
-			->where($query->expr()->like('user_id', $query->createNamedParameter('partitioned_%')));
-		$query->executeStatement();
-	}
-
-	public function testSimpleOnlyPartitionQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('path')
-			->from('filecache')
-			->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testSimplePartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testMultiTablePartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
-
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class', 'fe.upload_time')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->innerJoin('f', 'filecache_extended', 'fe', $builder->expr()->eq('f.fileid', 'fe.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-		$this->assertEquals($results[0]['upload_time'], 1234);
-	}
-
-	public function testPartitionedQueryFromSplit(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		$query = $builder->select('storage', 'm.root_id', 'm.user_id', 'm.mount_point', 'm.mount_id', 'path', 'm.mount_provider_class')
-			->from('filecache', 'f')
-			->innerJoin('f', 'mounts', 'm', $builder->expr()->eq('m.root_id', 'f.fileid'));
-		$query->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('m.user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(2, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-	}
-
-	public function testMultiJoinPartitionedQuery(): void {
-		$builder = $this->getQueryBuilder();
-		$builder->addPartition(new PartitionSplit('filecache', ['filecache']));
-
-		// query borrowed from UserMountCache
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->selectAlias('s.id', 'storage_string_id')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->innerJoin('f', 'storages', 's', $builder->expr()->eq('f.storage', 's.numeric_id'))
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
-
-		$query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
-
-		$this->assertEquals(3, $query->getPartitionCount());
-
-		$results = $query->executeQuery()->fetchAll();
-		$this->assertCount(1, $results);
-		$this->assertEquals($results[0]['user_id'], 'partitioned_test');
-		$this->assertEquals($results[0]['mount_point'], '/mount/point');
-		$this->assertEquals($results[0]['mount_provider_class'], 'test');
-		$this->assertEquals($results[0]['path'], 'file1');
-		$this->assertEquals($results[0]['storage_string_id'], 'test1');
-	}
+    private IDBConnection $connection;
+    private ShardConnectionManager $shardConnectionManager;
+    private AutoIncrementHandler $autoIncrementHandler;
+
+    protected function setUp(): void {
+        if (PHP_INT_SIZE < 8) {
+            $this->markTestSkipped('Test requires 64bit');
+        }
+        $this->connection = Server::get(IDBConnection::class);
+        $this->shardConnectionManager = Server::get(ShardConnectionManager::class);
+        $this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
+
+        $this->setupFileCache();
+    }
+
+    protected function tearDown(): void {
+        $this->cleanupDb();
+        parent::tearDown();
+    }
+
+
+    private function getQueryBuilder(): PartitionedQueryBuilder {
+        $builder = $this->connection->getQueryBuilder();
+        if ($builder instanceof PartitionedQueryBuilder) {
+            return $builder;
+        } else {
+            return new PartitionedQueryBuilder($builder, [], $this->shardConnectionManager, $this->autoIncrementHandler);
+        }
+    }
+
+    private function setupFileCache(): void {
+        $this->cleanupDb();
+        $query = $this->getQueryBuilder();
+        $query->insert('storages')
+            ->values([
+                'numeric_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'id' => $query->createNamedParameter('test1'),
+            ]);
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('filecache')
+            ->values([
+                'storage' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'path' => $query->createNamedParameter('file1'),
+                'path_hash' => $query->createNamedParameter(md5('file1')),
+            ]);
+        $query->executeStatement();
+        $fileId = $query->getLastInsertId();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('filecache_extended')
+            ->hintShardKey('storage', 1001001)
+            ->values([
+                'fileid' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+                'upload_time' => $query->createNamedParameter(1234, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->insert('mounts')
+            ->values([
+                'storage_id' => $query->createNamedParameter(1001001, IQueryBuilder::PARAM_INT),
+                'user_id' => $query->createNamedParameter('partitioned_test'),
+                'mount_point' => $query->createNamedParameter('/mount/point'),
+                'mount_provider_class' => $query->createNamedParameter('test'),
+                'root_id' => $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT),
+            ]);
+        $query->executeStatement();
+    }
+
+    private function cleanupDb(): void {
+        $query = $this->getQueryBuilder();
+        $query->delete('storages')
+            ->where($query->expr()->gt('numeric_id', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)));
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('filecache')
+            ->where($query->expr()->gt('storage', $query->createNamedParameter(1000000, IQueryBuilder::PARAM_INT)))
+            ->runAcrossAllShards();
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('filecache_extended')
+            ->runAcrossAllShards();
+        $query->executeStatement();
+
+        $query = $this->getQueryBuilder();
+        $query->delete('mounts')
+            ->where($query->expr()->like('user_id', $query->createNamedParameter('partitioned_%')));
+        $query->executeStatement();
+    }
+
+    public function testSimpleOnlyPartitionQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('path')
+            ->from('filecache')
+            ->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testSimplePartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testMultiTablePartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache', 'filecache_extended']));
+
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class', 'fe.upload_time')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->innerJoin('f', 'filecache_extended', 'fe', $builder->expr()->eq('f.fileid', 'fe.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+        $this->assertEquals($results[0]['upload_time'], 1234);
+    }
+
+    public function testPartitionedQueryFromSplit(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        $query = $builder->select('storage', 'm.root_id', 'm.user_id', 'm.mount_point', 'm.mount_id', 'path', 'm.mount_provider_class')
+            ->from('filecache', 'f')
+            ->innerJoin('f', 'mounts', 'm', $builder->expr()->eq('m.root_id', 'f.fileid'));
+        $query->where($builder->expr()->eq('storage', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('m.user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(2, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+    }
+
+    public function testMultiJoinPartitionedQuery(): void {
+        $builder = $this->getQueryBuilder();
+        $builder->addPartition(new PartitionSplit('filecache', ['filecache']));
+
+        // query borrowed from UserMountCache
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->selectAlias('s.id', 'storage_string_id')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->innerJoin('f', 'storages', 's', $builder->expr()->eq('f.storage', 's.numeric_id'))
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter(1001001, IQueryBuilder::PARAM_INT)));
+
+        $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter('partitioned_test')));
+
+        $this->assertEquals(3, $query->getPartitionCount());
+
+        $results = $query->executeQuery()->fetchAll();
+        $this->assertCount(1, $results);
+        $this->assertEquals($results[0]['user_id'], 'partitioned_test');
+        $this->assertEquals($results[0]['mount_point'], '/mount/point');
+        $this->assertEquals($results[0]['mount_provider_class'], 'test');
+        $this->assertEquals($results[0]['path'], 'file1');
+        $this->assertEquals($results[0]['storage_string_id'], 'test1');
+    }
 }

tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php

Indentation +102 added lines, -102 removed lines

@@ -23,106 +23,106 @@
  * @group DB
  */
 class SharedQueryBuilderTest extends TestCase {
-	private IDBConnection $connection;
-	private AutoIncrementHandler $autoIncrementHandler;
-
-	protected function setUp(): void {
-		if (PHP_INT_SIZE < 8) {
-			$this->markTestSkipped('Test requires 64bit');
-		}
-		$this->connection = Server::get(IDBConnection::class);
-		$this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
-	}
-
-
-	private function getQueryBuilder(string $table, string $shardColumn, string $primaryColumn, array $companionTables = []): ShardedQueryBuilder {
-		return new ShardedQueryBuilder(
-			$this->connection->getQueryBuilder(),
-			[
-				new ShardDefinition($table, $primaryColumn, [], $shardColumn, new RoundRobinShardMapper(), $companionTables, [], 0, 0),
-			],
-			$this->createMock(ShardConnectionManager::class),
-			$this->autoIncrementHandler,
-		);
-	}
-
-	public function testGetShardKeySingleParam(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('fileid', 'path')
-			->from('filecache')
-			->where($query->expr()->eq('storage', $query->createNamedParameter(10, IQueryBuilder::PARAM_INT)));
-
-		$this->assertEquals([], $query->getPrimaryKeys());
-		$this->assertEquals([10], $query->getShardKeys());
-	}
-
-	public function testGetPrimaryKeyParam(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('fileid', 'path')
-			->from('filecache')
-			->where($query->expr()->in('fileid', $query->createNamedParameter([10, 11], IQueryBuilder::PARAM_INT)));
-
-		$this->assertEquals([10, 11], $query->getPrimaryKeys());
-		$this->assertEquals([], $query->getShardKeys());
-	}
-
-	public function testValidateWithShardKey(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('fileid', 'path')
-			->from('filecache')
-			->where($query->expr()->eq('storage', $query->createNamedParameter(10)));
-
-		$query->validate();
-		$this->assertTrue(true);
-	}
-
-	public function testValidateWithPrimaryKey(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('fileid', 'path')
-			->from('filecache')
-			->where($query->expr()->in('fileid', $query->createNamedParameter([10, 11], IQueryBuilder::PARAM_INT)));
-
-		$query->validate();
-		$this->assertTrue(true);
-	}
-
-	public function testValidateWithNoKey(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('fileid', 'path')
-			->from('filecache')
-			->where($query->expr()->lt('size', $query->createNamedParameter(0)));
-
-		$this->expectException(InvalidShardedQueryException::class);
-		$query->validate();
-		$this->fail('exception expected');
-	}
-
-	public function testValidateNonSharedTable(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('configvalue')
-			->from('appconfig')
-			->where($query->expr()->eq('configkey', $query->createNamedParameter('test')));
-
-		$query->validate();
-		$this->assertTrue(true);
-	}
-
-	public function testGetShardKeyMultipleSingleParam(): void {
-		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
-		$query->select('fileid', 'path')
-			->from('filecache')
-			->where($query->expr()->andX(
-				$query->expr()->gt('mtime', $query->createNamedParameter(0), IQueryBuilder::PARAM_INT),
-				$query->expr()->orX(
-					$query->expr()->eq('storage', $query->createNamedParameter(10, IQueryBuilder::PARAM_INT)),
-					$query->expr()->andX(
-						$query->expr()->eq('storage', $query->createNamedParameter(11, IQueryBuilder::PARAM_INT)),
-						$query->expr()->like('path', $query->createNamedParameter('foo/%'))
-					)
-				)
-			));
-
-		$this->assertEquals([], $query->getPrimaryKeys());
-		$this->assertEquals([10, 11], $query->getShardKeys());
-	}
+    private IDBConnection $connection;
+    private AutoIncrementHandler $autoIncrementHandler;
+
+    protected function setUp(): void {
+        if (PHP_INT_SIZE < 8) {
+            $this->markTestSkipped('Test requires 64bit');
+        }
+        $this->connection = Server::get(IDBConnection::class);
+        $this->autoIncrementHandler = Server::get(AutoIncrementHandler::class);
+    }
+
+
+    private function getQueryBuilder(string $table, string $shardColumn, string $primaryColumn, array $companionTables = []): ShardedQueryBuilder {
+        return new ShardedQueryBuilder(
+            $this->connection->getQueryBuilder(),
+            [
+                new ShardDefinition($table, $primaryColumn, [], $shardColumn, new RoundRobinShardMapper(), $companionTables, [], 0, 0),
+            ],
+            $this->createMock(ShardConnectionManager::class),
+            $this->autoIncrementHandler,
+        );
+    }
+
+    public function testGetShardKeySingleParam(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('fileid', 'path')
+            ->from('filecache')
+            ->where($query->expr()->eq('storage', $query->createNamedParameter(10, IQueryBuilder::PARAM_INT)));
+
+        $this->assertEquals([], $query->getPrimaryKeys());
+        $this->assertEquals([10], $query->getShardKeys());
+    }
+
+    public function testGetPrimaryKeyParam(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('fileid', 'path')
+            ->from('filecache')
+            ->where($query->expr()->in('fileid', $query->createNamedParameter([10, 11], IQueryBuilder::PARAM_INT)));
+
+        $this->assertEquals([10, 11], $query->getPrimaryKeys());
+        $this->assertEquals([], $query->getShardKeys());
+    }
+
+    public function testValidateWithShardKey(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('fileid', 'path')
+            ->from('filecache')
+            ->where($query->expr()->eq('storage', $query->createNamedParameter(10)));
+
+        $query->validate();
+        $this->assertTrue(true);
+    }
+
+    public function testValidateWithPrimaryKey(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('fileid', 'path')
+            ->from('filecache')
+            ->where($query->expr()->in('fileid', $query->createNamedParameter([10, 11], IQueryBuilder::PARAM_INT)));
+
+        $query->validate();
+        $this->assertTrue(true);
+    }
+
+    public function testValidateWithNoKey(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('fileid', 'path')
+            ->from('filecache')
+            ->where($query->expr()->lt('size', $query->createNamedParameter(0)));
+
+        $this->expectException(InvalidShardedQueryException::class);
+        $query->validate();
+        $this->fail('exception expected');
+    }
+
+    public function testValidateNonSharedTable(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('configvalue')
+            ->from('appconfig')
+            ->where($query->expr()->eq('configkey', $query->createNamedParameter('test')));
+
+        $query->validate();
+        $this->assertTrue(true);
+    }
+
+    public function testGetShardKeyMultipleSingleParam(): void {
+        $query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
+        $query->select('fileid', 'path')
+            ->from('filecache')
+            ->where($query->expr()->andX(
+                $query->expr()->gt('mtime', $query->createNamedParameter(0), IQueryBuilder::PARAM_INT),
+                $query->expr()->orX(
+                    $query->expr()->eq('storage', $query->createNamedParameter(10, IQueryBuilder::PARAM_INT)),
+                    $query->expr()->andX(
+                        $query->expr()->eq('storage', $query->createNamedParameter(11, IQueryBuilder::PARAM_INT)),
+                        $query->expr()->like('path', $query->createNamedParameter('foo/%'))
+                    )
+                )
+            ));
+
+        $this->assertEquals([], $query->getPrimaryKeys());
+        $this->assertEquals([10, 11], $query->getShardKeys());
+    }
 }