Permalink
Browse files

Merge cd61b61 from master

  • Loading branch information...
simonwelsh committed Aug 23, 2012
1 parent fcc8826 commit 9d2686130c86522eef998a2195d3ea08a06f7e12
Showing with 1 addition and 1 deletion.
  1. +1 −1 tests/model/DataObjectTest.php
@@ -863,7 +863,7 @@ function testTwoSubclassesWithTheSameFieldNameWork() {
// 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() {

0 comments on commit 9d26861

Please sign in to comment.