From 062975d30ab23ef53ae850fc8b198e83fd47327e Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Mon, 8 Feb 2010 02:27:42 +0000
Subject: [PATCH] MINOR Testing of grand-children items in
 HierarchyTest::testLoadDescendantIDListIntoArray() and
 HierarchyTest::testNumChildren()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98376 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/model/HierarchyTest.php | 21 +++++++++++++++------
 tests/model/HierarchyTest.yml | 12 ++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/tests/model/HierarchyTest.php b/tests/model/HierarchyTest.php
index 710553966..304e3bae5 100644
--- a/tests/model/HierarchyTest.php
+++ b/tests/model/HierarchyTest.php
@@ -67,9 +67,9 @@ class HierarchyTest extends SapphireTest {
 		$this->assertEquals($this->objFromFixture('Page', 'page1')->numChildren(), 0);
 		$this->assertEquals($this->objFromFixture('Page', 'page2')->numChildren(), 2);
 		$this->assertEquals($this->objFromFixture('Page', 'page3')->numChildren(), 2);
-		$this->assertEquals($this->objFromFixture('Page', 'page2a')->numChildren(), 0);
+		$this->assertEquals($this->objFromFixture('Page', 'page2a')->numChildren(), 2);
 		$this->assertEquals($this->objFromFixture('Page', 'page2b')->numChildren(), 0);
-		$this->assertEquals($this->objFromFixture('Page', 'page3a')->numChildren(), 0);
+		$this->assertEquals($this->objFromFixture('Page', 'page3a')->numChildren(), 2);
 		$this->assertEquals($this->objFromFixture('Page', 'page3b')->numChildren(), 0);
 		
 		$page1 = $this->objFromFixture('Page', 'page1');
@@ -91,12 +91,21 @@ class HierarchyTest extends SapphireTest {
 
 	function testLoadDescendantIDListIntoArray() {
 		$page2 = $this->objFromFixture('Page', 'page2');
-		$idList = $page2->getDescendantIDList();
 		$page2a = $this->objFromFixture('Page', 'page2a');
 		$page2b = $this->objFromFixture('Page', 'page2b');
-		$this->assertContains($page2a->ID, $idList, 'Page 2a is a descendant of Page 2');
-		$this->assertContains($page2b->ID, $idList, 'Page 2b is a descendant of Page 2');
-		$this->assertEquals(2, count($idList), 'There are 2 descendants of Page 2');
+		$page2aa = $this->objFromFixture('Page', 'page2aa');
+		$page2ab = $this->objFromFixture('Page', 'page2ab');
+		
+		$page2IdList = $page2->getDescendantIDList();
+		$page2aIdList = $page2a->getDescendantIDList();
+		
+		$this->assertContains($page2a->ID, $page2IdList);
+		$this->assertContains($page2b->ID, $page2IdList);
+		$this->assertEquals(2, count($page2IdList));
+		
+		$this->assertContains($page2aa->ID, $page2aIdList);
+		$this->assertContains($page2ab->ID, $page2aIdList);
+		$this->assertEquals(2, count($page2aIdList));
 	}
 
 }
\ No newline at end of file
diff --git a/tests/model/HierarchyTest.yml b/tests/model/HierarchyTest.yml
index 74d94eb70..3254d8db9 100644
--- a/tests/model/HierarchyTest.yml
+++ b/tests/model/HierarchyTest.yml
@@ -17,3 +17,15 @@ Page:
    page3b:
       Parent: =>Page.page3
       Title: Page 3b
+   page2aa:
+      Parent: =>Page.page2a
+      Title: Page 2aa
+   page2ab:
+      Parent: =>Page.page2a
+      Title: Page 2ab
+   page3aa:
+      Parent: =>Page.page3a
+      Title: Page 3aa
+   page3ab:
+      Parent: =>Page.page3a
+      Title: Page 3ab
\ No newline at end of file