[ticket/13762] Moving language related functionality into a separate class

PHPBB3-13762

1 files changed, 32 insertions, 16 deletions

diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php
index 1e61e3ebfb..dff52f7a43 100644
--- a/tests/groupposition/teampage_test.php
+++ b/tests/groupposition/teampage_test.php
@@ -35,11 +35,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_get_group_value($group_id, $expected, $throws_exception)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		if ($throws_exception)
@@ -53,11 +55,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 
 	public function test_get_group_count()
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);
@@ -137,11 +141,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_add_group_teampage($group_id, $parent_id, $expected_added, $expected)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);
@@ -180,11 +186,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_add_category_teampage($group_name, $expected_added, $expected)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);
@@ -247,11 +255,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_delete_group($group_id, $expected_deleted, $expected)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);
@@ -299,11 +309,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_delete_teampage($teampage_id, $expected_deleted, $expected)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);
@@ -462,11 +474,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_move($group_id, $move_delta, $excepted_moved, $expected)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);
@@ -625,11 +639,13 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
 	*/
 	public function test_move_teampage($teampage_id, $move_delta, $excepted_moved, $expected)
 	{
-		global $cache;
+		global $cache, $phpbb_root_path, $phpEx;
 
 		$cache = new phpbb_mock_cache;
 		$db = $this->new_dbal();
-		$user = new \phpbb\user('\phpbb\datetime');
+		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+		$lang = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($lang, '\phpbb\datetime');
 		$user->lang = array();
 
 		$test_class = new \phpbb\groupposition\teampage($db, $user, $cache);