makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 18:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10714] Serialize the log_data in the testinsteadof hardcoding it

Browse source 
PHPBB3-10714
This commit is contained in:
Joas Schilling 2012-03-18 13:40:56 +01:00
parent 72d875ebde
commit 31e18f31a6
1 changed files with 57 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
tests/log/function_add_log_test.php
View file

@ -21,85 +21,82 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case
return array( return array(
array( array(
array( array(
array( 'user_id' => 2,
'user_id' => 2, 'log_type' => LOG_CRITICAL,
'log_type' => LOG_CRITICAL, 'log_operation' => 'LOG_NO_ADDITIONAL',
'log_operation' => 'LOG_NO_ADDITIONAL', 'log_data' => '',
'log_data' => '', 'reportee_id' => 0,
'reportee_id' => 0, 'forum_id' => 0,
'forum_id' => 0, 'topic_id' => 0,
'topic_id' => 0,
),
), ),
2, 'critical', 'LOG_NO_ADDITIONAL', 2, 'critical', 'LOG_NO_ADDITIONAL',
), ),
array( array(
array( array(
array( 'user_id' => 2,
'user_id' => 2, 'log_type' => LOG_CRITICAL,
'log_type' => LOG_CRITICAL, 'log_operation' => 'LOG_ONE_ADDITIONAL',
'log_operation' => 'LOG_ONE_ADDITIONAL', 'log_data' => array(
'log_data' => 'a:1:{i:0;s:9:"argument1";}', 'argument1',
'reportee_id' => 0,
'forum_id' => 0,
'topic_id' => 0,
), ),
'reportee_id' => 0,
'forum_id' => 0,
'topic_id' => 0,
), ),
2, 'critical', 'LOG_ONE_ADDITIONAL', 'argument1', 2, 'critical', 'LOG_ONE_ADDITIONAL', 'argument1',
), ),
array( array(
array( array(
array( 'user_id' => ANONYMOUS,
'user_id' => ANONYMOUS, 'log_type' => LOG_ADMIN,
'log_type' => LOG_ADMIN, 'log_operation' => 'LOG_TWO_ADDITIONAL',
'log_operation' => 'LOG_TWO_ADDITIONAL', 'log_data' => array(
'log_data' => 'a:2:{i:0;s:9:"argument1";i:1;s:9:"argument2";}', 'argument1',
'reportee_id' => 0, 'argument2',
'forum_id' => 0,
'topic_id' => 0,
), ),
'reportee_id' => 0,
'forum_id' => 0,
'topic_id' => 0,
), ),
false, 'admin', 'LOG_TWO_ADDITIONAL', 'argument1', 'argument2', false, 'admin', 'LOG_TWO_ADDITIONAL', 'argument1', 'argument2',
), ),
array( array(
array( array(
array( 'user_id' => ANONYMOUS,
'user_id' => ANONYMOUS, 'log_type' => LOG_USERS,
'log_type' => LOG_USERS, 'log_operation' => 'LOG_USERS_ADDITIONAL',
'log_operation' => 'LOG_USERS_ADDITIONAL', 'log_data' => array(
'log_data' => 'a:1:{i:0;s:9:"argument2";}', 'argument2',
'reportee_id' => 2,
'forum_id' => 0,
'topic_id' => 0,
), ),
'reportee_id' => 2,
'forum_id' => 0,
'topic_id' => 0,
), ),
false, 'user', 2, 'LOG_USERS_ADDITIONAL', 'argument2', false, 'user', 2, 'LOG_USERS_ADDITIONAL', 'argument2',
), ),
array( array(
array( array(
array( 'user_id' => ANONYMOUS,
'user_id' => ANONYMOUS, 'log_type' => LOG_MOD,
'log_type' => LOG_MOD, 'log_operation' => 'LOG_MOD_TOPIC_AND_FORUM',
'log_operation' => 'LOG_MOD_TOPIC_AND_FORUM', 'log_data' => '',
'log_data' => '', 'reportee_id' => 0,
'reportee_id' => 0, 'forum_id' => 12,
'forum_id' => 12, 'topic_id' => 34,
'topic_id' => 34,
),
), ),
false, 'mod', 12, 34, 'LOG_MOD_TOPIC_AND_FORUM', false, 'mod', 12, 34, 'LOG_MOD_TOPIC_AND_FORUM',
), ),
array( array(
array( array(
array( 'user_id' => ANONYMOUS,
'user_id' => ANONYMOUS, 'log_type' => LOG_MOD,
'log_type' => LOG_MOD, 'log_operation' => 'LOG_MOD_ADDITIONAL',
'log_operation' => 'LOG_MOD_ADDITIONAL', 'log_data' => array(
'log_data' => 'a:1:{i:0;s:9:"argument3";}', 'argument3',
'reportee_id' => 0,
'forum_id' => 56,
'topic_id' => 78,
), ),
'reportee_id' => 0,
'forum_id' => 56,
'topic_id' => 78,
), ),
false, 'mod', 56, 78, 'LOG_MOD_ADDITIONAL', 'argument3', 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; 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(); $db = $this->new_dbal();
$user->ip = 'user_ip'; $user->ip = 'user_ip';