From 447529064b0286c065fb41932277c7aca349eca8 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 28 Dec 2010 18:17:16 +0000
Subject: [PATCH] * verbose and color default output from phpunit * Make a
 bunch of tests subclass MediaWikiTestCase * Parser tests and
 ResourceLoaderTest can't subclass it yet due to various issues

---
 tests/phpunit/includes/CdbTest.php                      | 2 +-
 tests/phpunit/includes/ExternalStoreTest.php            | 2 +-
 tests/phpunit/includes/ExtraParserTest.php              | 2 +-
 tests/phpunit/includes/GlobalTest.php                   | 2 +-
 tests/phpunit/includes/HttpTest.php                     | 2 +-
 tests/phpunit/includes/IPTest.php                       | 2 +-
 tests/phpunit/includes/ImageFunctionsTest.php           | 2 +-
 tests/phpunit/includes/LanguageConverterTest.php        | 2 +-
 tests/phpunit/includes/LicensesTest.php                 | 2 +-
 tests/phpunit/includes/LocalFileTest.php                | 2 +-
 tests/phpunit/includes/MessageTest.php                  | 2 +-
 tests/phpunit/includes/ParserOptionsTest.php            | 2 +-
 tests/phpunit/includes/ResourceLoaderFileModuleTest.php | 2 +-
 tests/phpunit/includes/RevisionTest.php                 | 2 +-
 tests/phpunit/includes/SampleTest.php                   | 2 +-
 tests/phpunit/includes/SanitizerTest.php                | 2 +-
 tests/phpunit/includes/SeleniumConfigurationTest.php    | 2 +-
 tests/phpunit/includes/SiteConfigurationTest.php        | 2 +-
 tests/phpunit/includes/TimeAdjustTest.php               | 2 +-
 tests/phpunit/includes/TitlePermissionTest.php          | 2 +-
 tests/phpunit/includes/TitleTest.php                    | 2 +-
 tests/phpunit/includes/UploadTest.php                   | 2 +-
 tests/phpunit/includes/UserIsValidEmailAddrTest.php     | 2 +-
 tests/phpunit/includes/XmlTest.php                      | 4 ++--
 tests/phpunit/includes/api/ApiSetup.php                 | 2 +-
 tests/phpunit/includes/api/ApiUploadTest.php            | 2 +-
 tests/phpunit/includes/db/DatabaseSqliteTest.php        | 2 +-
 tests/phpunit/includes/db/DatabaseTest.php              | 2 +-
 tests/phpunit/includes/parser/ParserHelpers.php         | 6 +++---
 tests/phpunit/includes/search/SearchUpdateTest.php      | 2 +-
 tests/phpunit/suite.xml                                 | 7 ++++---
 tests/phpunit/suites/ExtensionsTestSuite.php            | 2 +-
 32 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/tests/phpunit/includes/CdbTest.php b/tests/phpunit/includes/CdbTest.php
index 987a0f5be7..6c3e6664a0 100644
--- a/tests/phpunit/includes/CdbTest.php
+++ b/tests/phpunit/includes/CdbTest.php
@@ -4,7 +4,7 @@
  * Test the CDB reader/writer
  */
 
