Skip to content

Commit 3fc3ccf

Browse files
Copilotsalmart-dev
andauthored
tests: make CacheTest::testExtended order-independent
Co-authored-by: salmart-dev <4652631+salmart-dev@users.noreply.github.com>
1 parent fd1daa1 commit 3fc3ccf

1 file changed

Lines changed: 22 additions & 16 deletions

File tree

tests/lib/Files/Cache/CacheTest.php

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -841,26 +841,32 @@ public function testExtended(): void {
841841
$entries = $this->cache->getFolderContents('');
842842
$this->assertCount(4, $entries);
843843

844-
$this->assertEquals('foo1', $entries[0]->getName());
845-
$this->assertEquals('foo2', $entries[1]->getName());
846-
$this->assertEquals('foo3', $entries[2]->getName());
847-
$this->assertEquals('foo4', $entries[3]->getName());
844+
$entriesByName = [];
845+
foreach ($entries as $entry) {
846+
$entriesByName[$entry->getName()] = $entry;
847+
}
848848

849-
$this->assertEquals(20, $entries[0]->getCreationTime());
850-
$this->assertEquals(0, $entries[0]->getUploadTime());
851-
$this->assertEquals(null, $entries[0]->getMetadataEtag());
849+
$this->assertCount(4, $entriesByName);
850+
$this->assertArrayHasKey('foo1', $entriesByName);
851+
$this->assertArrayHasKey('foo2', $entriesByName);
852+
$this->assertArrayHasKey('foo3', $entriesByName);
853+
$this->assertArrayHasKey('foo4', $entriesByName);
854+
855+
$this->assertEquals(20, $entriesByName['foo1']->getCreationTime());
856+
$this->assertEquals(0, $entriesByName['foo1']->getUploadTime());
857+
$this->assertEquals(null, $entriesByName['foo1']->getMetadataEtag());
852858

853-
$this->assertEquals(0, $entries[1]->getCreationTime());
854-
$this->assertEquals(30, $entries[1]->getUploadTime());
855-
$this->assertEquals(null, $entries[1]->getMetadataEtag());
859+
$this->assertEquals(0, $entriesByName['foo2']->getCreationTime());
860+
$this->assertEquals(30, $entriesByName['foo2']->getUploadTime());
861+
$this->assertEquals(null, $entriesByName['foo2']->getMetadataEtag());
856862

857-
$this->assertEquals(0, $entries[2]->getCreationTime());
858-
$this->assertEquals(0, $entries[2]->getUploadTime());
859-
$this->assertEquals('foo', $entries[2]->getMetadataEtag());
863+
$this->assertEquals(0, $entriesByName['foo3']->getCreationTime());
864+
$this->assertEquals(0, $entriesByName['foo3']->getUploadTime());
865+
$this->assertEquals('foo', $entriesByName['foo3']->getMetadataEtag());
860866

861-
$this->assertEquals(0, $entries[3]->getCreationTime());
862-
$this->assertEquals(0, $entries[3]->getUploadTime());
863-
$this->assertEquals(null, $entries[3]->getMetadataEtag());
867+
$this->assertEquals(0, $entriesByName['foo4']->getCreationTime());
868+
$this->assertEquals(0, $entriesByName['foo4']->getUploadTime());
869+
$this->assertEquals(null, $entriesByName['foo4']->getMetadataEtag());
864870

865871
$this->cache->update($id1, ['upload_time' => 25]);
866872

0 commit comments

Comments
 (0)