Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move debug-tests out of MediaWikiPHPUnitCommand

Browse source 
This also slightly refactors MediaWikiPHPUnitTestListener
so we can pass it into phpunit directly using the
--printer option

Change-Id: I6a19e3902130eeba6a0941f24a4f440b712058e5
This commit is contained in:
addshore 2014-05-05 15:11:34 +01:00 committed by Ori.livneh
parent 8b449ce6cb
commit c454a77916
3 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/phpunit/MediaWikiPHPUnitCommand.php
View file

@ -12,7 +12,6 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
'use-normal-tables' => false,
'reuse-db' => false,
'wiki=' => false,
'debug-tests' => false,
);
public function __construct() {
@ -21,22 +20,6 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
}
}
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;
$command->run( $_SERVER['argv'], $exit );
@ -66,9 +49,6 @@ 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;
}
}

17
tests/phpunit/MediaWikiPHPUnitTestListener.php
View file

@ -1,14 +1,11 @@
<?php
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
class MediaWikiPHPUnitTestListener extends PHPUnit_TextUI_ResultPrinter implements PHPUnit_Framework_TestListener {
/**
* @var string
*/
protected $logChannel;
public function __construct( $logChannel ) {
$this->logChannel = $logChannel;
}
protected $logChannel = 'PHPUnitCommand';
protected function getTestName( PHPUnit_Framework_Test $test ) {
$name = get_class( $test );
@ -35,6 +32,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function addError( PHPUnit_Framework_Test $test, Exception $e, $time ) {
parent::addError( $test, $e, $time );
wfDebugLog(
$this->logChannel,
'ERROR in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@ -51,6 +49,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
public function addFailure( PHPUnit_Framework_Test $test,
PHPUnit_Framework_AssertionFailedError $e, $time
) {
parent::addFailure( $test, $e, $time );
wfDebugLog(
$this->logChannel,
'FAILURE in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@ -65,6 +64,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function addIncompleteTest( PHPUnit_Framework_Test $test, Exception $e, $time ) {
parent::addIncompleteTest( $test, $e, $time );
wfDebugLog(
$this->logChannel,
'Incomplete test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@ -79,6 +79,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function addSkippedTest( PHPUnit_Framework_Test $test, Exception $e, $time ) {
parent::addSkippedTest( $test, $e, $time );
wfDebugLog(
$this->logChannel,
'Skipped test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@ -91,6 +92,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param PHPUnit_Framework_TestSuite $suite
*/
public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) {
parent::startTestSuite( $suite );
wfDebugLog( $this->logChannel, 'START suite ' . $suite->getName() );
}
@ -100,6 +102,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param PHPUnit_Framework_TestSuite $suite
*/
public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) {
parent::endTestSuite( $suite );
wfDebugLog( $this->logChannel, 'END suite ' . $suite->getName() );
}
@ -109,6 +112,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param PHPUnit_Framework_Test $test
*/
public function startTest( PHPUnit_Framework_Test $test ) {
parent::startTest( $test );
wfDebugLog( $this->logChannel, 'Start test ' . $this->getTestName( $test ) );
}
@ -119,6 +123,7 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function endTest( PHPUnit_Framework_Test $test, $time ) {
parent::endTest( $test, $time );
wfDebugLog( $this->logChannel, 'End test ' . $this->getTestName( $test ) );
}
}

14
tests/phpunit/phpunit.php
View file

@ -24,6 +24,12 @@ class PHPUnitMaintClass extends Maintenance {
false, # not required
true # need arg
);
$this->addOption(
'debug-tests',
'Log testing activity to the PHPUnitCommand log channel.',
false, # not required
false # no arg needed
);
}
public function finalSetup() {
@ -123,6 +129,14 @@ class PHPUnitMaintClass extends Maintenance {
);
array_splice( $_SERVER['argv'], 1, 0, '--include-path' );
}
$key = array_search( '--debug-tests', $_SERVER['argv'] );
if( $key !== false && array_search( '--printer', $_SERVER['argv'] ) === false ) {
unset( $_SERVER['argv'][$key] );
array_splice( $_SERVER['argv'], 1, 0, 'MediaWikiPHPUnitTestListener' );
array_splice( $_SERVER['argv'], 1, 0, '--printer' );
}
}
public function getDbType() {