Index: trunk/phase3/tests/phpunit/includes/parser/ParserHelpers.php |
— | — | @@ -2,19 +2,16 @@ |
3 | 3 | |
4 | 4 | class PHPUnitParserTest extends ParserTest { |
5 | 5 | function showTesting( $desc ) { |
6 | | - if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showTesting( $desc ); |
7 | 6 | /* Do nothing since we don't want to show info during PHPUnit testing. */ |
8 | 7 | } |
9 | 8 | |
10 | 9 | public function showSuccess( $desc ) { |
11 | 10 | PHPUnit_Framework_Assert::assertTrue( true, $desc ); |
12 | | - if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showSuccess( $desc ); |
13 | 11 | return true; |
14 | 12 | } |
15 | 13 | |
16 | 14 | public function showFailure( $desc, $expected, $got ) { |
17 | 15 | PHPUnit_Framework_Assert::assertEquals( $expected, $got, $desc ); |
18 | | - if( MediaWikiPHPUnitCommand::$additionalArgs['verbose'] ) parent::showFailure( $desc, $expected, $got ); |
19 | 16 | return false; |
20 | 17 | } |
21 | 18 | |
Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
— | — | @@ -302,9 +302,12 @@ |
303 | 303 | |
304 | 304 | foreach ( $iter as $t ) { |
305 | 305 | |
306 | | - $result = $this->doRunTest( $t['test'], $t['input'], $t['result'], $t['options'], $t['config'] ); |
307 | | - |
308 | | - //$this->recorder->record( $t['test'], $result ); |
| 306 | + try { |
| 307 | + $result = $this->doRunTest( $t['test'], $t['input'], $t['result'], $t['options'], $t['config'] ); |
| 308 | + } catch( Exception $e ) { |
| 309 | + $this->assertTrue( false, $t['test'] . ' (failed: ' . $e->getMessage() . ')' ); |
| 310 | + } |
| 311 | + |
309 | 312 | } |
310 | 313 | |
311 | 314 | } |