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

[ticket/11620] Whitespace and combine function into test_case

Browse source 
PHPBB3-11620
This commit is contained in:
Andy Chase 2013-07-22 17:39:45 -07:00
parent 0c54fb034b
commit 2fe2724e68
7 changed files with 30 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/session/check_isvalid_test.php
View file

@ -28,21 +28,12 @@ class phpbb_session_check_isvalid_test extends phpbb_session_test_case
return $session; return $session;
} }
protected function check_session_equals($expected_sessions, $message)
{
$sql = 'SELECT session_id, session_user_id
FROM phpbb_sessions
ORDER BY session_user_id';
$this->assertSqlResultEquals($expected_sessions, $sql, $message);
}
public function test_session_valid_session_exists() public function test_session_valid_session_exists()
{ {
$session = $this->access_with('bar_session000000000000000000000', '4', 'user agent', '127.0.0.1'); $session = $this->access_with('bar_session000000000000000000000', '4', 'user agent', '127.0.0.1');
$session->check_cookies($this, array()); $session->check_cookies($this, array());
$this->check_session_equals(array( $this->check_sessions_equals(array(
array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1), array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4), array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
), ),
@ -59,7 +50,7 @@ class phpbb_session_check_isvalid_test extends phpbb_session_test_case
'sid' => array($session->session_id, null), 'sid' => array($session->session_id, null),
)); ));
$this->check_session_equals(array( $this->check_sessions_equals(array(
array('session_id' => $session->session_id, 'session_user_id' => 1), // use generated SID array('session_id' => $session->session_id, 'session_user_id' => 1), // use generated SID
array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4), array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
), ),

2
tests/session/create_test.php
View file

@ -38,6 +38,6 @@ class phpbb_session_create_test extends phpbb_session_test_case
self::bot('user agent', 13, '127.0.0.1'), self::bot('user agent', 13, '127.0.0.1'),
'' ''
); );
$this->assertEquals(true, $output->data['is_bot'] , 'should be a bot'); $this->assertEquals(true, $output->data['is_bot'], 'should be a bot');
} }
} }

22
tests/session/garbage_collection_test.php
View file

@ -24,29 +24,19 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
$this->session = $this->session_factory->get_session($this->db); $this->session = $this->session_factory->get_session($this->db);
} }
protected function assert_sessions_equal($expected, $msg)
{
$sql = 'SELECT session_id, session_user_id
FROM phpbb_sessions
ORDER BY session_user_id';
$this->assertSqlResultEquals($expected, $sql, $msg);
}
public function test_cleanup_all() public function test_cleanup_all()
{ {
$this->assert_sessions_equal( $this->check_sessions_equals(
array(
array( array(
array
(
'session_id' => 'anon_session00000000000000000000', 'session_id' => 'anon_session00000000000000000000',
'session_user_id' => 1, 'session_user_id' => 1,
), ),
array array(
(
'session_id' => 'bar_session000000000000000000000', 'session_id' => 'bar_session000000000000000000000',
'session_user_id' => 4, 'session_user_id' => 4,
)), ),
),
'Before test, should have some sessions.' 'Before test, should have some sessions.'
); );
// Set session length so it clears all // Set session length so it clears all
@ -55,7 +45,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
// There is an error unless the captcha plugin is set // There is an error unless the captcha plugin is set
$config['captcha_plugin'] = 'phpbb_captcha_nogd'; $config['captcha_plugin'] = 'phpbb_captcha_nogd';
$this->session->session_gc(); $this->session->session_gc();
$this->assert_sessions_equal( $this->check_sessions_equals(
array(), array(),
'After setting session time to 0, should remove all.' 'After setting session time to 0, should remove all.'
); );

8
tests/session/testable_facade.php
View file

@ -33,7 +33,7 @@ class phpbb_session_testable_facade
$this->session_factory = $session_factory; $this->session_factory = $session_factory;
} }
function extract_current_page ( function extract_current_page(
$root_path, $root_path,
$php_self, $php_self,
$query_string, $query_string,
@ -48,7 +48,7 @@ class phpbb_session_testable_facade
return phpbb_session::extract_current_page($root_path); return phpbb_session::extract_current_page($root_path);
} }
function extract_current_hostname ( function extract_current_hostname(
$host, $host,
$server_name_config, $server_name_config,
$cookie_domain_config $cookie_domain_config
@ -75,7 +75,7 @@ class phpbb_session_testable_facade
* @param request_overrides An array of overrides for the global request object * @param request_overrides An array of overrides for the global request object
* @return boolean False if the user is identified, otherwise true. * @return boolean False if the user is identified, otherwise true.
*/ */
function session_begin ( function session_begin(
$update_session_page = true, $update_session_page = true,
$config_overrides = array(), $config_overrides = array(),
$request_overrides = array(), $request_overrides = array(),
@ -90,7 +90,7 @@ class phpbb_session_testable_facade
return $session; return $session;
} }
function session_create ( function session_create(
$user_id = false, $user_id = false,
$set_admin = false, $set_admin = false,
$persist_login = false, $persist_login = false,

5
tests/session/validate_referrer_test.php
View file

@ -16,7 +16,8 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml'); return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml');
} }
static function referrer_inputs() { static function referrer_inputs()
{
$ex = "example.org"; $ex = "example.org";
$alt = "example.com"; $alt = "example.com";
return array( return array(
@ -40,7 +41,7 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
} }
/** @dataProvider referrer_inputs */ /** @dataProvider referrer_inputs */
function test_referrer_inputs ( function test_referrer_inputs(
$check_script_path, $check_script_path,
$referrer, $referrer,
$host, $host,

9
tests/test_framework/phpbb_session_test_case.php
View file

@ -24,4 +24,13 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
$this->session_facade = $this->session_facade =
new phpbb_session_testable_facade($this->db, $this->session_factory); new phpbb_session_testable_facade($this->db, $this->session_factory);
} }
protected function check_sessions_equals($expected_sessions, $message)
{
$sql = 'SELECT session_id, session_user_id
FROM phpbb_sessions
ORDER BY session_user_id';
$this->assertSqlResultEquals($expected_sessions, $sql, $message);
}
} }