nextcloud / server

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());
+    }
 }

tests/lib/DB/ConnectionTest.php

Indentation +72 added lines, -72 removed lines

@@ -22,80 +22,80 @@
  */
 class ConnectionTest extends TestCase {
 
-	public function testSingleNodeConnectsToPrimaryOnly(): void {
-		$connectionParams = [
-			'user' => 'test',
-			'password' => 'topsecret',
-			'host' => 'test',
-		];
-		$adapter = $this->createMock(Adapter::class);
-		$driver = $this->createMock(Driver::class);
-		$configuration = $this->createMock(Configuration::class);
-		$connection = $this->getMockBuilder(Connection::class)
-			->onlyMethods(['connectTo'])
-			->setConstructorArgs([
-				[
-					'adapter' => $adapter,
-					'platform' => new MySQLPlatform(),
-					'tablePrefix' => 'nctest',
-					'primary' => $connectionParams,
-					'replica' => [
-						$connectionParams,
-					],
-				],
-				$driver,
-				$configuration,
-			])
-			->getMock();
-		$driverConnection = $this->createMock(DriverConnection::class);
-		$connection->expects(self::once())
-			->method('connectTo')
-			->with('primary')
-			->willReturn($driverConnection);
+    public function testSingleNodeConnectsToPrimaryOnly(): void {
+        $connectionParams = [
+            'user' => 'test',
+            'password' => 'topsecret',
+            'host' => 'test',
+        ];
+        $adapter = $this->createMock(Adapter::class);
+        $driver = $this->createMock(Driver::class);
+        $configuration = $this->createMock(Configuration::class);
+        $connection = $this->getMockBuilder(Connection::class)
+            ->onlyMethods(['connectTo'])
+            ->setConstructorArgs([
+                [
+                    'adapter' => $adapter,
+                    'platform' => new MySQLPlatform(),
+                    'tablePrefix' => 'nctest',
+                    'primary' => $connectionParams,
+                    'replica' => [
+                        $connectionParams,
+                    ],
+                ],
+                $driver,
+                $configuration,
+            ])
+            ->getMock();
+        $driverConnection = $this->createMock(DriverConnection::class);
+        $connection->expects(self::once())
+            ->method('connectTo')
+            ->with('primary')
+            ->willReturn($driverConnection);
 
-		$connection->ensureConnectedToReplica();
-		$connection->ensureConnectedToPrimary();
-		$connection->ensureConnectedToReplica();
-	}
+        $connection->ensureConnectedToReplica();
+        $connection->ensureConnectedToPrimary();
+        $connection->ensureConnectedToReplica();
+    }
 
-	public function testClusterConnectsToPrimaryAndReplica(): void {
-		$connectionParamsPrimary = [
-			'user' => 'test',
-			'password' => 'topsecret',
-			'host' => 'testprimary',
-		];
-		$connectionParamsReplica = [
-			'user' => 'test',
-			'password' => 'topsecret',
-			'host' => 'testreplica',
-		];
-		$adapter = $this->createMock(Adapter::class);
-		$driver = $this->createMock(Driver::class);
-		$configuration = $this->createMock(Configuration::class);
-		$connection = $this->getMockBuilder(Connection::class)
-			->onlyMethods(['connectTo'])
-			->setConstructorArgs([
-				[
-					'adapter' => $adapter,
-					'platform' => new MySQLPlatform(),
-					'tablePrefix' => 'nctest',
-					'primary' => $connectionParamsPrimary,
-					'replica' => [
-						$connectionParamsReplica,
-					],
-				],
-				$driver,
-				$configuration,
-			])
-			->getMock();
-		$driverConnection = $this->createMock(DriverConnection::class);
-		$connection->expects(self::exactly(2))
-			->method('connectTo')
-			->willReturn($driverConnection);
+    public function testClusterConnectsToPrimaryAndReplica(): void {
+        $connectionParamsPrimary = [
+            'user' => 'test',
+            'password' => 'topsecret',
+            'host' => 'testprimary',
+        ];
+        $connectionParamsReplica = [
+            'user' => 'test',
+            'password' => 'topsecret',
+            'host' => 'testreplica',
+        ];
+        $adapter = $this->createMock(Adapter::class);
+        $driver = $this->createMock(Driver::class);
+        $configuration = $this->createMock(Configuration::class);
+        $connection = $this->getMockBuilder(Connection::class)
+            ->onlyMethods(['connectTo'])
+            ->setConstructorArgs([
+                [
+                    'adapter' => $adapter,
+                    'platform' => new MySQLPlatform(),
+                    'tablePrefix' => 'nctest',
+                    'primary' => $connectionParamsPrimary,
+                    'replica' => [
+                        $connectionParamsReplica,
+                    ],
+                ],
+                $driver,
+                $configuration,
+            ])
+            ->getMock();
+        $driverConnection = $this->createMock(DriverConnection::class);
+        $connection->expects(self::exactly(2))
+            ->method('connectTo')
+            ->willReturn($driverConnection);
 
-		$connection->ensureConnectedToReplica();
-		$connection->ensureConnectedToPrimary();
-		$connection->ensureConnectedToReplica();
-	}
+        $connection->ensureConnectedToReplica();
+        $connection->ensureConnectedToPrimary();
+        $connection->ensureConnectedToReplica();
+    }
 
 }

