upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

test: adjust tests to unsorted folder listing

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2026-05-07 18:50:14 +02:00 committed by backportbot[bot]
parent 7e5c5cf681
commit cfd63b8e41
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/integration/features/bootstrap/Sharing.php
View file

@ -556,7 +556,13 @@ trait Sharing {
$returnedShare = $this->getXmlResponse()->data[0];
if ($returnedShare->element) {
$returnedShare = $returnedShare->element[$number];
$returnedShare = (array)$returnedShare;
$returnedShare = $returnedShare['element'];
if (is_array($returnedShare)) {
usort($returnedShare, fn ($share1, $share2) => (int)$share1->id <=> (int)$share2->id);
}
$returnedShare = $returnedShare[$number];
}
$defaultExpectedFields = [

13
tests/lib/Files/ViewTest.php
View file

@ -209,6 +209,7 @@ class ViewTest extends \Test\TestCase {
$this->assertEquals('httpd/unix-directory', $cachedData['mimetype']);
$folderData = $rootView->getDirectoryContent('/');
usort($folderData, fn (FileInfo $a, FileInfo $b) => $a->getName() <=> $b->getName());
/**
* expected entries:
* folder
@ -228,6 +229,7 @@ class ViewTest extends \Test\TestCase {
$this->assertEquals($storageSize, $folderData[3]['size']);
$folderData = $rootView->getDirectoryContent('/substorage');
usort($folderData, fn (FileInfo $a, FileInfo $b) => $a->getName() <=> $b->getName());
/**
* expected entries:
* folder
@ -2812,11 +2814,13 @@ class ViewTest extends \Test\TestCase {
$rootView = new View('');
$folderData = $rootView->getDirectoryContent('/');
usort($folderData, fn (FileInfo $a, FileInfo $b) => $a->getName() <=> $b->getName());
$this->assertCount(4, $folderData);
$this->assertEquals('folder', $folderData[0]['name']);
$this->assertEquals('foo.png', $folderData[1]['name']);
$this->assertEquals('foo.txt', $folderData[2]['name']);
$this->assertEquals('A', $folderData[3]['name']);
$this->assertEquals('A', $folderData[0]['name']);
$this->assertEquals('folder', $folderData[1]['name']);
$this->assertEquals('foo.png', $folderData[2]['name']);
$this->assertEquals('foo.txt', $folderData[3]['name']);
$folderData = $rootView->getDirectoryContent('/A');
$this->assertCount(1, $folderData);
@ -2827,6 +2831,7 @@ class ViewTest extends \Test\TestCase {
$this->assertEquals('C', $folderData[0]['name']);
$folderData = $rootView->getDirectoryContent('/A/B/C');
usort($folderData, fn (FileInfo $a, FileInfo $b) => $a->getName() <=> $b->getName());
$this->assertCount(3, $folderData);
$this->assertEquals('folder', $folderData[0]['name']);
$this->assertEquals('foo.png', $folderData[1]['name']);