From fb9c0cd58a5b2ba94d01c5c24733fbd4fb84a02e Mon Sep 17 00:00:00 2001 From: uckelman Date: Sat, 24 Apr 2010 16:55:32 +0000 Subject: Rejigger test to handle bbcode_second_pass modifying message parameter instead of returning it. git-svn-id: https://vassalengine.svn.sourceforge.net/svnroot/vassalengine/site-src/trunk@6734 67b53d14-2c14-4ace-a08f-0dab2b34000c --- test/unbbcodeTest.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'test/unbbcodeTest.php') diff --git a/test/unbbcodeTest.php b/test/unbbcodeTest.php index 12d6ad9..abbbe05 100644 --- a/test/unbbcodeTest.php +++ b/test/unbbcodeTest.php @@ -3,19 +3,30 @@ require_once('PHPUnit/Framework.php'); class unbbcodeTest extends PHPUnit_Framework_TestCase { - /** - * phpBB3 uses many globals; due to the way tests are run, we cannot - * easily get these globals into the right scope so that the methods - * called by our tests can see them. Therefore, we use this function - * to run tests externally and report back on the results. + * @dataProvider provider_bbcode_second_pass */ - protected function exec_kludge($run) { + public function test_bbcode_second_pass($msg, $uid, $bitfield, + $expected, $ex) { + if ($ex) $this->setExpectedException($ex); + + /** + * phpBB3 uses many globals; due to the way tests are run, we cannot + * easily get these globals into the right scope so that the methods + * called by our tests can see them. Therefore, we run tests externally + * and report back on the results. + */ $prog = <<$run); + \$unbbcode->bbcode_second_pass(\$msg, \$uid, \$bitfield); + \$result = serialize(\$msg); } catch (Exception \$e) { \$result = serialize(\$e); @@ -30,16 +41,7 @@ EOF; throw $result; } - return $result; - } - - /** - * @dataProvider provider_bbcode_second_pass - */ - public function test_bbcode_second_pass($msg, $uid, $bitfield, - $expected, $ex) { - - + $this->assertEquals($expected, $result); } public function provider_bbcode_second_pass() { -- cgit v1.2.3