diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-07 14:55:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-06-07 14:55:56 +0200 |
| commit | 1743e4282b92134b0536a11d584b8504ac2311bb (patch) | |
| tree | 1485a3227b8205b1e45ef8a026287ec2eb7a13f3 | |
| parent | d406dd99d84a5c4f2b879859f11b2d10b01d54de (diff) | |
| parent | d39ed5afc13285c1d6d14ea0d04be87dd11f7d38 (diff) | |
| download | forums-1743e4282b92134b0536a11d584b8504ac2311bb.tar forums-1743e4282b92134b0536a11d584b8504ac2311bb.tar.gz forums-1743e4282b92134b0536a11d584b8504ac2311bb.tar.bz2 forums-1743e4282b92134b0536a11d584b8504ac2311bb.tar.xz forums-1743e4282b92134b0536a11d584b8504ac2311bb.zip | |
Merge branch 'ticket/11543' into ticket/develop/11543
* ticket/11543:
[ticket/11543] Add more users so #hidden <> #normal
Conflicts:
tests/functions/obtain_online_test.php
| -rw-r--r-- | tests/functions/fixtures/obtain_online.xml | 10 | ||||
| -rw-r--r-- | tests/functions/obtain_online_test.php | 21 |
2 files changed, 21 insertions, 10 deletions
diff --git a/tests/functions/fixtures/obtain_online.xml b/tests/functions/fixtures/obtain_online.xml index 1c5a4454f2..05bbe6a05e 100644 --- a/tests/functions/fixtures/obtain_online.xml +++ b/tests/functions/fixtures/obtain_online.xml @@ -107,5 +107,15 @@ <value></value> <value></value> </row> + <row> + <value>10</value> + <value>10</value> + <value>10</value> + <value>0</value> + <value></value> + <value></value> + <value></value> + <value></value> + </row> </table> </dataset> diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php index 30e743cbab..fe372431a9 100644 --- a/tests/functions/obtain_online_test.php +++ b/tests/functions/obtain_online_test.php @@ -53,19 +53,19 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case { return array( array(0, false, array( - 'online_users' => array(2 => 2, 3 => 3, 6 => 6, 7 => 7), - 'hidden_users' => array(6 => 6, 7 => 7), - 'total_online' => 4, + 'online_users' => array(2 => 2, 3 => 3, 6 => 6, 7 => 7, 10 => 10), + 'hidden_users' => array(6 => 6, 7 => 7, 10 => 10), + 'total_online' => 5, 'visible_online' => 2, - 'hidden_online' => 2, + 'hidden_online' => 3, 'guests_online' => 0, )), array(0, true, array( - 'online_users' => array(2 => 2, 3 => 3, 6 => 6, 7 => 7), - 'hidden_users' => array(6 => 6, 7 => 7), - 'total_online' => 6, + 'online_users' => array(2 => 2, 3 => 3, 6 => 6, 7 => 7, 10 => 10), + 'hidden_users' => array(6 => 6, 7 => 7, 10 => 10), + 'total_online' => 7, 'visible_online' => 2, - 'hidden_online' => 2, + 'hidden_online' => 3, 'guests_online' => 2, )), array(1, false, array( @@ -124,11 +124,11 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case return array( array(0, false, array( 'online_userlist' => 'REGISTERED_USERS 2, 3', - 'l_online_users' => 'ONLINE_USERS_TOTAL 4 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 2', + 'l_online_users' => 'ONLINE_USERS_TOTAL 5 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 3', )), array(0, true, array( 'online_userlist' => 'REGISTERED_USERS 2, 3', - 'l_online_users' => 'ONLINE_USERS_TOTAL_GUESTS 6 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 2 GUEST_USERS_TOTAL 2', + 'l_online_users' => 'ONLINE_USERS_TOTAL_GUESTS 7 REG_USERS_TOTAL 2 HIDDEN_USERS_TOTAL 3 GUEST_USERS_TOTAL 2', )), array(1, false, array( 'online_userlist' => 'BROWSING_FORUM 3', @@ -198,6 +198,7 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case $this->add_session(7, '0006', '192.168.0.10', 1, false, $time); $this->add_session(8, '0007', '192.168.0.11', 0, false, $time, 10); $this->add_session(9, '0008', '192.168.0.12', 1, false, $time, 10); + $this->add_session(10, '009', '192.168.0.13', 0, false, $time); } protected function add_session($user_id, $session_id, $user_ip, $forum_id, $view_online, $time, $time_delta = 0) |