dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: set the schema in the LBFactory local domain"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
MediaWikiPHPUnitTestListener.php
diff --git
a/tests/phpunit/MediaWikiPHPUnitTestListener.php
b/tests/phpunit/MediaWikiPHPUnitTestListener.php
index
8c761b9
..
dd606d8
100644
(file)
--- a/
tests/phpunit/MediaWikiPHPUnitTestListener.php
+++ b/
tests/phpunit/MediaWikiPHPUnitTestListener.php
@@
-1,14
+1,12
@@
<?php
<?php
-class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
+class MediaWikiPHPUnitTestListener
+ extends PHPUnit_TextUI_ResultPrinter implements PHPUnit_Framework_TestListener {
+
/**
* @var string
*/
/**
* @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 );
protected function getTestName( PHPUnit_Framework_Test $test ) {
$name = get_class( $test );
@@
-35,6
+33,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function addError( PHPUnit_Framework_Test $test, Exception $e, $time ) {
* @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 )
wfDebugLog(
$this->logChannel,
'ERROR in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@@
-51,6
+50,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
public function addFailure( PHPUnit_Framework_Test $test,
PHPUnit_Framework_AssertionFailedError $e, $time
) {
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 )
wfDebugLog(
$this->logChannel,
'FAILURE in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@@
-65,6
+65,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function addIncompleteTest( PHPUnit_Framework_Test $test, Exception $e, $time ) {
* @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 )
wfDebugLog(
$this->logChannel,
'Incomplete test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@@
-79,6
+80,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function addSkippedTest( PHPUnit_Framework_Test $test, Exception $e, $time ) {
* @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 )
wfDebugLog(
$this->logChannel,
'Skipped test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
@@
-91,6
+93,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param PHPUnit_Framework_TestSuite $suite
*/
public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) {
* @param PHPUnit_Framework_TestSuite $suite
*/
public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) {
+ parent::startTestSuite( $suite );
wfDebugLog( $this->logChannel, 'START suite ' . $suite->getName() );
}
wfDebugLog( $this->logChannel, 'START suite ' . $suite->getName() );
}
@@
-100,6
+103,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param PHPUnit_Framework_TestSuite $suite
*/
public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) {
* @param PHPUnit_Framework_TestSuite $suite
*/
public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) {
+ parent::endTestSuite( $suite );
wfDebugLog( $this->logChannel, 'END suite ' . $suite->getName() );
}
wfDebugLog( $this->logChannel, 'END suite ' . $suite->getName() );
}
@@
-109,6
+113,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param PHPUnit_Framework_Test $test
*/
public function startTest( PHPUnit_Framework_Test $test ) {
* @param PHPUnit_Framework_Test $test
*/
public function startTest( PHPUnit_Framework_Test $test ) {
+ parent::startTest( $test );
wfDebugLog( $this->logChannel, 'Start test ' . $this->getTestName( $test ) );
}
wfDebugLog( $this->logChannel, 'Start test ' . $this->getTestName( $test ) );
}
@@
-119,6
+124,7
@@
class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
* @param float $time
*/
public function endTest( PHPUnit_Framework_Test $test, $time ) {
* @param float $time
*/
public function endTest( PHPUnit_Framework_Test $test, $time ) {
+ parent::endTest( $test, $time );
wfDebugLog( $this->logChannel, 'End test ' . $this->getTestName( $test ) );
}
}
wfDebugLog( $this->logChannel, 'End test ' . $this->getTestName( $test ) );
}
}