Skip to content

Commit 5d86468

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

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
@@ -801,26 +801,31 @@ public function testExtended(): void {
801801
$entries = $this->cache->getFolderContents('');
802802
$this->assertCount(4, $entries);
803803

804-
$this->assertEquals('foo1', $entries[0]->getName());
805-
$this->assertEquals('foo2', $entries[1]->getName());
806-
$this->assertEquals('foo3', $entries[2]->getName());
807-
$this->assertEquals('foo4', $entries[3]->getName());
804+
$entriesByName = [];
805+
foreach ($entries as $entry) {
806+
$entriesByName[$entry->getName()] = $entry;
807+
}
808808

809-
$this->assertEquals(20, $entries[0]->getCreationTime());
810-
$this->assertEquals(0, $entries[0]->getUploadTime());
811-
$this->assertEquals(null, $entries[0]->getMetadataEtag());
809+
$this->assertArrayHasKey('foo1', $entriesByName);
810+
$this->assertArrayHasKey('foo2', $entriesByName);
811+
$this->assertArrayHasKey('foo3', $entriesByName);
812+
$this->assertArrayHasKey('foo4', $entriesByName);
813+
814+
$this->assertEquals(20, $entriesByName['foo1']->getCreationTime());
815+
$this->assertEquals(0, $entriesByName['foo1']->getUploadTime());
816+
$this->assertEquals(null, $entriesByName['foo1']->getMetadataEtag());
812817

813-
$this->assertEquals(0, $entries[1]->getCreationTime());
814-
$this->assertEquals(30, $entries[1]->getUploadTime());
815-
$this->assertEquals(null, $entries[1]->getMetadataEtag());
818+
$this->assertEquals(0, $entriesByName['foo2']->getCreationTime());
819+
$this->assertEquals(30, $entriesByName['foo2']->getUploadTime());
820+
$this->assertEquals(null, $entriesByName['foo2']->getMetadataEtag());
816821

817-
$this->assertEquals(0, $entries[2]->getCreationTime());
818-
$this->assertEquals(0, $entries[2]->getUploadTime());
819-
$this->assertEquals('foo', $entries[2]->getMetadataEtag());
822+
$this->assertEquals(0, $entriesByName['foo3']->getCreationTime());
823+
$this->assertEquals(0, $entriesByName['foo3']->getUploadTime());
824+
$this->assertEquals('foo', $entriesByName['foo3']->getMetadataEtag());
820825

821-
$this->assertEquals(0, $entries[3]->getCreationTime());
822-
$this->assertEquals(0, $entries[3]->getUploadTime());
823-
$this->assertEquals(null, $entries[3]->getMetadataEtag());
826+
$this->assertEquals(0, $entriesByName['foo4']->getCreationTime());
827+
$this->assertEquals(0, $entriesByName['foo4']->getUploadTime());
828+
$this->assertEquals(null, $entriesByName['foo4']->getMetadataEtag());
824829

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

@@ -836,6 +841,7 @@ public function testExtended(): void {
836841
$entries = $this->cache->getFolderContents('sub');
837842
$this->assertCount(1, $entries);
838843

844+
$this->assertEquals('foo1', $entries[0]->getName());
839845
$this->assertEquals(20, $entries[0]->getCreationTime());
840846
$this->assertEquals(25, $entries[0]->getUploadTime());
841847
$this->assertEquals(null, $entries[0]->getMetadataEtag());

0 commit comments

Comments
 (0)