From 1abf7ad80932cdb2651dbefff51406c9d234f3bd Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:30:46 -0500 Subject: [ticket/10049] Renamed session test files to proper file names. phpunit.xml.dist specifies that only files ending in _test.php are test files; with the old names session tests were not run as a result. PHPBB3-10049 --- tests/session/continue_test.php | 117 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 tests/session/continue_test.php (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php new file mode 100644 index 0000000000..58956c18a9 --- /dev/null +++ b/tests/session/continue_test.php @@ -0,0 +1,117 @@ +createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml'); + } + + static public function session_begin_attempts() + { + return array( + array( + 'bar_session', '4', 'user agent', + array( + array('session_id' => 'anon_session', 'session_user_id' => 1), + array('session_id' => 'bar_session', 'session_user_id' => 4) + ), + array(), + 'Check if no new session was created', + ), + array( + 'anon_session', '4', 'user agent', + array( + array('session_id' => 'bar_session', 'session_user_id' => 4), + array('session_id' => null, 'session_user_id' => 1) // use generated SID + ), + array( + 'u' => array('1', null), + 'k' => array(null, null), + 'sid' => array($_SID, null), + ), + 'Check if an anonymous new session was created', + ), + ); + } + + /** + * @dataProvider session_begin_attempts + */ + public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message) + { + $session = new phpbb_mock_session_testable; + $session->page = array('page' => 'page', 'forum' => 0); + + // set up all the global variables used in session_create + global $SID, $_SID, $db, $config, $cache; + + $config = $this->get_config(); + $db = $this->new_dbal(); + $cache_data = array( + '_bots' => array(), + ); + $cache = new phpbb_mock_cache; + $SID = $_SID = null; + + $_COOKIE['_sid'] = $session_id; + $_COOKIE['_u'] = $user_id; + $_SERVER['HTTP_USER_AGENT'] = $user_agent; + + $config['session_length'] = time(); // need to do this to allow sessions started at time 0 + $session->session_begin(); + + $sql = 'SELECT session_id, session_user_id + FROM phpbb_sessions'; + + // little tickery to allow using a dataProvider with dynamic expected result + foreach ($expected_sessions as $i => $s) + { + if (is_null($s['session_id'])) + { + $expected_sessions[$i]['session_id'] = $session->session_id; + } + } + + $this->assertResultEquals( + $sql, + $expected_sessions, + 'Check if no new session was created' + ); + + $session->check_cookies($this, $expected_cookies); + + $cache->check($this, $cache_data); + } + static public function get_config() + { + return array( + 'allow_autologin' => false, + 'auth_method' => 'db', + 'forwarded_for_check' => true, + 'active_sessions' => 0, // disable + 'rand_seed' => 'foo', + 'rand_seed_last_update' => 0, + 'max_autologin_time' => 0, + 'session_length' => 100, + 'form_token_lifetime' => 100, + 'cookie_name' => '', + 'limit_load' => 0, + 'limit_search_load' => 0, + 'ip_check' => 3, + 'browser_check' => 1, + ); + } +} + -- cgit v1.2.1 From 0cf741f3434ed5ad6550e3e8384d3f5665a23fe8 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:40:32 -0500 Subject: [ticket/10049] Fixed requires in session tests and mock. PHPBB3-10049 --- tests/session/continue_test.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 58956c18a9..f909737f86 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -7,9 +7,8 @@ * */ -require_once 'test_framework/framework.php'; -require_once 'mock/cache.php'; -require_once 'mock/session_testable.php'; +require_once dirname(__FILE__) . '/../mock/cache.php'; +require_once dirname(__FILE__) . '/../mock/session_testable.php'; class phpbb_session_continue_test extends phpbb_database_test_case { -- cgit v1.2.1 From 26b922ac3f220902bb527426039c552a0bcb8f5c Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:44:59 -0500 Subject: [ticket/10049] Chase assertResultEquals rename. cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 renamed assertResultEquals to assertSqlResultEquals. However, since the session tests were never executed calls in them were never updated. Parameter order also changed; chase that too. PHPBB3-10049 --- tests/session/continue_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index f909737f86..8debb10175 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -83,9 +83,9 @@ class phpbb_session_continue_test extends phpbb_database_test_case } } - $this->assertResultEquals( - $sql, + $this->assertSqlResultEquals( $expected_sessions, + $sql, 'Check if no new session was created' ); -- cgit v1.2.1 From f3ab9da0e9a79948f4ae87f1f960792daa90853f Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:50:15 -0500 Subject: [ticket/10049] Globalize $_SID. PHPBB3-10049 --- tests/session/continue_test.php | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 8debb10175..e5b2b7258e 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -19,6 +19,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case static public function session_begin_attempts() { + global $_SID; return array( array( 'bar_session', '4', 'user agent', -- cgit v1.2.1 From c1e198e7213d42025f9184aacb10fc58776cdbf3 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sun, 20 Feb 2011 08:45:59 -0500 Subject: [ticket/10049] Mark session continue test incomplete for now. I am unable to find any code revision in which this test worked. Thus to not break the entire suite I mark it incomplete. PHPBB3-10049 --- tests/session/continue_test.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index e5b2b7258e..ac682e06ac 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -51,6 +51,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case */ public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message) { + $this->markTestIncomplete('Test needs to be fixed'); + $session = new phpbb_mock_session_testable; $session->page = array('page' => 'page', 'forum' => 0); -- cgit v1.2.1 From 11262afa93fc7e1eea31873e3d1a7139230c427e Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 23 Feb 2011 17:21:51 +0100 Subject: [ticket/10052] Correct session tests, and separate session factory from tests PHPBB3-10052 --- tests/session/continue_test.php | 67 ++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 45 deletions(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index ac682e06ac..06b03f5780 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -2,13 +2,13 @@ /** * * @package testing -* @copyright (c) 2008 phpBB Group +* @copyright (c) 2011 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ require_once dirname(__FILE__) . '/../mock/cache.php'; -require_once dirname(__FILE__) . '/../mock/session_testable.php'; +require_once dirname(__FILE__) . '/testable_factory.php'; class phpbb_session_continue_test extends phpbb_database_test_case { @@ -22,16 +22,16 @@ class phpbb_session_continue_test extends phpbb_database_test_case global $_SID; return array( array( - 'bar_session', '4', 'user agent', + 'bar_session', '4', 'user agent', '127.0.0.1', array( array('session_id' => 'anon_session', 'session_user_id' => 1), array('session_id' => 'bar_session', 'session_user_id' => 4) ), array(), - 'Check if no new session was created', + 'If a request comes with a valid session id with matching user agent and IP, no new session should be created.', ), array( - 'anon_session', '4', 'user agent', + 'anon_session', '4', 'user agent', '127.0.0.1', array( array('session_id' => 'bar_session', 'session_user_id' => 4), array('session_id' => null, 'session_user_id' => 1) // use generated SID @@ -41,7 +41,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case 'k' => array(null, null), 'sid' => array($_SID, null), ), - 'Check if an anonymous new session was created', + 'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.', ), ); } @@ -49,29 +49,25 @@ class phpbb_session_continue_test extends phpbb_database_test_case /** * @dataProvider session_begin_attempts */ - public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $expected_sessions, $expected_cookies, $message) + public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message) { - $this->markTestIncomplete('Test needs to be fixed'); - - $session = new phpbb_mock_session_testable; - $session->page = array('page' => 'page', 'forum' => 0); - - // set up all the global variables used in session_create - global $SID, $_SID, $db, $config, $cache; - - $config = $this->get_config(); $db = $this->new_dbal(); - $cache_data = array( - '_bots' => array(), - ); - $cache = new phpbb_mock_cache; - $SID = $_SID = null; + $session_factory = new phpbb_session_testable_factory; + $session_factory->set_cookies(array( + '_sid' => $session_id, + '_u' => $user_id, + )); + $session_factory->merge_config_data(array( + 'session_length' => time(), // need to do this to allow sessions started at time 0 + )); + $session_factory->merge_server_data(array( + 'HTTP_USER_AGENT' => $user_agent, + 'REMOTE_ADDR' => $ip, + )); - $_COOKIE['_sid'] = $session_id; - $_COOKIE['_u'] = $user_id; - $_SERVER['HTTP_USER_AGENT'] = $user_agent; + $session = $session_factory->get_session($db); + $session->page = array('page' => 'page', 'forum' => 0); - $config['session_length'] = time(); // need to do this to allow sessions started at time 0 $session->session_begin(); $sql = 'SELECT session_id, session_user_id @@ -94,26 +90,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case $session->check_cookies($this, $expected_cookies); - $cache->check($this, $cache_data); - } - static public function get_config() - { - return array( - 'allow_autologin' => false, - 'auth_method' => 'db', - 'forwarded_for_check' => true, - 'active_sessions' => 0, // disable - 'rand_seed' => 'foo', - 'rand_seed_last_update' => 0, - 'max_autologin_time' => 0, - 'session_length' => 100, - 'form_token_lifetime' => 100, - 'cookie_name' => '', - 'limit_load' => 0, - 'limit_search_load' => 0, - 'ip_check' => 3, - 'browser_check' => 1, - ); + $session_factory->check($this); } } -- cgit v1.2.1 From 3d65c3c10484bc524160ebb4f4a483ba6c0dd8ed Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 27 Feb 2011 22:06:01 +0100 Subject: [task/session-tests] Make the session id replacement of dataset values clearer PHPBB3-9732 --- tests/session/continue_test.php | 44 ++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 06b03f5780..4e5df300f2 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -19,7 +19,6 @@ class phpbb_session_continue_test extends phpbb_database_test_case static public function session_begin_attempts() { - global $_SID; return array( array( 'bar_session', '4', 'user agent', '127.0.0.1', @@ -34,12 +33,12 @@ class phpbb_session_continue_test extends phpbb_database_test_case 'anon_session', '4', 'user agent', '127.0.0.1', array( array('session_id' => 'bar_session', 'session_user_id' => 4), - array('session_id' => null, 'session_user_id' => 1) // use generated SID + array('session_id' => '__new_session_id__', 'session_user_id' => 1) // use generated SID ), array( 'u' => array('1', null), 'k' => array(null, null), - 'sid' => array($_SID, null), + 'sid' => array('__new_session_id__', null), ), 'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.', ), @@ -73,14 +72,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case $sql = 'SELECT session_id, session_user_id FROM phpbb_sessions'; - // little tickery to allow using a dataProvider with dynamic expected result - foreach ($expected_sessions as $i => $s) - { - if (is_null($s['session_id'])) - { - $expected_sessions[$i]['session_id'] = $session->session_id; - } - } + $expected_sessions = $this->replace_session($expected_sessions, $session->session_id); + $expected_cookies = $this->replace_session($expected_cookies, $session->session_id); $this->assertSqlResultEquals( $expected_sessions, @@ -92,5 +85,32 @@ class phpbb_session_continue_test extends phpbb_database_test_case $session_factory->check($this); } -} + /** + * Replaces recursively the value __new_session_id__ with the given session + * id. + * + * @param array $array An array of data + * @param string $session_id The new session id to use instead of the + * placeholder. + * @return array The input array with all occurances of __new_session_id__ + * replaced. + */ + public function replace_session($array, $session_id) + { + foreach ($array as $key => &$value) + { + if ($value === '__new_session_id__') + { + $value = $session_id; + } + + if (is_array($value)) + { + $value = $this->replace_session($value, $session_id); + } + } + + return $array; + } +} -- cgit v1.2.1 From bbf3864cb4cd3762a64b9489cfd38b7ac93df423 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 27 Feb 2011 22:16:39 +0100 Subject: [task/session-tests] Correctly display message on session continue test failure PHPBB3-9732 --- tests/session/continue_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 4e5df300f2..27ac457c2d 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -78,7 +78,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case $this->assertSqlResultEquals( $expected_sessions, $sql, - 'Check if no new session was created' + $message ); $session->check_cookies($this, $expected_cookies); -- cgit v1.2.1 From 921603b09e1e34059f783c502d5dfc9ae0189057 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 27 Feb 2011 22:20:36 +0100 Subject: [task/session-tests] Make result check independent of returned row order. PHPBB3-9732 --- tests/session/continue_test.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 27ac457c2d..3080121978 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -24,7 +24,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case 'bar_session', '4', 'user agent', '127.0.0.1', array( array('session_id' => 'anon_session', 'session_user_id' => 1), - array('session_id' => 'bar_session', 'session_user_id' => 4) + array('session_id' => 'bar_session', 'session_user_id' => 4), ), array(), 'If a request comes with a valid session id with matching user agent and IP, no new session should be created.', @@ -32,8 +32,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case array( 'anon_session', '4', 'user agent', '127.0.0.1', array( + array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID array('session_id' => 'bar_session', 'session_user_id' => 4), - array('session_id' => '__new_session_id__', 'session_user_id' => 1) // use generated SID ), array( 'u' => array('1', null), @@ -70,7 +70,8 @@ class phpbb_session_continue_test extends phpbb_database_test_case $session->session_begin(); $sql = 'SELECT session_id, session_user_id - FROM phpbb_sessions'; + FROM phpbb_sessions + ORDER BY session_user_id'; $expected_sessions = $this->replace_session($expected_sessions, $session->session_id); $expected_cookies = $this->replace_session($expected_cookies, $session->session_id); -- cgit v1.2.1 From d36f78b9f1c7fc0c52a36d95510be1d8e2361f5d Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 18 Mar 2011 03:15:40 +0100 Subject: [ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32). This fixes session unit tests on PostgreSQL in particular. PHPBB3-10082 --- tests/session/continue_test.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tests/session/continue_test.php') diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php index 3080121978..6737562a0a 100644 --- a/tests/session/continue_test.php +++ b/tests/session/continue_test.php @@ -19,21 +19,25 @@ class phpbb_session_continue_test extends phpbb_database_test_case static public function session_begin_attempts() { + // The session_id field is defined as CHAR(32) in the database schema. + // Thus the data we put in session_id fields has to have a length of 32 characters on stricter DBMSes. + // Thus we fill those strings up with zeroes until they have a string length of 32. + return array( array( - 'bar_session', '4', 'user agent', '127.0.0.1', + 'bar_session000000000000000000000', '4', 'user agent', '127.0.0.1', array( - array('session_id' => 'anon_session', 'session_user_id' => 1), - array('session_id' => 'bar_session', 'session_user_id' => 4), + array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1), + array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4), ), array(), 'If a request comes with a valid session id with matching user agent and IP, no new session should be created.', ), array( - 'anon_session', '4', 'user agent', '127.0.0.1', + 'anon_session00000000000000000000', '4', 'user agent', '127.0.0.1', array( array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID - array('session_id' => 'bar_session', 'session_user_id' => 4), + array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4), ), array( 'u' => array('1', null), -- cgit v1.2.1