-class CdbTest extends PHPUnit_Framework_TestCase {
+class CdbTest extends MediaWikiTestCase {
 
 	public function setUp() {
 		if ( !CdbReader::haveExtension() ) {
diff --git a/tests/phpunit/includes/ExternalStoreTest.php b/tests/phpunit/includes/ExternalStoreTest.php
index 3c15f69755..92ec7344ac 100644
--- a/tests/phpunit/includes/ExternalStoreTest.php
+++ b/tests/phpunit/includes/ExternalStoreTest.php
@@ -3,7 +3,7 @@
  * External Store tests
  */
 
-class ExternalStoreTest extends PHPUnit_Framework_TestCase {
+class ExternalStoreTest extends MediaWikiTestCase {
 	private $saved_wgExternalStores;
 
 	function setUp() {
diff --git a/tests/phpunit/includes/ExtraParserTest.php b/tests/phpunit/includes/ExtraParserTest.php
index 130a1c4012..949262a519 100644
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -3,7 +3,7 @@
 /**
  * Parser-related tests that don't suit for parserTests.txt
  */
-class ExtraParserTest extends PHPUnit_Framework_TestCase {
+class ExtraParserTest extends MediaWikiTestCase {
 
 	function setUp() {
 		global $wgMemc;
diff --git a/tests/phpunit/includes/GlobalTest.php b/tests/phpunit/includes/GlobalTest.php
index 426409e9d2..f0deabdea3 100644
--- a/tests/phpunit/includes/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class GlobalTest extends PHPUnit_Framework_TestCase {
+class GlobalTest extends MediaWikiTestCase {
 	function setUp() {
 		global $wgReadOnlyFile, $wgContLang, $wgLang;
 		$this->originals['wgReadOnlyFile'] = $wgReadOnlyFile;
diff --git a/tests/phpunit/includes/HttpTest.php b/tests/phpunit/includes/HttpTest.php
index 3dfefd4a83..719df0bf4a 100644
--- a/tests/phpunit/includes/HttpTest.php
+++ b/tests/phpunit/includes/HttpTest.php
@@ -9,7 +9,7 @@ class MockCookie extends Cookie {
 /**
  * @group Broken
  */
-class HttpTest extends PHPUnit_Framework_TestCase {
+class HttpTest extends MediaWikiTestCase {
 	static $content;
 	static $headers;
 	static $has_curl;
diff --git a/tests/phpunit/includes/IPTest.php b/tests/phpunit/includes/IPTest.php
index ee092997bd..3655e51547 100644
--- a/tests/phpunit/includes/IPTest.php
+++ b/tests/phpunit/includes/IPTest.php
@@ -3,7 +3,7 @@
  * Tests for IP validity functions. Ported from /t/inc/IP.t by avar.
  */
 
-class IPTest extends PHPUnit_Framework_TestCase {
+class IPTest extends MediaWikiTestCase {
 	// not sure it should be tested with boolean false. hashar 20100924
 	public function testisIPAddress() {
 		$this->assertFalse( IP::isIPAddress( false ), 'Boolean false is not an IP' );
diff --git a/tests/phpunit/includes/ImageFunctionsTest.php b/tests/phpunit/includes/ImageFunctionsTest.php
index 4de4e63d4f..cb7e67f391 100644
--- a/tests/phpunit/includes/ImageFunctionsTest.php
+++ b/tests/phpunit/includes/ImageFunctionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ImageFunctionsTest extends PHPUnit_Framework_TestCase {
+class ImageFunctionsTest extends MediaWikiTestCase {
 	function testFitBoxWidth() {
 		$vals = array(
 			array(
diff --git a/tests/phpunit/includes/LanguageConverterTest.php b/tests/phpunit/includes/LanguageConverterTest.php
index 944195f4db..3ee39a1691 100644
--- a/tests/phpunit/includes/LanguageConverterTest.php
+++ b/tests/phpunit/includes/LanguageConverterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class LanguageConverterTest extends PHPUnit_Framework_TestCase {
+class LanguageConverterTest extends MediaWikiTestCase {
 	protected $lang = null;
 	protected $lc = null;
 
diff --git a/tests/phpunit/includes/LicensesTest.php b/tests/phpunit/includes/LicensesTest.php
index e1daff7746..e467f3cdbc 100644
--- a/tests/phpunit/includes/LicensesTest.php
+++ b/tests/phpunit/includes/LicensesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class LicensesTest extends PHPUnit_Framework_TestCase {
+class LicensesTest extends MediaWikiTestCase {
 
 	function testLicenses() {
 		$str = "
diff --git a/tests/phpunit/includes/LocalFileTest.php b/tests/phpunit/includes/LocalFileTest.php
index 32aa51579c..e72561f6a3 100644
--- a/tests/phpunit/includes/LocalFileTest.php
+++ b/tests/phpunit/includes/LocalFileTest.php
@@ -4,7 +4,7 @@
  * These tests should work regardless of $wgCapitalLinks
  */
 
-class LocalFileTest extends PHPUnit_Framework_TestCase {
+class LocalFileTest extends MediaWikiTestCase {
 	function setUp() {
 		global $wgContLang, $wgCapitalLinks;
 
diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index fa696d2d55..67dc00906e 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class MessageTest extends PHPUnit_Framework_TestCase {
+class MessageTest extends MediaWikiTestCase {
 
 	function setUp() {
 		global $wgLanguageCode, $wgLang, $wgContLang, $wgMessageCache;
diff --git a/tests/phpunit/includes/ParserOptionsTest.php b/tests/phpunit/includes/ParserOptionsTest.php
index 63d98e7c93..02d6b17dfb 100644
--- a/tests/phpunit/includes/ParserOptionsTest.php
+++ b/tests/phpunit/includes/ParserOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ParserOptionsTest extends PHPUnit_Framework_TestCase {
+class ParserOptionsTest extends MediaWikiTestCase {
 
 	private $popts;
 	private $pcache;
diff --git a/tests/phpunit/includes/ResourceLoaderFileModuleTest.php b/tests/phpunit/includes/ResourceLoaderFileModuleTest.php
index 5ad7d9373d..a1701d2d44 100644
--- a/tests/phpunit/includes/ResourceLoaderFileModuleTest.php
+++ b/tests/phpunit/includes/ResourceLoaderFileModuleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ResourceLoaderFileModuleTest extends PHPUnit_Framework_TestCase {
+class ResourceLoaderFileModuleTest extends MediaWikiTestCase {
 	/* Provider Methods */
 
 	public function provide() {
diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index a9405b6ef7..20784a0973 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class RevisionTest extends PHPUnit_Framework_TestCase {
+class RevisionTest extends MediaWikiTestCase {
 	var $saveGlobals = array();
 
 	function setUp() {
diff --git a/tests/phpunit/includes/SampleTest.php b/tests/phpunit/includes/SampleTest.php
index 117ac1ca49..3c3553f1dc 100644
--- a/tests/phpunit/includes/SampleTest.php
+++ b/tests/phpunit/includes/SampleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TestSample extends PHPUnit_Framework_TestCase {
+class TestSample extends MediaWikiTestCase {
 
 	/**
 	 * Anything that needs to happen before your tests should go here.
diff --git a/tests/phpunit/includes/SanitizerTest.php b/tests/phpunit/includes/SanitizerTest.php
index a12f9013f0..c2e3e6b348 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class SanitizerTest extends PHPUnit_Framework_TestCase {
+class SanitizerTest extends MediaWikiTestCase {
 
 	function setUp() {
 		AutoLoader::loadClass( 'Sanitizer' );
diff --git a/tests/phpunit/includes/SeleniumConfigurationTest.php b/tests/phpunit/includes/SeleniumConfigurationTest.php
index fa0ea80d6c..d3b0c0f3a5 100644
--- a/tests/phpunit/includes/SeleniumConfigurationTest.php
+++ b/tests/phpunit/includes/SeleniumConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class SeleniumConfigurationTest extends PHPUnit_Framework_TestCase {
+class SeleniumConfigurationTest extends MediaWikiTestCase {
 
 	/*
 	 * The file where the test temporarity stores the selenium config.
diff --git a/tests/phpunit/includes/SiteConfigurationTest.php b/tests/phpunit/includes/SiteConfigurationTest.php
index 9bfab9ede2..6ed30f2647 100644
--- a/tests/phpunit/includes/SiteConfigurationTest.php
+++ b/tests/phpunit/includes/SiteConfigurationTest.php
@@ -22,7 +22,7 @@ function getSiteParams( $conf, $wiki ) {
 	);
 }
 
-class SiteConfigurationTest extends PHPUnit_Framework_TestCase {
+class SiteConfigurationTest extends MediaWikiTestCase {
 	var $mConf;
 
 	function setUp() {
diff --git a/tests/phpunit/includes/TimeAdjustTest.php b/tests/phpunit/includes/TimeAdjustTest.php
index 820e7130fd..9065e7c81d 100644
--- a/tests/phpunit/includes/TimeAdjustTest.php
+++ b/tests/phpunit/includes/TimeAdjustTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TimeAdjustTest extends PHPUnit_Framework_TestCase {
+class TimeAdjustTest extends MediaWikiTestCase {
 	static $offset;
 
 	public function setUp() {
diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index fa83b9a669..d78f8fc802 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -4,7 +4,7 @@
  * @group Database
  * @group Destructive
  */
-class TitlePermissionTest extends PHPUnit_Framework_TestCase {
+class TitlePermissionTest extends MediaWikiTestCase {
 	static $title;
 	static $user;
 	static $anonUser;
diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index 5b42c1c575..70925610bc 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TitleTest extends PHPUnit_Framework_TestCase {
+class TitleTest extends MediaWikiTestCase {
 
 	function testLegalChars() {
 		$titlechars = Title::legalChars();
diff --git a/tests/phpunit/includes/UploadTest.php b/tests/phpunit/includes/UploadTest.php
index d9edd8eaf8..2401bf1200 100644
--- a/tests/phpunit/includes/UploadTest.php
+++ b/tests/phpunit/includes/UploadTest.php
@@ -2,7 +2,7 @@
 /**
  * @group Upload
  */
-class UploadTest extends PHPUnit_Framework_TestCase {
+class UploadTest extends MediaWikiTestCase {
 	protected $upload;
 
 
diff --git a/tests/phpunit/includes/UserIsValidEmailAddrTest.php b/tests/phpunit/includes/UserIsValidEmailAddrTest.php
index c1f34193ed..6b5ff6830c 100644
--- a/tests/phpunit/includes/UserIsValidEmailAddrTest.php
+++ b/tests/phpunit/includes/UserIsValidEmailAddrTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class UserIsValidEmailAddrTest extends PHPUnit_Framework_TestCase {
+class UserIsValidEmailAddrTest extends MediaWikiTestCase {
 
 	private function checkEmail( $addr, $expected = true, $msg = '') {
 		$this->assertEquals(
diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index f01c0f1cc4..e2f59abb84 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class XmlTest extends PHPUnit_Framework_TestCase {
+class XmlTest extends MediaWikiTestCase {
 
 	public function testExpandAttributes() {
 		$this->assertNull( Xml::expandAttributes(null),
@@ -175,5 +175,5 @@ class XmlTest extends PHPUnit_Framework_TestCase {
 }
 
 // TODO
-class XmlSelectTest extends PHPUnit_Framework_TestCase {
+class XmlSelectTest extends MediaWikiTestCase {
 }
diff --git a/tests/phpunit/includes/api/ApiSetup.php b/tests/phpunit/includes/api/ApiSetup.php
index f004f3c6be..80ead6bb8d 100644
--- a/tests/phpunit/includes/api/ApiSetup.php
+++ b/tests/phpunit/includes/api/ApiSetup.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class ApiTestSetup extends PHPUnit_Framework_TestCase {
+abstract class ApiTestSetup extends MediaWikiTestCase {
 	protected static $user;
 	protected static $sysopUser;
 	protected static $apiUrl;
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 06d2bdb727..87abbb9392 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -78,7 +78,7 @@ class ApiTestUser {
 
 }
 
-abstract class ApiTestCase extends PHPUnit_Framework_TestCase {
+abstract class ApiTestCase extends MediaWikiTestCase {
 	public static $users;
 
 	function setUp() {
diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index 4cd3daf04a..24704ad3f7 100644
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -20,7 +20,7 @@ class MockDatabaseSqlite extends DatabaseSqliteStandalone {
 /**
  * @group sqlite
  */
-class DatabaseSqliteTest extends PHPUnit_Framework_TestCase {
+class DatabaseSqliteTest extends MediaWikiTestCase {
 	var $db;
 
 	public function setUp() {
diff --git a/tests/phpunit/includes/db/DatabaseTest.php b/tests/phpunit/includes/db/DatabaseTest.php
index b184331ff4..7357524f28 100644
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -3,7 +3,7 @@
 /**
  * @group Database
  */
-class DatabaseTest extends PHPUnit_Framework_TestCase {
+class DatabaseTest extends MediaWikiTestCase {
 	var $db;
 
 	function setUp() {
diff --git a/tests/phpunit/includes/parser/ParserHelpers.php b/tests/phpunit/includes/parser/ParserHelpers.php
index 43da34218b..f490a9ce7b 100644
--- a/tests/phpunit/includes/parser/ParserHelpers.php
+++ b/tests/phpunit/includes/parser/ParserHelpers.php
@@ -16,13 +16,13 @@ class PHPUnitParserTest extends ParserTest {
 	}
 }
 
-class ParserUnitTest extends PHPUnit_Framework_TestCase {
+class ParserUnitTest extends MediaWikiTestCase {
 	private $test = "";
-	private $suite;
 
 	public function __construct( $suite, $test = null ) {
-		$this->suite = $suite;
+		parent::__construct();
 		$this->test = $test;
+		$this->suite = $suite;
 	}
 
 	function count() { return 1; }
diff --git a/tests/phpunit/includes/search/SearchUpdateTest.php b/tests/phpunit/includes/search/SearchUpdateTest.php
index 108b280270..935425a676 100644
--- a/tests/phpunit/includes/search/SearchUpdateTest.php
+++ b/tests/phpunit/includes/search/SearchUpdateTest.php
@@ -18,7 +18,7 @@ class MockSearch extends SearchEngine {
 /**
  * @group Search
  */
-class SearchUpdateTest extends PHPUnit_Framework_TestCase {
+class SearchUpdateTest extends MediaWikiTestCase {
 	static $searchType;
 
 	function update( $text, $title = 'Test', $id = 1 ) {
diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index cb25963bda..f384d84991 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit bootstrap="./bootstrap.php"
-         colors="false"
+         colors="true"
          backupGlobals="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
-         stopOnFailure="false"
-         strict="true">
+         stopOnFailure="true"
+         strict="true"
+		 verbose="true">
 	<testsuites>
 		<testsuite name="includes">
 			<directory>./includes</directory>
diff --git a/tests/phpunit/suites/ExtensionsTestSuite.php b/tests/phpunit/suites/ExtensionsTestSuite.php
index 4bf3542799..4f02a693ce 100644
--- a/tests/phpunit/suites/ExtensionsTestSuite.php
+++ b/tests/phpunit/suites/ExtensionsTestSuite.php
@@ -26,7 +26,7 @@ class ExtensionsTestSuite extends PHPUnit_Framework_TestSuite {
  * Needed to avoid warnings like 'No tests found in class "ExtensionsTestSuite".'
  * when no extensions with tests are used.
  */
-class DummyExtensionsTest extends PHPUnit_Framework_TestCase {
+class DummyExtensionsTest extends MediaWikiTestCase {
 	public function testNothing() {
 		
 	}
-- 
2.20.1