From 277bffb664ab54a2eb8260bbf4f886e610bfa275 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 1 Oct 2009 22:20:04 +0000 Subject: [PATCH] BUGFIX Fixed SearchFilterApplyRelationTest not to assume ID ordering in the assertions, which breaks with databases not ordering by PK automatically (e.g. Postgres) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@87926 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/search/SearchFilterApplyRelationTest.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/search/SearchFilterApplyRelationTest.php b/tests/search/SearchFilterApplyRelationTest.php index 0ba8ccbc8..caf4ff5ce 100644 --- a/tests/search/SearchFilterApplyRelationTest.php +++ b/tests/search/SearchFilterApplyRelationTest.php @@ -28,6 +28,9 @@ class SearchFilterApplyRelationTest extends SapphireTest{ } function testApplyRelationHasMany(){ + $do1 = $this->objFromFixture('SearchFilterApplyRelationTest_DO', 'do1'); + $do2 = $this->objFromFixture('SearchFilterApplyRelationTest_DO', 'do2'); + $all = singleton("SearchFilterApplyRelationTest_DO"); $context = $all->getDefaultSearchContext(); @@ -39,14 +42,14 @@ class SearchFilterApplyRelationTest extends SapphireTest{ ); $results = $context->getResults($params); $this->assertEquals(1, $results->count()); - $this->assertEquals(array('1'), $results->column('ID')); + $this->assertEquals(array($do1->ID), $results->column('ID')); $params = array( "SearchFilterApplyRelationTest_HasManyGrantChildren__Title" => "I am has_many object3", ); $results = $context->getResults($params); $this->assertEquals(1, $results->count()); - $this->assertEquals(array('2'), $results->column('ID')); + $this->assertEquals(array($do2->ID), $results->column('ID')); $params = array( "SearchFilterApplyRelationTest_HasManyGrantChildren__Title" => "I am has_many object",