Merge "Tweak fullscreen styles for API sandbox"

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

diff --git a/tests/phpunit/MediaWikiPHPUnitTestListener.php b/tests/phpunit/MediaWikiPHPUnitTestListener.php
index 7237ef3..dd606d8 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitTestListener.php
+++ b/tests/phpunit/MediaWikiPHPUnitTestListener.php
@@ -1,14 +1,12 @@
 <?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 );
@@ -30,85 +28,103 @@ class MediaWikiPHPUnitTestListener implements PHPUnit_Framework_TestListener {
        /**
         * An error occurred.
         *
-        * @param  PHPUnit_Framework_Test $test
-        * @param  Exception              $e
-        * @param  float                  $time
+        * @param PHPUnit_Framework_Test $test
+        * @param Exception $e
+        * @param float $time
         */
        public function addError( PHPUnit_Framework_Test $test, Exception $e, $time ) {
-               wfDebugLog( $this->logChannel, 'ERROR in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) );
+               parent::addError( $test, $e, $time );
+               wfDebugLog(
+                       $this->logChannel,
+                       'ERROR in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
+               );
        }
 
        /**
         * A failure occurred.
         *
-        * @param  PHPUnit_Framework_Test                 $test
-        * @param  PHPUnit_Framework_AssertionFailedError $e
-        * @param  float                                  $time
+        * @param PHPUnit_Framework_Test $test
+        * @param PHPUnit_Framework_AssertionFailedError $e
+        * @param float $time
         */
-       public function addFailure( PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time ) {
-               wfDebugLog( $this->logChannel, 'FAILURE in ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) );
+       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 )
+               );
        }
 
        /**
         * Incomplete test.
         *
-        * @param  PHPUnit_Framework_Test $test
-        * @param  Exception              $e
-        * @param  float                  $time
+        * @param PHPUnit_Framework_Test $test
+        * @param Exception $e
+        * @param float $time
         */
        public function addIncompleteTest( PHPUnit_Framework_Test $test, Exception $e, $time ) {
-               wfDebugLog( $this->logChannel, 'Incomplete test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) );
+               parent::addIncompleteTest( $test, $e, $time );
+               wfDebugLog(
+                       $this->logChannel,
+                       'Incomplete test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
+               );
        }
 
        /**
         * Skipped test.
         *
-        * @param  PHPUnit_Framework_Test $test
-        * @param  Exception              $e
-        * @param  float                  $time
-        *
-        * @since  Method available since Release 3.0.0
+        * @param PHPUnit_Framework_Test $test
+        * @param Exception $e
+        * @param float $time
         */
        public function addSkippedTest( PHPUnit_Framework_Test $test, Exception $e, $time ) {
-               wfDebugLog( $this->logChannel, 'Skipped test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e ) );
+               parent::addSkippedTest( $test, $e, $time );
+               wfDebugLog(
+                       $this->logChannel,
+                       'Skipped test ' . $this->getTestName( $test ) . ': ' . $this->getErrorName( $e )
+               );
        }
 
        /**
         * A test suite started.
         *
-        * @param  PHPUnit_Framework_TestSuite $suite
-        * @since  Method available since Release 2.2.0
+        * @param PHPUnit_Framework_TestSuite $suite
         */
        public function startTestSuite( PHPUnit_Framework_TestSuite $suite ) {
+               parent::startTestSuite( $suite );
                wfDebugLog( $this->logChannel, 'START suite ' . $suite->getName() );
        }
 
        /**
         * A test suite ended.
         *
-        * @param  PHPUnit_Framework_TestSuite $suite
-        * @since  Method available since Release 2.2.0
+        * @param PHPUnit_Framework_TestSuite $suite
         */
        public function endTestSuite( PHPUnit_Framework_TestSuite $suite ) {
+               parent::endTestSuite( $suite );
                wfDebugLog( $this->logChannel, 'END suite ' . $suite->getName() );
        }
 
        /**
         * A test started.
         *
-        * @param  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 ) );
        }
 
        /**
         * A test ended.
         *
-        * @param  PHPUnit_Framework_Test $test
-        * @param  float                  $time
+        * @param PHPUnit_Framework_Test $test
+        * @param float $time
         */
        public function endTest( PHPUnit_Framework_Test $test, $time ) {
+               parent::endTest( $test, $time );
                wfDebugLog( $this->logChannel, 'End test ' . $this->getTestName( $test ) );
        }
 }