From: daniel <daniel.kinzler@wikimedia.de>
Date: Tue, 19 Jun 2012 12:29:25 +0000 (+0200)
Subject: undo misguided changes to phpunit
X-Git-Tag: 1.31.0-rc.0~22097^2^2~92^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=commitdiff_plain;h=62698090e0cdef5dd22ba726dfdd2d6ff351c4ab;p=lhc%2Fweb%2Fwiklou.git

undo misguided changes to phpunit

Change-Id: I14f72e3ea6885cd5e0fbdfe6aca42d39076274ec
---

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