From 522af3f29db2cf6fa573aa4546ba66be4b97015e Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 29 Jun 2017 13:54:02 +1200 Subject: [PATCH] FIX: Test updates to comply with https://github.com/silverstripe/silverstripe-framework/pull/7083 --- tests/model/SiteTreeTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php index febdf4b9..ea16eec7 100644 --- a/tests/model/SiteTreeTest.php +++ b/tests/model/SiteTreeTest.php @@ -449,7 +449,7 @@ class SiteTreeTest extends SapphireTest $pageAbout->delete(); - $this->assertFalse(DataObject::get_by_id('Page', $pageAbout->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageAbout->ID)); $this->assertTrue(DataObject::get_by_id('Page', $pageStaff->ID) instanceof Page); $this->assertTrue(DataObject::get_by_id('Page', $pageStaffDuplicate->ID) instanceof Page); Config::inst()->update(SiteTree::class, 'enforce_strict_hierarchy', true); @@ -463,7 +463,7 @@ class SiteTreeTest extends SapphireTest $pageAbout->delete(); - $this->assertFalse(DataObject::get_by_id('Page', $pageAbout->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageAbout->ID)); $this->assertFalse(DataObject::get_by_id('Page', $pageStaff->ID)); $this->assertFalse(DataObject::get_by_id('Page', $pageStaffDuplicate->ID)); } @@ -495,7 +495,7 @@ class SiteTreeTest extends SapphireTest Versioned::set_stage(Versioned::LIVE); - $this->assertFalse(DataObject::get_by_id('Page', $pageAbout->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageAbout->ID)); $this->assertTrue(DataObject::get_by_id('Page', $pageStaff->ID) instanceof Page); $this->assertTrue(DataObject::get_by_id('Page', $pageStaffDuplicate->ID) instanceof Page); Versioned::set_stage(Versioned::DRAFT); @@ -518,7 +518,7 @@ class SiteTreeTest extends SapphireTest $parentPage->doUnpublish(); Versioned::set_stage(Versioned::LIVE); - $this->assertFalse(DataObject::get_by_id('Page', $pageAbout->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageAbout->ID)); $this->assertTrue(DataObject::get_by_id('Page', $pageStaff->ID) instanceof Page); $this->assertTrue(DataObject::get_by_id('Page', $pageStaffDuplicate->ID) instanceof Page); Versioned::set_stage(Versioned::DRAFT); @@ -540,9 +540,9 @@ class SiteTreeTest extends SapphireTest $parentPage->doUnpublish(); Versioned::set_stage(Versioned::LIVE); - $this->assertFalse(DataObject::get_by_id('Page', $pageAbout->ID)); - $this->assertFalse(DataObject::get_by_id('Page', $pageStaff->ID)); - $this->assertFalse(DataObject::get_by_id('Page', $pageStaffDuplicate->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageAbout->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageStaff->ID)); + $this->assertNull(DataObject::get_by_id('Page', $pageStaffDuplicate->ID)); Versioned::set_stage(Versioned::DRAFT); }