diff options
Diffstat (limited to 'tests/groupposition')
| -rw-r--r-- | tests/groupposition/legend_test.php | 43 | ||||
| -rw-r--r-- | tests/groupposition/teampage_test.php | 51 | 
2 files changed, 60 insertions, 34 deletions
diff --git a/tests/groupposition/legend_test.php b/tests/groupposition/legend_test.php index fe003e93a7..02ddb7cbce 100644 --- a/tests/groupposition/legend_test.php +++ b/tests/groupposition/legend_test.php @@ -11,7 +11,6 @@  *  */ -  class phpbb_groupposition_legend_test extends phpbb_database_test_case  {  	public function getDataSet() @@ -33,11 +32,13 @@ class phpbb_groupposition_legend_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) @@ -51,11 +52,13 @@ class phpbb_groupposition_legend_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\legend($db, $user); @@ -91,11 +94,13 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case  	*/  	public function test_add_group($group_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\legend($db, $user); @@ -179,11 +184,13 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case  	*/  	public function test_delete_group($group_id, $skip_group, $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\legend($db, $user); @@ -234,11 +241,13 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case  	*/  	public function test_move_up($group_id, $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\legend($db, $user); @@ -289,11 +298,13 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case  	*/  	public function test_move_down($group_id, $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\legend($db, $user); @@ -387,11 +398,13 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case  	*/  	public function test_move($group_id, $increment, $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\legend($db, $user); diff --git a/tests/groupposition/teampage_test.php b/tests/groupposition/teampage_test.php index 1e61e3ebfb..3b916670f7 100644 --- a/tests/groupposition/teampage_test.php +++ b/tests/groupposition/teampage_test.php @@ -11,9 +11,6 @@  *  */ -require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; -  class phpbb_groupposition_teampage_test extends phpbb_database_test_case  {  	public function getDataSet() @@ -35,11 +32,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 +52,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 +138,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 +183,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 +252,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 +306,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 +471,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 +636,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);  | 
