Fixes #4108 delete() returns bool now and updated unit tests

4 files changed, 7 insertions, 5 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index fd2b0e9f9..d8db88462 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1563,7 +1563,7 @@ function delete_entity($guid, $recursive = true) {
 					}
 				}
 
-				return $res;
+				return (bool)$res;
 			}
 		}
 	}
diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index 06bc80a4a..1772f7c1a 100644
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -178,7 +178,7 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$this->AssertEqual($this->entity->get('non_existent'), 'testing');
 
 		// clean up with delete
-		$this->assertTrue($this->entity->delete());
+		$this->assertIdentical(true, $this->entity->delete());
 	}
 
 	public function testElggEntityDisableAndEnable() {
diff --git a/engine/tests/objects/sites.php b/engine/tests/objects/sites.php
index e5acbb3f9..a05074c59 100644
--- a/engine/tests/objects/sites.php
+++ b/engine/tests/objects/sites.php
@@ -66,8 +66,10 @@ class ElggCoreSiteTest extends ElggCoreUnitTest {
 	}
 
 	public function testElggSiteSaveAndDelete() {
-		$this->assertTrue($this->site->save());
-		$this->assertTrue($this->site->delete());
+		$guid = $this->site->save();
+		$this->assertIsA($guid, 'int');
+		$this->assertTrue($guid > 0);
+		$this->assertIdentical(true, $this->site->delete());
 	}
 }
 
diff --git a/engine/tests/objects/users.php b/engine/tests/objects/users.php
index d1533c3d2..901d76ac0 100644
--- a/engine/tests/objects/users.php
+++ b/engine/tests/objects/users.php
@@ -138,7 +138,7 @@ class ElggCoreUserTest extends ElggCoreUnitTest {
 		$guid = $this->user->save();
 
 		// delete object
-		$this->assertTrue($this->user->delete());
+		$this->assertIdentical(true, $this->user->delete());
 
 		// check GUID not in database
 		$this->assertFalse($this->fetchUser($guid));