tests/lib/Collaboration/Resources/ManagerTest.php

Indentation +25 added lines, -25 removed lines

@@ -18,29 +18,29 @@
 
 class ManagerTest extends TestCase {
 
-	protected LoggerInterface&MockObject $logger;
-	protected IProviderManager&MockObject $providerManager;
-	protected IManager $manager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->providerManager = $this->createMock(IProviderManager::class);
-
-		/** @var IDBConnection $connection */
-		$connection = $this->createMock(IDBConnection::class);
-		$this->manager = new Manager($connection, $this->providerManager, $this->logger);
-	}
-
-	public function testRegisterResourceProvider(): void {
-		$this->logger->expects($this->once())
-			->method('debug')
-			->with($this->equalTo('\OC\Collaboration\Resources\Manager::registerResourceProvider is deprecated'), $this->equalTo(['provider' => 'AwesomeResourceProvider']));
-		$this->providerManager->expects($this->once())
-			->method('registerResourceProvider')
-			->with($this->equalTo('AwesomeResourceProvider'));
-
-		$this->manager->registerResourceProvider('AwesomeResourceProvider');
-	}
+    protected LoggerInterface&MockObject $logger;
+    protected IProviderManager&MockObject $providerManager;
+    protected IManager $manager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->providerManager = $this->createMock(IProviderManager::class);
+
+        /** @var IDBConnection $connection */
+        $connection = $this->createMock(IDBConnection::class);
+        $this->manager = new Manager($connection, $this->providerManager, $this->logger);
+    }
+
+    public function testRegisterResourceProvider(): void {
+        $this->logger->expects($this->once())
+            ->method('debug')
+            ->with($this->equalTo('\OC\Collaboration\Resources\Manager::registerResourceProvider is deprecated'), $this->equalTo(['provider' => 'AwesomeResourceProvider']));
+        $this->providerManager->expects($this->once())
+            ->method('registerResourceProvider')
+            ->with($this->equalTo('AwesomeResourceProvider'));
+
+        $this->manager->registerResourceProvider('AwesomeResourceProvider');
+    }
 }

tests/lib/Session/Session.php

Indentation +45 added lines, -45 removed lines

