From c8cba06910c1f30469cc301c03afa1d5a431c568 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 24 Nov 2008 00:27:18 +0000
Subject: [PATCH] - updated security/redirect test to use new framework
 functionality

git-svn-id: file:///svn/phpbb/trunk@9104 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 tests/security/redirect.php | 46 ++++++++-----------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/tests/security/redirect.php b/tests/security/redirect.php
index 0cf67b7aef..24ad60b0d1 100644
--- a/tests/security/redirect.php
+++ b/tests/security/redirect.php
@@ -10,8 +10,7 @@
 
 define('IN_PHPBB', true);
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/Extensions/OutputTestCase.php';
+require_once 'test_framework/framework.php';
 
 define('PHPBB_ROOT_PATH', './../phpBB/');
 define('PHP_EXT', 'php');
@@ -19,10 +18,8 @@ define('PHP_EXT', 'php');
 require_once '../phpBB/includes/functions.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()
 	{
 		// 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
 	*/
@@ -59,34 +47,18 @@ class phpbb_security_redirect_test extends PHPUnit_Extensions_OutputTestCase
 	{
 		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);
 
-		// 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)
 		{
-			$this->expectOutputString($expected_result);
-			print $result;
-
-			if ($this->error_triggered)
-			{
-				$this->fail();
-			}
+			$this->assertEquals($expected_result, $result);
 		}
-		// 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();
 	}
 }