From 62698090e0cdef5dd22ba726dfdd2d6ff351c4ab Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 19 Jun 2012 14:29:25 +0200 Subject: [PATCH] undo misguided changes to phpunit Change-Id: I14f72e3ea6885cd5e0fbdfe6aca42d39076274ec --- tests/phpunit/MediaWikiPHPUnitCommand.php | 40 ----------------------- tests/phpunit/phpunit.php | 0 2 files changed, 40 deletions(-) mode change 100644 => 100755 tests/phpunit/phpunit.php diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php index 18475cac8c..ea385ad9b2 100644 --- a/tests/phpunit/MediaWikiPHPUnitCommand.php +++ b/tests/phpunit/MediaWikiPHPUnitCommand.php @@ -53,19 +53,6 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command { } } - protected function handleCustomTestSuite() { - if ( empty( $this->arguments['printer'] ) ) { - $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter( - null, - isset($this->arguments['verbose']) ? $this->arguments['verbose'] : false, - isset($this->arguments['colors']) ? $this->arguments['colors'] : true, - isset($this->arguments['debug']) ? $this->arguments['debug'] : false - ); - } - - parent::handleCustomTestSuite(); - } - public function showHelp() { parent::showHelp(); @@ -87,30 +74,3 @@ EOT; } } - -class MediaWikiPHPUnitResultPrinter extends PHPUnit_TextUI_ResultPrinter { - /** - * Overrides original method to ignore incomplete tests except in verbose mode. - * - * @param PHPUnit_Framework_TestResult $result - */ - protected function printIncompletes(PHPUnit_Framework_TestResult $result) - { - if ( $this->verbose ) { - parent::printIncompletes( $result ); - } - } - - /** - * Overrides original method to ignore skipped tests except in verbose mode. - * - * @param PHPUnit_Framework_TestResult $result - */ - protected function printSkipped(PHPUnit_Framework_TestResult $result) - { - if ( $this->verbose ) { - parent::printSkipped( $result ); - } - } - -} diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php old mode 100644 new mode 100755 -- 2.20.1