Skip to content

Commit b246c95

Browse files
joshtrichardsbackportbot[bot]
authored andcommitted
test(cache): avoid ordering assumptions in testExtended
Signed-off-by: Josh <josh.t.richards@gmail.com>
1 parent fd5ecb5 commit b246c95

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
@@ -798,26 +798,31 @@ public function testExtended(): void {
798798
$entries = $this->cache->getFolderContents('');
799799
$this->assertCount(4, $entries);
800800

801-
$this->assertEquals('foo1', $entries[0]->getName());
802-
$this->assertEquals('foo2', $entries[1]->getName());
803-
$this->assertEquals('foo3', $entries[2]->getName());
804-
$this->assertEquals('foo4', $entries[3]->getName());
801+
$entriesByName = [];
802+
foreach ($entries as $entry) {
803+
$entriesByName[$entry->getName()] = $entry;
804+
}
805805

806-
$this->assertEquals(20, $entries[0]->getCreationTime());
807-
$this->assertEquals(0, $entries[0]->getUploadTime());
808-
$this->assertEquals(null, $entries[0]->getMetadataEtag());
806+
$this->assertArrayHasKey('foo1', $entriesByName);
807+
$this->assertArrayHasKey('foo2', $entriesByName);
808+
$this->assertArrayHasKey('foo3', $entriesByName);
809+
$this->assertArrayHasKey('foo4', $entriesByName);
810+
811+
$this->assertEquals(20, $entriesByName['foo1']->getCreationTime());
812+
$this->assertEquals(0, $entriesByName['foo1']->getUploadTime());
813+
$this->assertEquals(null, $entriesByName['foo1']->getMetadataEtag());
809814

810-
$this->assertEquals(0, $entries[1]->getCreationTime());
811-
$this->assertEquals(30, $entries[1]->getUploadTime());
812-
$this->assertEquals(null, $entries[1]->getMetadataEtag());
815+
$this->assertEquals(0, $entriesByName['foo2']->getCreationTime());
816+
$this->assertEquals(30, $entriesByName['foo2']->getUploadTime());
817+
$this->assertEquals(null, $entriesByName['foo2']->getMetadataEtag());
813818

814-
$this->assertEquals(0, $entries[2]->getCreationTime());
815-
$this->assertEquals(0, $entries[2]->getUploadTime());
816-
$this->assertEquals('foo', $entries[2]->getMetadataEtag());
819+
$this->assertEquals(0, $entriesByName['foo3']->getCreationTime());
820+
$this->assertEquals(0, $entriesByName['foo3']->getUploadTime());
821+
$this->assertEquals('foo', $entriesByName['foo3']->getMetadataEtag());
817822

818-
$this->assertEquals(0, $entries[3]->getCreationTime());
819-
$this->assertEquals(0, $entries[3]->getUploadTime());
820-
$this->assertEquals(null, $entries[3]->getMetadataEtag());
823+
$this->assertEquals(0, $entriesByName['foo4']->getCreationTime());
824+
$this->assertEquals(0, $entriesByName['foo4']->getUploadTime());
825+
$this->assertEquals(null, $entriesByName['foo4']->getMetadataEtag());
821826

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

@@ -833,6 +838,7 @@ public function testExtended(): void {
833838
$entries = $this->cache->getFolderContents('sub');
834839
$this->assertCount(1, $entries);
835840

841+
$this->assertEquals('foo1', $entries[0]->getName());
836842
$this->assertEquals(20, $entries[0]->getCreationTime());
837843
$this->assertEquals(25, $entries[0]->getUploadTime());
838844
$this->assertEquals(null, $entries[0]->getMetadataEtag());

0 commit comments

Comments
 (0)