Fixes #3942 fixed all the warnings and notices in the unit tests

2 files changed, 6 insertions, 29 deletions

diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index c04bc60ff..c0a7b96b3 100644
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -125,7 +125,7 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 		$this->assertIdentical(FALSE, elgg_get_annotations(array('guid' => $this->entity->getGUID(), 'type' => 'site', 'subtype' => 'fail')));
 
 		//  clear annotation
-		$this->assertTrue($this->entity->clearAnnotations());
+		$this->assertTrue($this->entity->deleteAnnotations());
 		$this->assertEqual($this->entity->countAnnotations('non_existent'), 0);
 
 		$this->assertIdentical(array(), elgg_get_annotations(array('guid' => $this->entity->getGUID())));
@@ -226,8 +226,8 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 	}
 
 	public function testElggEntityMetadata() {
-		// let's delte a non-existent metadata
-		$this->assertFalse($this->entity->clearMetaData('important'));
+		// let's delete a non-existent metadata
+		$this->assertFalse($this->entity->deleteMetadata('important'));
 
 		// let's add the meatadata
 		$this->assertTrue($this->entity->important = 'indeed!');
@@ -236,16 +236,16 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 
 		// test deleting incorrectly
 		// @link http://trac.elgg.org/ticket/2273
-		$this->assertFalse($this->entity->clearMetaData('impotent'));
+		$this->assertFalse($this->entity->deleteMetadata('impotent'));
 		$this->assertEqual($this->entity->important, 'indeed!');
 
 		// get rid of one metadata
 		$this->assertEqual($this->entity->important, 'indeed!');
-		$this->assertTrue($this->entity->clearMetaData('important'));
+		$this->assertTrue($this->entity->deleteMetadata('important'));
 		$this->assertEqual($this->entity->important, '');
 
 		// get rid of all metadata
-		$this->assertTrue($this->entity->clearMetaData());
+		$this->assertTrue($this->entity->deleteMetadata());
 		$this->assertEqual($this->entity->less_important, '');
 
 		// clean up database
diff --git a/engine/tests/objects/users.php b/engine/tests/objects/users.php
index ba93c2439..d1533c3d2 100644
--- a/engine/tests/objects/users.php
+++ b/engine/tests/objects/users.php
@@ -220,29 +220,6 @@ class ElggCoreUserTest extends ElggCoreUnitTest {
 		$this->user->delete();
 	}
 
-	// remove in 1.9
-	public function testElggUserIsAdminLegacy() {
-		$this->user->save();
-		$this->user->makeAdmin();
-
-		$this->assertTrue($this->user->admin);
-		$this->assertTrue($this->user->siteadmin);
-
-		$this->user->removeAdmin();
-		$this->user->delete();
-	}
-
-	public function testElggUserIsNotAdminLegacy() {
-		$this->user->save();
-		$this->user->removeAdmin();
-
-		$this->assertFalse($this->user->admin);
-		$this->assertFalse($this->user->siteadmin);
-
-		$this->user->removeAdmin();
-		$this->user->delete();
-	}
-
 	protected function fetchUser($guid) {
 		global $CONFIG;