From 31e18f31a6139cddb32520aa6ed020dc8f80f70a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 18 Mar 2012 13:40:56 +0100
Subject: [ticket/10714] Serialize the log_data in the testinsteadof hardcoding
 it

PHPBB3-10714
---
 tests/log/function_add_log_test.php | 107 +++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 50 deletions(-)

(limited to 'tests/log')

diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php
index 05fae0f916..407aeb9ad1 100644
--- a/tests/log/function_add_log_test.php
+++ b/tests/log/function_add_log_test.php
@@ -21,85 +21,82 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
 		return array(
 			array(
 				array(
-					array(
-						'user_id'		=> 2,
-						'log_type'		=> LOG_CRITICAL,
-						'log_operation'	=> 'LOG_NO_ADDITIONAL',
-						'log_data'		=> '',
-						'reportee_id'	=> 0,
-						'forum_id'		=> 0,
-						'topic_id'		=> 0,
-					),
+					'user_id'		=> 2,
+					'log_type'		=> LOG_CRITICAL,
+					'log_operation'	=> 'LOG_NO_ADDITIONAL',
+					'log_data'		=> '',
+					'reportee_id'	=> 0,
+					'forum_id'		=> 0,
+					'topic_id'		=> 0,
 				),
 				2, 'critical', 'LOG_NO_ADDITIONAL',
 			),
 			array(
 				array(
-					array(
-						'user_id'		=> 2,
-						'log_type'		=> LOG_CRITICAL,
-						'log_operation'	=> 'LOG_ONE_ADDITIONAL',
-						'log_data'		=> 'a:1:{i:0;s:9:"argument1";}',
-						'reportee_id'	=> 0,
-						'forum_id'		=> 0,
-						'topic_id'		=> 0,
+					'user_id'		=> 2,
+					'log_type'		=> LOG_CRITICAL,
+					'log_operation'	=> 'LOG_ONE_ADDITIONAL',
+					'log_data'		=> array(
+						'argument1',
 					),
+					'reportee_id'	=> 0,
+					'forum_id'		=> 0,
+					'topic_id'		=> 0,
 				),
 				2, 'critical', 'LOG_ONE_ADDITIONAL', 'argument1',
 			),
 			array(
 				array(
-					array(
-						'user_id'		=> ANONYMOUS,
-						'log_type'		=> LOG_ADMIN,
-						'log_operation'	=> 'LOG_TWO_ADDITIONAL',
-						'log_data'		=> 'a:2:{i:0;s:9:"argument1";i:1;s:9:"argument2";}',
-						'reportee_id'	=> 0,
-						'forum_id'		=> 0,
-						'topic_id'		=> 0,
+					'user_id'		=> ANONYMOUS,
+					'log_type'		=> LOG_ADMIN,
+					'log_operation'	=> 'LOG_TWO_ADDITIONAL',
+					'log_data'		=> array(
+						'argument1',
+						'argument2',
 					),
+					'reportee_id'	=> 0,
+					'forum_id'		=> 0,
+					'topic_id'		=> 0,
 				),
 				false, 'admin', 'LOG_TWO_ADDITIONAL', 'argument1', 'argument2',
 			),
 			array(
 				array(
-					array(
-						'user_id'		=> ANONYMOUS,
-						'log_type'		=> LOG_USERS,
-						'log_operation'	=> 'LOG_USERS_ADDITIONAL',
-						'log_data'		=> 'a:1:{i:0;s:9:"argument2";}',
-						'reportee_id'	=> 2,
-						'forum_id'		=> 0,
-						'topic_id'		=> 0,
+					'user_id'		=> ANONYMOUS,
+					'log_type'		=> LOG_USERS,
+					'log_operation'	=> 'LOG_USERS_ADDITIONAL',
+					'log_data'		=> array(
+						'argument2',
 					),
+					'reportee_id'	=> 2,
+					'forum_id'		=> 0,
+					'topic_id'		=> 0,
 				),
 				false, 'user', 2, 'LOG_USERS_ADDITIONAL', 'argument2',
 			),
 			array(
 				array(
-					array(
-						'user_id'		=> ANONYMOUS,
-						'log_type'		=> LOG_MOD,
-						'log_operation'	=> 'LOG_MOD_TOPIC_AND_FORUM',
-						'log_data'		=> '',
-						'reportee_id'	=> 0,
-						'forum_id'		=> 12,
-						'topic_id'		=> 34,
-					),
+					'user_id'		=> ANONYMOUS,
+					'log_type'		=> LOG_MOD,
+					'log_operation'	=> 'LOG_MOD_TOPIC_AND_FORUM',
+					'log_data'		=> '',
+					'reportee_id'	=> 0,
+					'forum_id'		=> 12,
+					'topic_id'		=> 34,
 				),
 				false, 'mod', 12, 34, 'LOG_MOD_TOPIC_AND_FORUM',
 			),
 			array(
 				array(
-					array(
-						'user_id'		=> ANONYMOUS,
-						'log_type'		=> LOG_MOD,
-						'log_operation'	=> 'LOG_MOD_ADDITIONAL',
-						'log_data'		=> 'a:1:{i:0;s:9:"argument3";}',
-						'reportee_id'	=> 0,
-						'forum_id'		=> 56,
-						'topic_id'		=> 78,
+					'user_id'		=> ANONYMOUS,
+					'log_type'		=> LOG_MOD,
+					'log_operation'	=> 'LOG_MOD_ADDITIONAL',
+					'log_data'		=> array(
+						'argument3',
 					),
+					'reportee_id'	=> 0,
+					'forum_id'		=> 56,
+					'topic_id'		=> 78,
 				),
 				false, 'mod', 56, 78, 'LOG_MOD_ADDITIONAL', 'argument3',
 			),
@@ -118,6 +115,16 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
 	{
 		global $db, $user;
 
+		if ($expected)
+		{
+			// Serialize the log data if we have some
+			if (is_array($expected['log_data']))
+			{
+				$expected['log_data'] = serialize($expected['log_data']);
+			}
+			$expected = array($expected);
+		}
+
 		$db = $this->new_dbal();
 
 		$user->ip = 'user_ip';
-- 
cgit v1.2.1