Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2461773 by stefan.r, martin107: SortArrayTest has hardcoded string comparison result values, but these can differ between PHP versions

8.0.x
Alex Pott 2015-04-14 09:14:35 +02:00
parent 182bc04f87
commit a87a166736
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
View File

@ -35,7 +35,7 @@ class SortArrayTest extends UnitTestCase {
*/
public function testSortByWeightElement($a, $b, $expected) {
$result = SortArray::sortByWeightElement($a, $b);
$this->assertEquals($expected, $result);
$this->assertBothNegativePositiveOrZero($expected, $result);
}
/**
@ -111,7 +111,7 @@ class SortArrayTest extends UnitTestCase {
*/
public function testSortByWeightProperty($a, $b, $expected) {
$result = SortArray::sortByWeightProperty($a, $b);
$this->assertEquals($expected, $result);
$this->assertBothNegativePositiveOrZero($expected, $result);
}
/**
@ -187,7 +187,7 @@ class SortArrayTest extends UnitTestCase {
*/
public function testSortByTitleElement($a, $b, $expected) {
$result = SortArray::sortByTitleElement($a, $b);
$this->assertEquals($expected, $result);
$this->assertBothNegativePositiveOrZero($expected, $result);
}
/**
@ -256,7 +256,7 @@ class SortArrayTest extends UnitTestCase {
*/
public function testSortByTitleProperty($a, $b, $expected) {
$result = SortArray::sortByTitleProperty($a, $b);
$this->assertEquals($expected, $result);
$this->assertBothNegativePositiveOrZero($expected, $result);
}
/**
@ -309,4 +309,20 @@ class SortArrayTest extends UnitTestCase {
return $tests;
}
/**
* Asserts that numbers are either both negative, both positive or both zero.
*
* The exact values returned by comparison functions differ between PHP
* versions and are considered an "implementation detail".
*
* @param int $expected
* Expected comparison function return value.
* @param int $result
* Actual comparison function return value.
*/
protected function assertBothNegativePositiveOrZero($expected, $result) {
$this->assertTrue(is_numeric($expected) && is_numeric($result), 'Parameters are numeric.');
$this->assertTrue(($expected < 0 && $result < 0) || ($expected > 0 && $result > 0) || ($expected === 0 && $result === 0), 'Numbers are either both negative, both positive or both zero.');
}
}