Skip to content

Commit a3b92fa

Browse files
authored
Merge pull request #8506 from kenjis/test-refactor-AbstractGetFieldDataTest
test: use array_sort_by_multiple_keys() in AbstractGetFieldDataTest
2 parents b743fff + 5cb6724 commit a3b92fa

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

tests/system/Database/Live/AbstractGetFieldDataTest.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ abstract class AbstractGetFieldDataTest extends CIUnitTestCase
2828
protected Forge $forge;
2929
protected string $table = 'test1';
3030

31+
public static function setUpBeforeClass(): void
32+
{
33+
parent::setUpBeforeClass();
34+
35+
helper('array');
36+
}
37+
3138
protected function setUp(): void
3239
{
3340
parent::setUp();
@@ -95,14 +102,12 @@ abstract public function testGetFieldDataDefault(): void;
95102

96103
protected function assertSameFieldData(array $expected, array $actual)
97104
{
98-
$expected = json_decode(json_encode($expected), true);
99-
$names = array_column($expected, 'name');
100-
array_multisort($names, SORT_ASC, $expected);
105+
$expectedArray = json_decode(json_encode($expected), true);
106+
array_sort_by_multiple_keys($expectedArray, ['name' => SORT_ASC]);
101107

102-
$fields = json_decode(json_encode($actual), true);
103-
$names = array_column($fields, 'name');
104-
array_multisort($names, SORT_ASC, $fields);
108+
$fieldsArray = json_decode(json_encode($actual), true);
109+
array_sort_by_multiple_keys($fieldsArray, ['name' => SORT_ASC]);
105110

106-
$this->assertSame($expected, $fields);
111+
$this->assertSame($expectedArray, $fieldsArray);
107112
}
108113
}

0 commit comments

Comments
 (0)