From 73180b188df38046c1c93b898eef9a959e6eea15 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 30 May 2026 13:08:14 -0400 Subject: [PATCH] test(cache): avoid ordering assumptions in testExtended Signed-off-by: Josh --- tests/lib/Files/Cache/CacheTest.php | 38 +++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index c2dca753f5a72..e07bca0c5c669 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -798,26 +798,31 @@ public function testExtended(): void { $entries = $this->cache->getFolderContents(''); $this->assertCount(4, $entries); - $this->assertEquals('foo1', $entries[0]->getName()); - $this->assertEquals('foo2', $entries[1]->getName()); - $this->assertEquals('foo3', $entries[2]->getName()); - $this->assertEquals('foo4', $entries[3]->getName()); + $entriesByName = []; + foreach ($entries as $entry) { + $entriesByName[$entry->getName()] = $entry; + } - $this->assertEquals(20, $entries[0]->getCreationTime()); - $this->assertEquals(0, $entries[0]->getUploadTime()); - $this->assertEquals(null, $entries[0]->getMetadataEtag()); + $this->assertArrayHasKey('foo1', $entriesByName); + $this->assertArrayHasKey('foo2', $entriesByName); + $this->assertArrayHasKey('foo3', $entriesByName); + $this->assertArrayHasKey('foo4', $entriesByName); + + $this->assertEquals(20, $entriesByName['foo1']->getCreationTime()); + $this->assertEquals(0, $entriesByName['foo1']->getUploadTime()); + $this->assertEquals(null, $entriesByName['foo1']->getMetadataEtag()); - $this->assertEquals(0, $entries[1]->getCreationTime()); - $this->assertEquals(30, $entries[1]->getUploadTime()); - $this->assertEquals(null, $entries[1]->getMetadataEtag()); + $this->assertEquals(0, $entriesByName['foo2']->getCreationTime()); + $this->assertEquals(30, $entriesByName['foo2']->getUploadTime()); + $this->assertEquals(null, $entriesByName['foo2']->getMetadataEtag()); - $this->assertEquals(0, $entries[2]->getCreationTime()); - $this->assertEquals(0, $entries[2]->getUploadTime()); - $this->assertEquals('foo', $entries[2]->getMetadataEtag()); + $this->assertEquals(0, $entriesByName['foo3']->getCreationTime()); + $this->assertEquals(0, $entriesByName['foo3']->getUploadTime()); + $this->assertEquals('foo', $entriesByName['foo3']->getMetadataEtag()); - $this->assertEquals(0, $entries[3]->getCreationTime()); - $this->assertEquals(0, $entries[3]->getUploadTime()); - $this->assertEquals(null, $entries[3]->getMetadataEtag()); + $this->assertEquals(0, $entriesByName['foo4']->getCreationTime()); + $this->assertEquals(0, $entriesByName['foo4']->getUploadTime()); + $this->assertEquals(null, $entriesByName['foo4']->getMetadataEtag()); $this->cache->update($id1, ['upload_time' => 25]); @@ -833,6 +838,7 @@ public function testExtended(): void { $entries = $this->cache->getFolderContents('sub'); $this->assertCount(1, $entries); + $this->assertEquals('foo1', $entries[0]->getName()); $this->assertEquals(20, $entries[0]->getCreationTime()); $this->assertEquals(25, $entries[0]->getUploadTime()); $this->assertEquals(null, $entries[0]->getMetadataEtag());