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] Move check_ban_test functions to setUp/tearDown for clarity

Browse source 
PHPBB3-11620
This commit is contained in:
Andy Chase 2013-07-22 17:39:14 -07:00
parent 568de3b8ce
commit 0c54fb034b
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/session/check_ban_test.php
View file

@ -13,6 +13,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
{ {
protected $user_id = 4; protected $user_id = 4;
protected $key_id = 4; protected $key_id = 4;
protected $session;
protected $backup_cache;
public function getDataSet() public function getDataSet()
{ {
@ -31,14 +33,16 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
); );
} }
/** @dataProvider check_banned_data */ public function setUp()
public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned)
{ {
$session = $this->session_factory->get_session($this->db); parent::setUp();
// Change the global cache object for this test because // Get session here so that config is mocked correctly
// the mock cache object does not hit the database as is $this->session = $this->session_factory->get_session($this->db);
// needed for this test.
global $cache, $config, $phpbb_root_path, $phpEx; global $cache, $config, $phpbb_root_path, $phpEx;
$this->backup_cache = $cache;
// Change the global cache object for this test because
// the mock cache object does not hit the database as is needed
// for this test.
$cache = new phpbb_cache_service( $cache = new phpbb_cache_service(
new phpbb_cache_driver_file(), new phpbb_cache_driver_file(),
$config, $config,
@ -46,17 +50,29 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
$phpbb_root_path, $phpbb_root_path,
$phpEx $phpEx
); );
}
public function tearDown()
{
parent::tearDown();
// Set cache back to what it was before the test changed it
global $cache;
$cache = $this->backup_cache;
}
/** @dataProvider check_banned_data */
public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned)
{
try try
{ {
$is_banned = $session->check_ban($user_id, $user_ips, $user_email, $return); $is_banned = $this->session->check_ban($user_id, $user_ips, $user_email, $return);
} catch (PHPUnit_Framework_Error_Notice $e) }
catch (PHPUnit_Framework_Error_Notice $e)
{ {
// User error was triggered, user must have been banned // User error was triggered, user must have been banned
$is_banned = true; $is_banned = true;
} }
$this->assertEquals($should_be_banned, $is_banned, $test_msg);
$cache = new phpbb_mock_cache(); $this->assertEquals($should_be_banned, $is_banned, $test_msg);
} }
} }