fixup! optimize UserMountCache::registerStorage

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
nextcloud · Nov 16, 2023 · 631b839 · 631b839
1 parent 9295f1d
commit 631b839
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php
@@ -131,7 +131,7 @@ public function testNewMounts() {
 		$cachedMounts = $this->cache->getMountsForUser($user);
 
 		$this->assertCount(1, $cachedMounts);
-		$cachedMount = $cachedMounts[0];
+		$cachedMount = $cachedMounts[$mount->getKey()];
 		$this->assertEquals('/asd/', $cachedMount->getMountPoint());
 		$this->assertEquals($user, $cachedMount->getUser());
 		$this->assertEquals($storage->getCache()->getId(''), $cachedMount->getRootId());
@@ -155,7 +155,7 @@ public function testSameMounts() {
 		$cachedMounts = $this->cache->getMountsForUser($user);
 
 		$this->assertCount(1, $cachedMounts);
-		$cachedMount = $cachedMounts[0];
+		$cachedMount = $cachedMounts[$mount->getKey()];
 		$this->assertEquals('/asd/', $cachedMount->getMountPoint());
 		$this->assertEquals($user, $cachedMount->getUser());
 		$this->assertEquals($storage->getCache()->getId(''), $cachedMount->getRootId());
@@ -200,7 +200,7 @@ public function testChangeMounts() {
 		$cachedMounts = $this->cache->getMountsForUser($user);
 
 		$this->assertCount(1, $cachedMounts);
-		$cachedMount = $cachedMounts[0];
+		$cachedMount = $cachedMounts[$mount->getKey()];
 		$this->assertEquals('/foo/', $cachedMount->getMountPoint());
 	}
 
@@ -223,7 +223,7 @@ public function testChangeMountId() {
 		$cachedMounts = $this->cache->getMountsForUser($user);
 
 		$this->assertCount(1, $cachedMounts);
-		$cachedMount = $cachedMounts[0];
+		$cachedMount = $cachedMounts[$mount->getKey()];
 		$this->assertEquals(1, $cachedMount->getMountId());
 	}
 
@@ -248,15 +248,15 @@ public function testGetMountsForUser() {
 		$cachedMounts = $this->cache->getMountsForUser($user1);
 
 		$this->assertCount(2, $cachedMounts);
-		$this->assertEquals('/foo/', $cachedMounts[0]->getMountPoint());
-		$this->assertEquals($user1, $cachedMounts[0]->getUser());
-		$this->assertEquals($id1, $cachedMounts[0]->getRootId());
-		$this->assertEquals(1, $cachedMounts[0]->getStorageId());
+		$this->assertEquals('/foo/', $cachedMounts[$mount1->getKey()]->getMountPoint());
+		$this->assertEquals($user1, $cachedMounts[$mount1->getKey()]->getUser());
+		$this->assertEquals($id1, $cachedMounts[$mount1->getKey()]->getRootId());
+		$this->assertEquals(1, $cachedMounts[$mount1->getKey()]->getStorageId());
 
-		$this->assertEquals('/bar/', $cachedMounts[1]->getMountPoint());
-		$this->assertEquals($user1, $cachedMounts[1]->getUser());
-		$this->assertEquals($id2, $cachedMounts[1]->getRootId());
-		$this->assertEquals(2, $cachedMounts[1]->getStorageId());
+		$this->assertEquals('/bar/', $cachedMounts[$mount2->getKey()]->getMountPoint());
+		$this->assertEquals($user1, $cachedMounts[$mount2->getKey()]->getUser());
+		$this->assertEquals($id2, $cachedMounts[$mount2->getKey()]->getRootId());
+		$this->assertEquals(2, $cachedMounts[$mount2->getKey()]->getStorageId());
 
 		$cachedMounts = $this->cache->getMountsForUser($user3);
 		$this->assertEmpty($cachedMounts);
@@ -521,7 +521,7 @@ public function testMigrateMountProvider() {
 
 		$cachedMounts = $this->cache->getMountsForUser($user1);
 		$this->assertCount(1, $cachedMounts);
-		$this->assertEquals('', $cachedMounts[0]->getMountProvider());
+		$this->assertEquals('', $cachedMounts[$mount1->getKey()]->getMountProvider());
 
 		$mount1 = new MountPoint($storage1, '/foo/', null, null, null, null, 'dummy');
 		$this->cache->registerMounts($user1, [$mount1], ['dummy']);
@@ -530,6 +530,6 @@ public function testMigrateMountProvider() {
 
 		$cachedMounts = $this->cache->getMountsForUser($user1);
 		$this->assertCount(1, $cachedMounts);
-		$this->assertEquals('dummy', $cachedMounts[0]->getMountProvider());
+		$this->assertEquals('dummy', $cachedMounts[$mount1->getKey()]->getMountProvider());
 	}
 }