From f4bc9c1673c18ed24a2ba1680f6b9a5de5c491bf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 11 Dec 2012 10:24:49 +0100
Subject: [PATCH] [ticket/10714] Fix dependency injections in unit tests with
 mocks

PHPBB3-10714
---
 tests/log/add_test.php               | 19 ++++++++++++++++---
 tests/log/function_add_log_test.php  |  7 +++++--
 tests/log/function_view_log_test.php |  5 +++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/tests/log/add_test.php b/tests/log/add_test.php
index fceb48ed01..4354cc4cc7 100644
--- a/tests/log/add_test.php
+++ b/tests/log/add_test.php
@@ -18,7 +18,16 @@ class phpbb_log_add_test extends phpbb_database_test_case
 
 	public function test_log_enabled()
 	{
-		$log = new phpbb_log(LOG_TABLE);
+		global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher;
+
+		$db = $this->new_dbal();
+		$cache = new phpbb_mock_cache;
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$user = $this->getMock('phpbb_user');
+		$auth = $this->getMock('phpbb_auth');
+
+		$log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx, LOG_TABLE);
+
 		$this->assertTrue($log->is_enabled(), 'Initialise failed');
 
 		$log->disable();
@@ -38,10 +47,15 @@ class phpbb_log_add_test extends phpbb_database_test_case
 
 	public function test_log_add()
 	{
-		global $db, $phpbb_dispatcher;
+		global $phpbb_root_path, $phpEx, $db, $phpbb_dispatcher;
 
 		$db = $this->new_dbal();
+		$cache = new phpbb_mock_cache;
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
+		$user = $this->getMock('phpbb_user');
+		$auth = $this->getMock('phpbb_auth');
+
+		$log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx, LOG_TABLE);
 
 		$mode = 'critical';
 		$user_id = ANONYMOUS;
@@ -51,7 +65,6 @@ class phpbb_log_add_test extends phpbb_database_test_case
 		$additional_data = array();
 
 		// Add an entry successful
-		$log = new phpbb_log(LOG_TABLE);
 		$this->assertEquals(1, $log->add($mode, $user_id, $log_ip, $log_operation, $log_time));
 
 		// Disable logging for all types
diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php
index 7ed862c523..0a65ce3165 100644
--- a/tests/log/function_add_log_test.php
+++ b/tests/log/function_add_log_test.php
@@ -142,7 +142,7 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
 	*/
 	public function test_add_log_function($expected, $user_id, $mode, $required1, $additional1 = null, $additional2 = null, $additional3 = null)
 	{
-		global $db, $cache, $user, $phpbb_log, $phpbb_dispatcher;
+		global $db, $cache, $user, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		if ($expected)
 		{
@@ -157,7 +157,10 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
 		$db = $this->new_dbal();
 		$cache = new phpbb_mock_cache;
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-		$phpbb_log = new phpbb_log(LOG_TABLE);
+		$user = $this->getMock('phpbb_user');
+		$auth = $this->getMock('phpbb_auth');
+
+		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx, LOG_TABLE);
 
 		$user->ip = 'user_ip';
 		if ($user_id)
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php
index f7e2c51c32..bb33668ae4 100644
--- a/tests/log/function_view_log_test.php
+++ b/tests/log/function_view_log_test.php
@@ -300,12 +300,11 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 	*/
 	public function test_view_log_function($expected, $expected_returned, $mode, $log_count, $limit = 5, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_id ASC', $keywords = '')
 	{
-		global $cache, $db, $user, $auth, $phpbb_log, $phpbb_dispatcher;
+		global $cache, $db, $user, $auth, $phpbb_log, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		$db = $this->new_dbal();
 		$cache = new phpbb_mock_cache;
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-		$phpbb_log = new phpbb_log(LOGS_TABLE);
 
 		// Create auth mock
 		$auth = $this->getMock('phpbb_auth');
@@ -335,6 +334,8 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 			'LOG_INSTALL_INSTALLED'		=> 'installed: %s',
 		);
 
+		$phpbb_log = new phpbb_log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, $phpEx, LOG_TABLE);
+
 		$log = array();
 		$this->assertEquals($expected_returned, view_log($mode, $log, $log_count, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords));