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

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index fd2b0e9f935b39b5c40acdf5f5405414014c6887..d8db88462794abbac0747eec48fd8aa0fb87430a 100644 (file)
--- 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 06bc80a4ad7269191372f25f4a902b2c2b08fc17..1772f7c1adf38f10df945ad2b25d3fcbacbf22ae 100644 (file)
--- 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 e5acbb3f92e6aabc7c95c5f7e3b55808596ede57..a05074c59b1148d3775113ae7054c9b4314a5ebd 100644 (file)
--- 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 d1533c3d2921e05f445d3629b19cfd38a92a53a7..901d76ac05457702395f1a1f6d9a525209c21975 100644 (file)
--- 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));