Fixes #3948 cleaning up stuff left behind by unit tests

diff --git a/engine/tests/api/access_collections.php b/engine/tests/api/access_collections.php
index bc5408546da99917c3baa4c36f793f7b56e06249..0c37fa779bf7987f963a14677e3040cf243fe0ec 100644 (file)
--- 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 59b48999cdd4496ddcdb5c9ffae7b31f4c45181a..e7906d3c8f239638d03068458afeb0821e499df4 100644 (file)
--- 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 3f41400c851f0bf2b61991489ab788115c09efe7..439d5aa4683d4e69593ccb5cb210b3547b6b669f 100644 (file)
--- 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 208024e658add187ddaabfc05b92cd2256bc897e..7897b8d478a5a57013fdb39c921d50fa3e510f97 100644 (file)
--- 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 49b1764bc56299e14528af6a05f9feb1a4633f7b..c13b4c731c0921cf7a16a892dd1cb67ed514585e 100644 (file)
--- 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() {