Fixes #3948 cleaning up stuff left behind by unit tests

5 files changed, 7 insertions, 2 deletions

diff --git a/engine/tests/api/access_collections.php b/engine/tests/api/access_collections.php
index bc5408546..0c37fa779 100644
--- a/engine/tests/api/access_collections.php
+++ b/engine/tests/api/access_collections.php
@@ -203,6 +203,8 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 		$ia = elgg_set_ignore_access($ia);
 
 		elgg_unregister_plugin_hook_handler('access:collections:write', 'all', 'test_acl_access_hook');
+
+		delete_access_collection($acl_id);
 	}
 
 	// groups interface
diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php
index 59b48999c..e7906d3c8 100644
--- a/engine/tests/api/entity_getter_functions.php
+++ b/engine/tests/api/entity_getter_functions.php
@@ -855,7 +855,7 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 
 	public function testElggApiGettersEntityNoSubtype() {
 		// create an entity we can later delete.
-		// order by time created and limit by 1 should == this entity.
+		// order by guid and limit by 1 should == this entity.
 
 		$e = new ElggObject();
 		$e->save();
diff --git a/engine/tests/api/helpers.php b/engine/tests/api/helpers.php
index 3f41400c8..439d5aa46 100644
--- a/engine/tests/api/helpers.php
+++ b/engine/tests/api/helpers.php
@@ -63,6 +63,8 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
 		$this->assertFalse(elgg_instanceof($bad_entity));
 		$this->assertFalse(elgg_instanceof($bad_entity, 'object'));
 		$this->assertFalse(elgg_instanceof($bad_entity, 'object', 'test_subtype'));
+
+		remove_subtype('object', 'test_subtype');
 	}
 
 	/**
diff --git a/engine/tests/api/metadata.php b/engine/tests/api/metadata.php
index 208024e65..7897b8d47 100644
--- a/engine/tests/api/metadata.php
+++ b/engine/tests/api/metadata.php
@@ -76,8 +76,8 @@ class ElggCoreMetadataAPITest extends ElggCoreUnitTest {
 		$this->assertIdentical($case_true, $case_false);
 
 		// clean up
-		$this->delete_metastrings();
 		$this->object->delete();
+		$this->delete_metastrings();
 	}
 
 	public function testElggGetMetadataCount() {
diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index 49b1764bc..c13b4c731 100644
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -134,6 +134,7 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 
 		// clean up
 		$this->assertTrue($this->entity->delete());
+		remove_subtype('site', 'testing');
 	}
 
 	public function testElggEntityCache() {