makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10049] Mark session init test incomplete for now.
  [ticket/10049] Mark session continue test incomplete for now.
  [ticket/10049] Globalize $_SID.
  [ticket/10049] Chase assertResultEquals rename.
  [ticket/10049] Fixed requires in session tests and mock.
  [ticket/10049] Renamed session test files to proper file names.
This commit is contained in:
Andreas Fischer 2011-02-20 18:33:59 +01:00
commit a89be371e8
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/mock/session_testable.php
View file

@ -7,8 +7,8 @@
* *
*/ */
require_once '../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once '../phpBB/includes/session.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
class phpbb_mock_session_testable extends session class phpbb_mock_session_testable extends session
{ {

12
tests/session/session_continue.php → tests/session/continue_test.php
View file

@ -7,9 +7,8 @@
* *
*/ */
require_once 'test_framework/framework.php'; require_once dirname(__FILE__) . '/../mock/cache.php';
require_once 'mock/cache.php'; require_once dirname(__FILE__) . '/../mock/session_testable.php';
require_once 'mock/session_testable.php';
class phpbb_session_continue_test extends phpbb_database_test_case class phpbb_session_continue_test extends phpbb_database_test_case
{ {
@ -20,6 +19,7 @@ class phpbb_session_continue_test extends phpbb_database_test_case
static public function session_begin_attempts() static public function session_begin_attempts()
{ {
global $_SID;
return array( return array(
array( array(
'bar_session', '4', 'user agent', 'bar_session', '4', 'user agent',
@ -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) 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 = new phpbb_mock_session_testable;
$session->page = array('page' => 'page', 'forum' => 0); $session->page = array('page' => 'page', 'forum' => 0);
@ -84,9 +86,9 @@ class phpbb_session_continue_test extends phpbb_database_test_case
} }
} }
$this->assertResultEquals( $this->assertSqlResultEquals(
$sql,
$expected_sessions, $expected_sessions,
$sql,
'Check if no new session was created' 'Check if no new session was created'
); );

11
tests/session/session_init.php → tests/session/init_test.php
View file

@ -7,9 +7,8 @@
* *
*/ */
require_once 'test_framework/framework.php'; require_once dirname(__FILE__) . '/../mock/cache.php';
require_once 'mock/cache.php'; require_once dirname(__FILE__) . '/../mock/session_testable.php';
require_once 'mock/session_testable.php';
class phpbb_session_init_test extends phpbb_database_test_case class phpbb_session_init_test extends phpbb_database_test_case
{ {
@ -22,6 +21,8 @@ class phpbb_session_init_test extends phpbb_database_test_case
public function test_login_session_create() 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 = new phpbb_mock_session_testable;
$session->page = array('page' => 'page', 'forum' => 0); $session->page = array('page' => 'page', 'forum' => 0);
@ -41,9 +42,9 @@ class phpbb_session_init_test extends phpbb_database_test_case
$sql = 'SELECT session_user_id $sql = 'SELECT session_user_id
FROM phpbb_sessions'; FROM phpbb_sessions';
$this->assertResultEquals( $this->assertSqlResultEquals(
$sql,
array(array('session_user_id' => 3)), array(array('session_user_id' => 3)),
$sql,
'Check if exacly one session for user id 3 was created' 'Check if exacly one session for user id 3 was created'
); );