@@ -9,58 +9,58 @@
 namespace Test\Session;
 
 abstract class Session extends \Test\TestCase {
-	/**
-	 * @var \OC\Session\Session
-	 */
-	protected $instance;
+    /**
+     * @var \OC\Session\Session
+     */
+    protected $instance;
 
-	protected function tearDown(): void {
-		$this->instance->clear();
-		parent::tearDown();
-	}
+    protected function tearDown(): void {
+        $this->instance->clear();
+        parent::tearDown();
+    }
 
-	public function testNotExistsEmpty(): void {
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testNotExistsEmpty(): void {
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testExistsAfterSet(): void {
-		$this->instance->set('foo', 1);
-		$this->assertTrue($this->instance->exists('foo'));
-	}
+    public function testExistsAfterSet(): void {
+        $this->instance->set('foo', 1);
+        $this->assertTrue($this->instance->exists('foo'));
+    }
 
-	public function testNotExistsAfterRemove(): void {
-		$this->instance->set('foo', 1);
-		$this->instance->remove('foo');
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testNotExistsAfterRemove(): void {
+        $this->instance->set('foo', 1);
+        $this->instance->remove('foo');
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testGetNonExisting(): void {
-		$this->assertNull($this->instance->get('foo'));
-	}
+    public function testGetNonExisting(): void {
+        $this->assertNull($this->instance->get('foo'));
+    }
 
-	public function testGetAfterSet(): void {
-		$this->instance->set('foo', 'bar');
-		$this->assertEquals('bar', $this->instance->get(('foo')));
-	}
+    public function testGetAfterSet(): void {
+        $this->instance->set('foo', 'bar');
+        $this->assertEquals('bar', $this->instance->get(('foo')));
+    }
 
-	public function testRemoveNonExisting(): void {
-		$this->assertFalse($this->instance->exists('foo'));
-		$this->instance->remove('foo');
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testRemoveNonExisting(): void {
+        $this->assertFalse($this->instance->exists('foo'));
+        $this->instance->remove('foo');
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testNotExistsAfterClear(): void {
-		$this->instance->set('foo', 1);
-		$this->instance->clear();
-		$this->assertFalse($this->instance->exists('foo'));
-	}
+    public function testNotExistsAfterClear(): void {
+        $this->instance->set('foo', 1);
+        $this->instance->clear();
+        $this->assertFalse($this->instance->exists('foo'));
+    }
 
-	public function testArrayInterface(): void {
-		$this->assertFalse(isset($this->instance['foo']));
-		$this->instance['foo'] = 'bar';
-		$this->assertTrue(isset($this->instance['foo']));
-		$this->assertEquals('bar', $this->instance['foo']);
-		unset($this->instance['foo']);
-		$this->assertFalse(isset($this->instance['foo']));
-	}
+    public function testArrayInterface(): void {
+        $this->assertFalse(isset($this->instance['foo']));
+        $this->instance['foo'] = 'bar';
+        $this->assertTrue(isset($this->instance['foo']));
+        $this->assertEquals('bar', $this->instance['foo']);
+        unset($this->instance['foo']);
+        $this->assertFalse(isset($this->instance['foo']));
+    }
 }

tests/lib/BackgroundJob/TestTimedJobNew.php

Indentation +8 added lines, -8 removed lines

@@ -13,14 +13,14 @@
 use OCP\BackgroundJob\TimedJob;
 
 class TestTimedJobNew extends TimedJob {
-	public bool $ran = false;
+    public bool $ran = false;
 
-	public function __construct(ITimeFactory $timeFactory) {
-		parent::__construct($timeFactory);
-		$this->setInterval(10);
-	}
+    public function __construct(ITimeFactory $timeFactory) {
+        parent::__construct($timeFactory);
+        $this->setInterval(10);
+    }
 
-	public function run($argument) {
-		$this->ran = true;
-	}
+    public function run($argument) {
+        $this->ran = true;
+    }
 }

tests/lib/App/AppStore/Bundles/EducationBundleTest.php

Indentation +15 added lines, -15 removed lines

@@ -9,19 +9,19 @@
 use OC\App\AppStore\Bundles\EducationBundle;
 
 class EducationBundleTest extends BundleBase {
-	protected function setUp(): void {
-		parent::setUp();
-		$this->bundle = new EducationBundle($this->l10n);
-		$this->bundleIdentifier = 'EducationBundle';
-		$this->bundleName = 'Education bundle';
-		$this->bundleAppIds = [
-			'dashboard',
-			'circles',
-			'groupfolders',
-			'announcementcenter',
-			'quota_warning',
-			'user_saml',
-			'whiteboard',
-		];
-	}
+    protected function setUp(): void {
+        parent::setUp();
+        $this->bundle = new EducationBundle($this->l10n);
+        $this->bundleIdentifier = 'EducationBundle';
+        $this->bundleName = 'Education bundle';
+        $this->bundleAppIds = [
+            'dashboard',
+            'circles',
+            'groupfolders',
+            'announcementcenter',
+            'quota_warning',
+            'user_saml',
+            'whiteboard',
+        ];
+    }
 }