From 37279160f32d2e5ab86e362c165788fbe3fc864f Mon Sep 17 00:00:00 2001 From: X! Date: Sat, 1 Jan 2011 17:05:08 +0000 Subject: [PATCH] Don't use the --verbose option anymore --- tests/phpunit/includes/parser/NewParserTest.php | 9 ++++++--- tests/phpunit/includes/parser/ParserHelpers.php | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php index 8292cadfd3..2663a7741d 100644 --- a/tests/phpunit/includes/parser/NewParserTest.php +++ b/tests/phpunit/includes/parser/NewParserTest.php @@ -302,9 +302,12 @@ class NewParserTest extends MediaWikiTestCase { foreach ( $iter as $t ) { - $result = $this->doRunTest( $t['test'], $t['input'], $t['result'], $t['options'], $t['config'] ); - - //$this->recorder->record( $t['test'], $result ); + try { + $result = $this->doRunTest( $t['test'], $t['input'], $t['result'], $t['options'], $t['config'] ); + } catch( Exception $e ) { + $this->assertTrue( false, $t['test'] . ' (failed: ' . $e->getMessage() . ')' ); + } + } } diff --git a/tests/phpunit/includes/parser/ParserHelpers.php b/tests/phpunit/includes/parser/ParserHelpers.php index e881a515d2..4a6ce7c47e 100644 --- a/tests/phpunit/includes/parser/ParserHelpers.php +++ b/tests/phpunit/includes/parser/ParserHelpers.php @@ -2,19 +2,16 @@ class PHPUnitParserTest extends ParserTest { function showTesting( $desc ) { - if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showTesting( $desc ); /* Do nothing since we don't want to show info during PHPUnit testing. */ } public function showSuccess( $desc ) { PHPUnit_Framework_Assert::assertTrue( true, $desc ); - if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showSuccess( $desc ); return true; } public function showFailure( $desc, $expected, $got ) { PHPUnit_Framework_Assert::assertEquals( $expected, $got, $desc ); - if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showFailure( $desc, $expected, $got ); return false; } -- 2.20.1