makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- updated security/redirect test to use new framework functionality

Browse source 
git-svn-id: file:///svn/phpbb/trunk@9104 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2008-11-24 00:27:18 +00:00
parent bcfcf9b048
commit c8cba06910
1 changed files with 9 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tests/security/redirect.php
View file

@ -10,8 +10,7 @@
define('IN_PHPBB', true); define('IN_PHPBB', true);
require_once 'PHPUnit/Framework.php'; require_once 'test_framework/framework.php';
require_once 'PHPUnit/Extensions/OutputTestCase.php';
define('PHPBB_ROOT_PATH', './../phpBB/'); define('PHPBB_ROOT_PATH', './../phpBB/');
define('PHP_EXT', 'php'); define('PHP_EXT', 'php');
@ -19,10 +18,8 @@ define('PHP_EXT', 'php');
require_once '../phpBB/includes/functions.php'; require_once '../phpBB/includes/functions.php';
require_once '../phpBB/includes/session.php'; require_once '../phpBB/includes/session.php';
class phpbb_security_redirect_test extends PHPUnit_Extensions_OutputTestCase class phpbb_security_redirect_test extends phpbb_test_case
{ {
protected $error_triggered = false;
public static function provider() public static function provider()
{ {
// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false)) // array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
@ -43,15 +40,6 @@ class phpbb_security_redirect_test extends PHPUnit_Extensions_OutputTestCase
); );
} }
/**
* Own error handler to catch trigger_error() calls within phpBB
*/
public function own_error_handler($errno, $errstr, $errfile, $errline)
{
echo $errstr;
$this->error_triggered = true;
}
/** /**
* @dataProvider provider * @dataProvider provider
*/ */
@ -59,34 +47,18 @@ class phpbb_security_redirect_test extends PHPUnit_Extensions_OutputTestCase
{ {
global $user; global $user;
set_error_handler(array($this, 'own_error_handler')); if ($expected_error !== false)
{
$this->setExpectedTriggerError(E_USER_ERROR, $expected_error);
}
$result = redirect($test, true); $result = redirect($test, true);
// If we expect no error and a returned result, we set the output string to be expected and check if an error was triggered (then fail instantly) // only verify result if we did not expect an error
if ($expected_error === false) if ($expected_error === false)
{ {
$this->expectOutputString($expected_result); $this->assertEquals($expected_result, $result);
print $result;
if ($this->error_triggered)
{
$this->fail();
}
} }
// If we expect an error, we set the expected output string to the error and check if there was an error triggered.
else
{
$this->expectOutputString($expected_error);
if (!$this->error_triggered)
{
$this->fail();
}
$this->error_triggered = false;
}
restore_error_handler();
} }
} }