5 files changed, 103 insertions, 16 deletions

diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php
index aef7a991e..59b48999c 100644
--- a/engine/tests/api/entity_getter_functions.php
+++ b/engine/tests/api/entity_getter_functions.php
@@ -2789,4 +2789,13 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 			$this->assertEqual($a_e_map[$a->id], $a->owner_guid);
 		}
 	}
+
+	public function testElggGetEntitiesBadWheres() {
+		$options = array(
+			'container_guid' => 'abc'
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertFalse($entities);
+	}
 }
diff --git a/engine/tests/api/helpers.php b/engine/tests/api/helpers.php
index ee2e64cfe..36d680d54 100644
--- a/engine/tests/api/helpers.php
+++ b/engine/tests/api/helpers.php
@@ -204,7 +204,7 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
 		$this->assertTrue($result);
 		
 		$js_urls = elgg_get_loaded_js('footer');
-		$this->assertIdentical(array('http://test1.com'), $js_urls);
+		$this->assertIdentical(array(500 => 'http://test1.com'), $js_urls);
 	}
 
 	/**
@@ -227,9 +227,10 @@ class ElggCoreHelpersTest extends ElggCoreUnitTest {
 		}
 
 		$js_urls = elgg_get_loaded_js('head');
-		$this->assertIdentical($js_urls[0], $urls['id1']);
-		$this->assertIdentical($js_urls[1], $urls['id2']);
-		$this->assertIdentical($js_urls[2], $urls['id3']);
+
+		$this->assertIdentical($js_urls[500], $urls['id1']);
+		$this->assertIdentical($js_urls[501], $urls['id2']);
+		$this->assertIdentical($js_urls[502], $urls['id3']);
 
 		$js_urls = elgg_get_loaded_js('footer');
 		$this->assertIdentical(array(), $js_urls);
diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 00b0d4513..72092b688 100644
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -215,18 +215,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 		$this->assertEqual($this->package17->getManifest()->getDescription(), 'A 1.7-style manifest.');
 	}
 
-	public function testElggPluginManifestGetDescriptionTranslated() {
-		$en = array(
-			$this->package18->getManifest()->getDescription() => 'A translated 1.8 description!',
-			$this->package17->getManifest()->getDescription() => 'A translated 1.7 description!',
-		);
-
-		add_translation('en', $en);
-
-		$this->assertEqual($this->package18->getManifest()->getDescription(), 'A translated 1.8 description!');
-		$this->assertEqual($this->package17->getManifest()->getDescription(), 'A translated 1.7 description!');
-	}
-
 	public function testElggPluginManifestGetCategories() {
 		$categories = array(
 			'Admin', 'ServiceAPI'
diff --git a/engine/tests/regression/trac_bugs.php b/engine/tests/regression/trac_bugs.php
index 6f98c67bd..23d6d1dc6 100644
--- a/engine/tests/regression/trac_bugs.php
+++ b/engine/tests/regression/trac_bugs.php
@@ -112,4 +112,91 @@ class ElggCoreRegressionBugsTest extends ElggCoreUnitTest {
 		$this->assertEqual($params['xoffset'], $options['x1']);
 		$this->assertEqual($params['yoffset'], $options['y1']);
 	}
+
+	// #3722 Check canEdit() works for contains regardless of groups
+	function test_can_write_to_container() {
+		$user = new ElggUser();
+		$user->username = 'test_user_' . rand();
+		$user->name = 'test_user_name_' . rand();
+		$user->email = 'test@user.net';
+		$user->container_guid = 0;
+		$user->owner_guid = 0;
+		$user->save();
+
+		$object = new ElggObject();
+		$object->save();
+
+		$group = new ElggGroup();
+		$group->save();
+		
+		// disable access overrides because we're admin.
+		$ia = elgg_set_ignore_access(false);
+
+		$this->assertFalse(can_write_to_container($user->guid, $object->guid));
+		
+		global $elgg_test_user;
+		$elgg_test_user = $user;
+
+		// register hook to allow access
+		function can_write_to_container_test_hook($hook, $type, $value, $params) {
+			global $elgg_test_user;
+
+			if ($params['user']->getGUID() == $elgg_test_user->getGUID()) {
+				return true;
+			}
+		}
+		
+		register_plugin_hook('container_permissions_check', 'all', 'can_write_to_container_test_hook');
+		$this->assertTrue(can_write_to_container($user->guid, $object->guid));
+		unregister_plugin_hook('container_permissions_check', 'all', 'can_write_to_container_test_hook');
+
+		$this->assertFalse(can_write_to_container($user->guid, $group->guid));
+		$group->join($user);
+		$this->assertTrue(can_write_to_container($user->guid, $group->guid));
+
+		elgg_set_ignore_access($ia);
+
+		$user->delete();
+		$object->delete();
+		$group->delete();
+	}
+
+	function test_db_shutdown_links() {
+		global $DB_DELAYED_QUERIES, $test_results;
+		$DB_DELAYED_QUERIES = array();
+
+		function test_delayed_results($results) {
+			global $test_results;
+			$test_results = $results;
+		}
+
+		$q = 'SELECT 1 as test';
+
+		$links = array('read', 'write', get_db_link('read'), get_db_link('write'));
+
+		foreach ($links as $link) {
+			$DB_DELAYED_QUERIES = array();
+
+			$result = execute_delayed_query($q, $link, 'test_delayed_results');
+
+			$this->assertTrue($result, "Failed with link = $link");
+			$this->assertEqual(count($DB_DELAYED_QUERIES), 1);
+			$this->assertEqual($DB_DELAYED_QUERIES[0]['q'], $q);
+			$this->assertEqual($DB_DELAYED_QUERIES[0]['l'], $link);
+			$this->assertEqual($DB_DELAYED_QUERIES[0]['h'], 'test_delayed_results');
+
+			db_delayedexecution_shutdown_hook();
+
+			$num_rows = mysql_num_rows($test_results);
+			$this->assertEqual($num_rows, 1);
+			$row = mysql_fetch_assoc($test_results);
+			$this->assertEqual($row['test'], 1);
+		}
+
+		// test bad case
+		$DB_DELAYED_QUERIES = array();
+		$result = execute_delayed_query($q, 'not_a_link', 'test_delayed_results');
+		$this->assertFalse($result);
+		$this->assertEqual(array(), $DB_DELAYED_QUERIES);
+	}
 }
diff --git a/engine/tests/suite.php b/engine/tests/suite.php
index 8f2eb41a3..4203bc5d6 100644
--- a/engine/tests/suite.php
+++ b/engine/tests/suite.php
@@ -9,6 +9,8 @@
 
 require_once(dirname( __FILE__ ) . '/../start.php');
 
+admin_gatekeeper();
+
 $vendor_path = "$CONFIG->path/vendors/simpletest";
 $test_path = "$CONFIG->path/engine/tests";