tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 18:09:53 +02:00
Code Issues Projects Releases Wiki Activity

FIX Use array_intersect() with expected values so that the order matches.

Browse Source 
The values in $values aren't returned in any order, so this test can randomly fail. This
changes the check from expected = $values to $values \cap expected = $value. PHP's array_intersect
maintains the keys of the first array, so order is preserved. The intersect also guarentees that the
only accepted values are the expected ones.
This commit is contained in:
Simon Welsh 2012-08-23 17:34:17 +12:00
parent f1c021ff22
commit cd61b61a84
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/model/DataObjectTest.php
View File

@ -863,7 +863,7 @@ class DataObjectTest extends SapphireTest {
// Check that the values of those fields are properly read from the database
$values = DataObject::get("DataObjectTest_Team", "\"DataObjectTest_Team\".\"ID\" IN
($obj1->ID, $obj2->ID)")->column("SubclassDatabaseField");
$this->assertEquals(array('obj1', 'obj2'), $values);
$this->assertEquals(array_intersect($values, array('obj1', 'obj2')), $values);
}
function testClassNameSetForNewObjects() {