From 1abf7ad80932cdb2651dbefff51406c9d234f3bd Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:30:46 -0500 Subject: [PATCH 1/6] [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/{session_continue.php => continue_test.php} | 0 tests/session/{session_init.php => init_test.php} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/session/{session_continue.php => continue_test.php} (100%) rename tests/session/{session_init.php => init_test.php} (100%) diff --git a/tests/session/session_continue.php b/tests/session/continue_test.php similarity index 100% rename from tests/session/session_continue.php rename to tests/session/continue_test.php diff --git a/tests/session/session_init.php b/tests/session/init_test.php similarity index 100% rename from tests/session/session_init.php rename to tests/session/init_test.php From 0cf741f3434ed5ad6550e3e8384d3f5665a23fe8 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:40:32 -0500 Subject: [PATCH 2/6] [ticket/10049] Fixed requires in session tests and mock. PHPBB3-10049 --- tests/mock/session_testable.php | 4 ++-- tests/session/continue_test.php | 5 ++--- tests/session/init_test.php | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php index 2d7d42f82a..0d4642d372 100644 --- a/tests/mock/session_testable.php +++ b/tests/mock/session_testable.php @@ -7,8 +7,8 @@ * */ -require_once '../phpBB/includes/functions.php'; -require_once '../phpBB/includes/session.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; class phpbb_mock_session_testable extends session { 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 { diff --git a/tests/session/init_test.php b/tests/session/init_test.php index f6fa564880..6cda7a0c2c 100644 --- a/tests/session/init_test.php +++ b/tests/session/init_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_init_test extends phpbb_database_test_case { From 26b922ac3f220902bb527426039c552a0bcb8f5c Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:44:59 -0500 Subject: [PATCH 3/6] [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 ++-- tests/session/init_test.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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' ); diff --git a/tests/session/init_test.php b/tests/session/init_test.php index 6cda7a0c2c..c810bd6c3c 100644 --- a/tests/session/init_test.php +++ b/tests/session/init_test.php @@ -40,9 +40,9 @@ class phpbb_session_init_test extends phpbb_database_test_case $sql = 'SELECT session_user_id FROM phpbb_sessions'; - $this->assertResultEquals( - $sql, + $this->assertSqlResultEquals( array(array('session_user_id' => 3)), + $sql, 'Check if exacly one session for user id 3 was created' ); From f3ab9da0e9a79948f4ae87f1f960792daa90853f Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sat, 19 Feb 2011 20:50:15 -0500 Subject: [PATCH 4/6] [ticket/10049] Globalize $_SID. PHPBB3-10049 --- tests/session/continue_test.php | 1 + 1 file changed, 1 insertion(+) 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', From c1e198e7213d42025f9184aacb10fc58776cdbf3 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sun, 20 Feb 2011 08:45:59 -0500 Subject: [PATCH 5/6] [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(+) 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); From 6902ecf6a97df44b6874c0bf4c9fa28275b7c9f7 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Sun, 20 Feb 2011 08:53:15 -0500 Subject: [PATCH 6/6] [ticket/10049] Mark session init test incomplete for now. This test passes by itself but fails when run as part of the compete suite. Mark it incomplete to avoid breaking the suite. PHPBB3-10049 --- tests/session/init_test.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/session/init_test.php b/tests/session/init_test.php index c810bd6c3c..ccb0554409 100644 --- a/tests/session/init_test.php +++ b/tests/session/init_test.php @@ -21,6 +21,8 @@ class phpbb_session_init_test extends phpbb_database_test_case public function test_login_session_create() { + $this->markTestIncomplete('Test fails when run as part of the test suite'); + $session = new phpbb_mock_session_testable; $session->page = array('page' => 'page', 'forum' => 0);