Don't use the --verbose option anymore

diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 8292cad..2663a77 100644 (file)
--- 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 e881a51..4a6ce7c 100644 (file)
--- 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;
        }