Merge "jquery.client: Component-wise version comparison in #test with strings"

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiPHPUnitCommand.php

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index 0434bb3..cc49fde 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -7,23 +7,40 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
                'file=' => false,
                'use-filebackend=' => false,
                'use-bagostuff=' => false,
+               'use-jobqueue=' => false,
                'keep-uploads' => false,
                'use-normal-tables' => false,
                'reuse-db' => false,
                'wiki=' => false,
+               'debug-tests' => false,
        );
 
        public function __construct() {
-               foreach( self::$additionalOptions as $option => $default ) {
+               foreach ( self::$additionalOptions as $option => $default ) {
                        $this->longOptions[$option] = $option . 'Handler';
                }
+       }
+
+       protected function handleArguments( array $argv ) {
+               parent::handleArguments( $argv );
+
+               if ( !isset( $this->arguments['listeners'] ) ) {
+                       $this->arguments['listeners'] = array();
+               }
 
+               foreach ( $this->options[0] as $option ) {
+                       switch ( $option[0] ) {
+                               case '--debug-tests':
+                                       $this->arguments['listeners'][] = new MediaWikiPHPUnitTestListener( 'PHPUnitCommand' );
+                                       break;
+                       }
+               }
        }
 
        public static function main( $exit = true ) {
                $command = new self;
 
-               if( wfIsWindows() ) {
+               if ( wfIsWindows() ) {
                        # Windows does not come anymore with ANSI.SYS loaded by default
                        # PHPUnit uses the suite.xml parameters to enable/disable colors
                        # which can be then forced to be enabled with --colors.
@@ -40,18 +57,20 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
                # See bug 32022
                set_include_path(
                        __DIR__
-                       .PATH_SEPARATOR
-                       . get_include_path()
+                               . PATH_SEPARATOR
+                               . get_include_path()
                );
 
-               $command->run($_SERVER['argv'], $exit);
+               $command->run( $_SERVER['argv'], $exit );
        }
 
        public function __call( $func, $args ) {
 
-               if( substr( $func, -7 ) == 'Handler' ) {
-                       if( is_null( $args[0] ) ) $args[0] = true; //Booleans
-                       self::$additionalOptions[substr( $func, 0, -7 ) ] = $args[0];
+               if ( substr( $func, -7 ) == 'Handler' ) {
+                       if ( is_null( $args[0] ) ) {
+                               $args[0] = true;
+                       } //Booleans
+                       self::$additionalOptions[substr( $func, 0, -7 )] = $args[0];
                }
        }
 
@@ -81,18 +100,17 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
                print <<<EOT
 
 ParserTest-specific options:
-
   --regex="<regex>"        Only run parser tests that match the given regex
-  --file="<filename>"      Prints the version and exits.
+  --file="<filename>"      File describing parser tests
   --keep-uploads           Re-use the same upload directory for each test, don't delete it
 
-
 Database options:
   --use-normal-tables      Use normal DB tables.
   --reuse-db               Init DB only if tables are missing and keep after finish.
 
+Debugging options:
+  --debug-tests            Log testing activity to the PHPUnitCommand log channel.
 
 EOT;
        }
-
 }