1 files changed, 30 insertions, 9 deletions

diff --git a/engine/tests/api/access_collections.php b/engine/tests/api/access_collections.php
index 1e61c45bb..4acfae596 100644
--- a/engine/tests/api/access_collections.php
+++ b/engine/tests/api/access_collections.php
@@ -54,7 +54,6 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 	}
 
 	public function testCreateGetDeleteACL() {
-		global $DB_QUERY_CACHE;
 		
 		$acl_name = 'test access collection';
 		$acl_id = create_access_collection($acl_name);
@@ -67,8 +66,6 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 		$this->assertEqual($acl->id, $acl_id);
 
 		if ($acl) {
-			$DB_QUERY_CACHE = array();
-			
 			$this->assertEqual($acl->name, $acl_name);
 
 			$result = delete_access_collection($acl_id);
@@ -76,7 +73,7 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 
 			$q = "SELECT * FROM {$this->dbPrefix}access_collections WHERE id = $acl_id";
 			$data = get_data($q);
-			$this->assertFalse($data);
+			$this->assertIdentical(array(), $data);
 		}
 	}
 
@@ -88,7 +85,7 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 
 		if ($result) {
 			$result = remove_user_from_access_collection($this->user->guid, $acl_id);
-			$this->assertTrue($result);
+			$this->assertIdentical(true, $result);
 		}
 
 		delete_access_collection($acl_id);
@@ -194,7 +191,7 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 			return $value;
 		}
 
-		register_plugin_hook('access:collections:write', 'all', 'test_acl_access_hook');
+		elgg_register_plugin_hook_handler('access:collections:write', 'all', 'test_acl_access_hook');
 
 		// enable security since we usually run as admin
 		$ia = elgg_set_ignore_access(false);
@@ -202,14 +199,16 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 		$this->assertTrue($result);
 		$ia = elgg_set_ignore_access($ia);
 
-		unregister_plugin_hook('access:collections:write', 'all', 'test_acl_access_hook');
+		elgg_unregister_plugin_hook_handler('access:collections:write', 'all', 'test_acl_access_hook');
+
+		delete_access_collection($acl_id);
 	}
 
 	// groups interface
 	// only runs if the groups plugin is enabled because implementation is split between
 	// core and the plugin.
 	public function testCreateDeleteGroupACL() {
-		if (!is_plugin_enabled('groups')) {
+		if (!elgg_is_active_plugin('groups')) {
 			return;
 		}
 		
@@ -231,7 +230,7 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 	}
 
 	public function testJoinLeaveGroupACL() {
-		if (!is_plugin_enabled('groups')) {
+		if (!elgg_is_active_plugin('groups')) {
 			return;
 		}
 
@@ -266,4 +265,26 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 
 		$group->delete();
 	}
+
+	public function testAccessCaching() {
+		// create a new user to check against
+		$user = new ElggUser();
+		$user->username = 'access_test_user';
+		$user->save();
+
+		foreach (array('get_access_list', 'get_access_array') as $func) {
+			$cache = _elgg_get_access_cache();
+			$cache->clear();
+
+			// admin users run tests, so disable access
+			elgg_set_ignore_access(true);
+			$access = $func($user->getGUID());
+
+			elgg_set_ignore_access(false);
+			$access2 = $func($user->getGUID());
+			$this->assertNotEqual($access, $access2, "Access test for $func");
+		}
+
+		$user->delete();	
+	}
 }