MINOR Fixing assertType() assertions with assertInstanceOf()

silverstripe · May 9, 2012 · c72bae3 · c72bae3
1 parent dedb9d0
commit c72bae3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php
@@ -151,7 +151,7 @@ function testDraftDeletedPageCanBeOpenedInCMS() {
 		$response = $this->get('admin/cms/getitem?ID=' . $pageID . '&ajax=1');
 
 		$livePage = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
-		$this->assertType('SiteTree', $livePage);
+		$this->assertInstanceOf('SiteTree', $livePage);
 		$this->assertTrue($livePage->canDelete());
 
 		// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
@@ -175,12 +175,12 @@ function testGetRecord() {
 		$this->assertNull($cmsMain->getRecord('asdf'));
 
 		// Pages that are on draft and aren't on draft should both work
-		$this->assertType('Page', $cmsMain->getRecord($page1ID));
+		$this->assertInstanceOf('Page', $cmsMain->getRecord($page1ID));
-		$this->assertType('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
+		$this->assertInstanceOf('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
 
 		// This functionality isn't actually used any more.
 		$newPage = $cmsMain->getRecord('new-Page-5');
-		$this->assertType('Page', $newPage);
+		$this->assertInstanceOf('Page', $newPage);
 		$this->assertEquals('5', $newPage->ParentID);
 
 	}

diff --git a/tests/model/SiteTreeActionsTest.php b/tests/model/SiteTreeActionsTest.php
@@ -64,7 +64,7 @@ function testActionsNoDeletePublishedRecord() {
 
 		// Get the live version of the page
 		$page = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
-		$this->assertType("SiteTree", $page);
+		$this->assertInstanceOf("SiteTree", $page);
 
 		// Check that someone without the right permission can't delete the page
 		$editor = $this->objFromFixture('Member', 'cmsnodeleteeditor');
@@ -116,7 +116,7 @@ function testActionsDeletedFromStageRecord() {
 
 		// Get the live version of the page
 		$page = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
-		$this->assertType('SiteTree', $page);
+		$this->assertInstanceOf('SiteTree', $page);
 
 		$actions = $page->getCMSActions();
 

diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php
@@ -157,7 +157,7 @@ function testParentNodeCachedInMemory() {
 	     	$child->Title = 'Page Title';
 		$child->setParent($parent);
 
-		$this->assertType("SiteTree", $child->Parent);
+		$this->assertInstanceOf("SiteTree", $child->Parent);
 		$this->assertEquals("Section Title", $child->Parent->Title);
 	}
 
@@ -166,7 +166,7 @@ function testParentModelReturnType() {
 		$child = new SiteTreeTest_PageNode();
 
 		$child->setParent($parent);
-		$this->assertType('SiteTreeTest_PageNode', $child->Parent);
+		$this->assertInstanceOf('SiteTreeTest_PageNode', $child->Parent);
 	}
 
 	/**