Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 475 insertions, 74 deletions

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 1cc45e08..6ce78b56 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -6,6 +6,20 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	public $runDisabled = false;
 
 	/**
+	 * $called tracks whether the setUp and tearDown method has been called.
+	 * class extending MediaWikiTestCase usually override setUp and tearDown
+	 * but forget to call the parent.
+	 *
+	 * The array format takes a method name as key and anything as a value.
+	 * By asserting the key exist, we know the child class has called the
+	 * parent.
+	 *
+	 * This property must be private, we do not want child to override it,
+	 * they should call the appropriate parent method instead.
+	 */
+	private $called = array();
+
+	/**
 	 * @var Array of TestUser
 	 */
 	public static $users;
@@ -14,12 +28,12 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * @var DatabaseBase
 	 */
 	protected $db;
-	protected $oldTablePrefix;
-	protected $useTemporaryTables = true;
-	protected $reuseDB = false;
 	protected $tablesUsed = array(); // tables with data
 
+	private static $useTemporaryTables = true;
+	private static $reuseDB = false;
 	private static $dbSetup = false;
+	private static $oldTablePrefix = false;
 
 	/**
 	 * Holds the paths of temporary files/directories created through getNewTempFile,
@@ -29,6 +43,13 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 */
 	private $tmpfiles = array();
 
+	/**
+	 * Holds original values of MediaWiki configuration settings
+	 * to be restored in tearDown().
+	 * See also setMwGlobal().
+	 * @var array
+	 */
+	private $mwGlobals = array();
 
 	/**
 	 * Table name prefixes. Oracle likes it shorter.
@@ -43,58 +64,80 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		'oracle'
 	);
 
-	function  __construct( $name = null, array $data = array(), $dataName = '' ) {
+	function __construct( $name = null, array $data = array(), $dataName = '' ) {
 		parent::__construct( $name, $data, $dataName );
 
 		$this->backupGlobals = false;
 		$this->backupStaticAttributes = false;
 	}
 
-	function run( PHPUnit_Framework_TestResult $result = NULL ) {
+	function run( PHPUnit_Framework_TestResult $result = null ) {
 		/* Some functions require some kind of caching, and will end up using the db,
 		 * which we can't allow, as that would open a new connection for mysql.
 		 * Replace with a HashBag. They would not be going to persist anyway.
 		 */
 		ObjectCache::$instances[CACHE_DB] = new HashBagOStuff;
 
-		if( $this->needsDB() ) {
-			global $wgDBprefix;
-			
-			$this->useTemporaryTables = !$this->getCliArg( 'use-normal-tables' );
-			$this->reuseDB = $this->getCliArg('reuse-db');
+		$needsResetDB = false;
+		$logName = get_class( $this ) . '::' . $this->getName( false );
+
+		if ( $this->needsDB() ) {
+			// set up a DB connection for this test to use
+
+			self::$useTemporaryTables = !$this->getCliArg( 'use-normal-tables' );
+			self::$reuseDB = $this->getCliArg( 'reuse-db' );
 
 			$this->db = wfGetDB( DB_MASTER );
 
 			$this->checkDbIsSupported();
 
-			$this->oldTablePrefix = $wgDBprefix;
+			if ( !self::$dbSetup ) {
+				wfProfileIn( $logName . ' (clone-db)' );
+
+				// switch to a temporary clone of the database
+				self::setupTestDB( $this->db, $this->dbPrefix() );
 
-			if( !self::$dbSetup ) {
-				$this->initDB();
-				self::$dbSetup = true;
+				if ( ( $this->db->getType() == 'oracle' || !self::$useTemporaryTables ) && self::$reuseDB ) {
+					$this->resetDB();
+				}
+
+				wfProfileOut( $logName . ' (clone-db)' );
 			}
 
+			wfProfileIn( $logName . ' (prepare-db)' );
 			$this->addCoreDBData();
 			$this->addDBData();
+			wfProfileOut( $logName . ' (prepare-db)' );
+
+			$needsResetDB = true;
+		}
 
-			parent::run( $result );
+		wfProfileIn( $logName );
+		parent::run( $result );
+		wfProfileOut( $logName );
 
+		if ( $needsResetDB ) {
+			wfProfileIn( $logName . ' (reset-db)' );
 			$this->resetDB();
-		} else {
-			parent::run( $result );
+			wfProfileOut( $logName . ' (reset-db)' );
 		}
 	}
 
+	function usesTemporaryTables() {
+		return self::$useTemporaryTables;
+	}
+
 	/**
 	 * obtains a new temporary file name
 	 *
 	 * The obtained filename is enlisted to be removed upon tearDown
 	 *
-	 * @returns string: absolute name of the temporary file
+	 * @return string: absolute name of the temporary file
 	 */
 	protected function getNewTempFile() {
 		$fname = tempnam( wfTempDir(), 'MW_PHPUnit_' . get_class( $this ) . '_' );
 		$this->tmpfiles[] = $fname;
+
 		return $fname;
 	}
 
@@ -104,7 +147,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * The obtained directory is enlisted to be removed (recursively with all its contained
 	 * files) upon tearDown.
 	 *
-	 * @returns string: absolute name of the temporary directory
+	 * @return string: absolute name of the temporary directory
 	 */
 	protected function getNewTempDirectory() {
 		// Starting of with a temporary /file/.
@@ -116,10 +159,55 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		// where temporary directory creation is bundled and can be improved
 		unlink( $fname );
 		$this->assertTrue( wfMkdirParents( $fname ) );
+
 		return $fname;
 	}
 
+	/**
+	 * setUp and tearDown should (where significant)
+	 * happen in reverse order.
+	 */
+	protected function setUp() {
+		wfProfileIn( __METHOD__ );
+		parent::setUp();
+		$this->called['setUp'] = 1;
+
+		/*
+		// @todo global variables to restore for *every* test
+		array(
+			'wgLang',
+			'wgContLang',
+			'wgLanguageCode',
+			'wgUser',
+			'wgTitle',
+		);
+		*/
+
+		// Cleaning up temporary files
+		foreach ( $this->tmpfiles as $fname ) {
+			if ( is_file( $fname ) || ( is_link( $fname ) ) ) {
+				unlink( $fname );
+			} elseif ( is_dir( $fname ) ) {
+				wfRecursiveRemoveDir( $fname );
+			}
+		}
+
+		if ( $this->needsDB() && $this->db ) {
+			// Clean up open transactions
+			while ( $this->db->trxLevel() > 0 ) {
+				$this->db->rollback();
+			}
+
+			// don't ignore DB errors
+			$this->db->ignoreErrors( false );
+		}
+
+		wfProfileOut( __METHOD__ );
+	}
+
 	protected function tearDown() {
+		wfProfileIn( __METHOD__ );
+
 		// Cleaning up temporary files
 		foreach ( $this->tmpfiles as $fname ) {
 			if ( is_file( $fname ) || ( is_link( $fname ) ) ) {
@@ -129,14 +217,114 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 			}
 		}
 
-		// clean up open transactions
-		if( $this->needsDB() && $this->db ) {
-			while( $this->db->trxLevel() > 0 ) {
+		if ( $this->needsDB() && $this->db ) {
+			// Clean up open transactions
+			while ( $this->db->trxLevel() > 0 ) {
 				$this->db->rollback();
 			}
+
+			// don't ignore DB errors
+			$this->db->ignoreErrors( false );
+		}
+
+		// Restore mw globals
+		foreach ( $this->mwGlobals as $key => $value ) {
+			$GLOBALS[$key] = $value;
 		}
+		$this->mwGlobals = array();
 
 		parent::tearDown();
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Make sure MediaWikiTestCase extending classes have called their
+	 * parent setUp method
+	 */
+	final public function testMediaWikiTestCaseParentSetupCalled() {
+		$this->assertArrayHasKey( 'setUp', $this->called,
+			get_called_class() . "::setUp() must call parent::setUp()"
+		);
+	}
+
+	/**
+	 * Individual test functions may override globals (either directly or through this
+	 * setMwGlobals() function), however one must call this method at least once for
+	 * each key within the setUp().
+	 * That way the key is added to the array of globals that will be reset afterwards
+	 * in the tearDown(). And, equally important, that way all other tests are executed
+	 * with the same settings (instead of using the unreliable local settings for most
+	 * tests and fix it only for some tests).
+	 *
+	 * @example
+	 * <code>
+	 *     protected function setUp() {
+	 *         $this->setMwGlobals( 'wgRestrictStuff', true );
+	 *     }
+	 *
+	 *     function testFoo() {}
+	 *
+	 *     function testBar() {}
+	 *         $this->assertTrue( self::getX()->doStuff() );
+	 *
+	 *         $this->setMwGlobals( 'wgRestrictStuff', false );
+	 *         $this->assertTrue( self::getX()->doStuff() );
+	 *     }
+	 *
+	 *     function testQuux() {}
+	 * </code>
+	 *
+	 * @param array|string $pairs Key to the global variable, or an array
+	 *  of key/value pairs.
+	 * @param mixed $value Value to set the global to (ignored
+	 *  if an array is given as first argument).
+	 */
+	protected function setMwGlobals( $pairs, $value = null ) {
+
+		// Normalize (string, value) to an array
+		if ( is_string( $pairs ) ) {
+			$pairs = array( $pairs => $value );
+		}
+
+		foreach ( $pairs as $key => $value ) {
+			// NOTE: make sure we only save the global once or a second call to
+			// setMwGlobals() on the same global would override the original
+			// value.
+			if ( !array_key_exists( $key, $this->mwGlobals ) ) {
+				$this->mwGlobals[$key] = $GLOBALS[$key];
+			}
+
+			// Override the global
+			$GLOBALS[$key] = $value;
+		}
+	}
+
+	/**
+	 * Merges the given values into a MW global array variable.
+	 * Useful for setting some entries in a configuration array, instead of
+	 * setting the entire array.
+	 *
+	 * @param String $name The name of the global, as in wgFooBar
+	 * @param Array $values The array containing the entries to set in that global
+	 *
+	 * @throws MWException if the designated global is not an array.
+	 */
+	protected function mergeMwGlobalArrayValue( $name, $values ) {
+		if ( !isset( $GLOBALS[$name] ) ) {
+			$merged = $values;
+		} else {
+			if ( !is_array( $GLOBALS[$name] ) ) {
+				throw new MWException( "MW global $name is not an array." );
+			}
+
+			// NOTE: do not use array_merge, it screws up for numeric keys.
+			$merged = $GLOBALS[$name];
+			foreach ( $values as $k => $v ) {
+				$merged[$k] = $v;
+			}
+		}
+
+		$this->setMwGlobals( $name, $merged );
 	}
 
 	function dbPrefix() {
@@ -162,7 +350,8 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * Stub. If a test needs to add additional data to the database, it should
 	 * implement this method and do so
 	 */
-	function addDBData() {}
+	function addDBData() {
+	}
 
 	private function addCoreDBData() {
 		# disabled for performance
@@ -174,8 +363,8 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 			# Insert 0 user to prevent FK violations
 			# Anonymous user
 			$this->db->insert( 'user', array(
-				'user_id' 		=> 0,
-				'user_name'   	=> 'Anonymous' ), __METHOD__, array( 'IGNORE' ) );
+				'user_id' => 0,
+				'user_name' => 'Anonymous' ), __METHOD__, array( 'IGNORE' ) );
 
 			# Insert 0 page to prevent FK violations
 			# Blank page
@@ -183,7 +372,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 				'page_id' => 0,
 				'page_namespace' => 0,
 				'page_title' => ' ',
-				'page_restrictions' => NULL,
+				'page_restrictions' => null,
 				'page_counter' => 0,
 				'page_is_redirect' => 0,
 				'page_is_new' => 0,
@@ -191,7 +380,6 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 				'page_touched' => $this->db->timestamp(),
 				'page_latest' => 0,
 				'page_len' => 0 ), __METHOD__, array( 'IGNORE' ) );
-
 		}
 
 		User::resetIdByNameCache();
@@ -208,38 +396,80 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 			$user->saveSettings();
 		}
 
-
 		//Make 1 page with 1 revision
 		$page = WikiPage::factory( Title::newFromText( 'UTPage' ) );
 		if ( !$page->getId() == 0 ) {
-			$page->doEdit( 'UTContent',
-							'UTPageSummary',
-							EDIT_NEW,
-							false,
-							User::newFromName( 'UTSysop' ) );
+			$page->doEditContent(
+				new WikitextContent( 'UTContent' ),
+				'UTPageSummary',
+				EDIT_NEW,
+				false,
+				User::newFromName( 'UTSysop' ) );
 		}
 	}
 
-	private function initDB() {
+	/**
+	 * Restores MediaWiki to using the table set (table prefix) it was using before
+	 * setupTestDB() was called. Useful if we need to perform database operations
+	 * after the test run has finished (such as saving logs or profiling info).
+	 */
+	public static function teardownTestDB() {
+		if ( !self::$dbSetup ) {
+			return;
+		}
+
+		CloneDatabase::changePrefix( self::$oldTablePrefix );
+
+		self::$oldTablePrefix = false;
+		self::$dbSetup = false;
+	}
+
+	/**
+	 * Creates an empty skeleton of the wiki database by cloning its structure
+	 * to equivalent tables using the given $prefix. Then sets MediaWiki to
+	 * use the new set of tables (aka schema) instead of the original set.
+	 *
+	 * This is used to generate a dummy table set, typically consisting of temporary
+	 * tables, that will be used by tests instead of the original wiki database tables.
+	 *
+	 * @note: the original table prefix is stored in self::$oldTablePrefix. This is used
+	 * by teardownTestDB() to return the wiki to using the original table set.
+	 *
+	 * @note: this method only works when first called. Subsequent calls have no effect,
+	 * even if using different parameters.
+	 *
+	 * @param DatabaseBase $db The database connection
+	 * @param String $prefix The prefix to use for the new table set (aka schema).
+	 *
+	 * @throws MWException if the database table prefix is already $prefix
+	 */
+	public static function setupTestDB( DatabaseBase $db, $prefix ) {
 		global $wgDBprefix;
-		if ( $wgDBprefix === $this->dbPrefix() ) {
-			throw new MWException( 'Cannot run unit tests, the database prefix is already "unittest_"' );
+		if ( $wgDBprefix === $prefix ) {
+			throw new MWException( 'Cannot run unit tests, the database prefix is already "' . $prefix . '"' );
+		}
+
+		if ( self::$dbSetup ) {
+			return;
 		}
 
-		$tablesCloned = $this->listTables();
-		$dbClone = new CloneDatabase( $this->db, $tablesCloned, $this->dbPrefix() );
-		$dbClone->useTemporaryTables( $this->useTemporaryTables );
+		$tablesCloned = self::listTables( $db );
+		$dbClone = new CloneDatabase( $db, $tablesCloned, $prefix );
+		$dbClone->useTemporaryTables( self::$useTemporaryTables );
+
+		self::$dbSetup = true;
+		self::$oldTablePrefix = $wgDBprefix;
+
+		if ( ( $db->getType() == 'oracle' || !self::$useTemporaryTables ) && self::$reuseDB ) {
+			CloneDatabase::changePrefix( $prefix );
 
-		if ( ( $this->db->getType() == 'oracle' || !$this->useTemporaryTables ) && $this->reuseDB ) {
-			CloneDatabase::changePrefix( $this->dbPrefix() );
-			$this->resetDB();
 			return;
 		} else {
 			$dbClone->cloneTableStructure();
 		}
 
-		if ( $this->db->getType() == 'oracle' ) {
-			$this->db->query( 'BEGIN FILL_WIKI_INFO; END;' );
+		if ( $db->getType() == 'oracle' ) {
+			$db->query( 'BEGIN FILL_WIKI_INFO; END;' );
 		}
 	}
 
@@ -247,20 +477,24 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * Empty all tables so they can be repopulated for tests
 	 */
 	private function resetDB() {
-		if( $this->db ) {
-			if ( $this->db->getType() == 'oracle' )  {
-				if ( $this->useTemporaryTables ) {
+		if ( $this->db ) {
+			if ( $this->db->getType() == 'oracle' ) {
+				if ( self::$useTemporaryTables ) {
 					wfGetLB()->closeAll();
 					$this->db = wfGetDB( DB_MASTER );
 				} else {
-					foreach( $this->tablesUsed as $tbl ) {
-						if( $tbl == 'interwiki') continue;
-						$this->db->query( 'TRUNCATE TABLE '.$this->db->tableName($tbl), __METHOD__ );
+					foreach ( $this->tablesUsed as $tbl ) {
+						if ( $tbl == 'interwiki' ) {
+							continue;
+						}
+						$this->db->query( 'TRUNCATE TABLE ' . $this->db->tableName( $tbl ), __METHOD__ );
 					}
 				}
 			} else {
-				foreach( $this->tablesUsed as $tbl ) {
-					if( $tbl == 'interwiki' || $tbl == 'user' ) continue;
+				foreach ( $this->tablesUsed as $tbl ) {
+					if ( $tbl == 'interwiki' || $tbl == 'user' ) {
+						continue;
+					}
 					$this->db->delete( $tbl, '*', __METHOD__ );
 				}
 			}
@@ -276,9 +510,9 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		);
 
 		if ( method_exists( $this->suite, $func ) ) {
-			return call_user_func_array( array( $this->suite, $func ), $args);
+			return call_user_func_array( array( $this->suite, $func ), $args );
 		} elseif ( isset( $compatibility[$func] ) ) {
-			return call_user_func_array( array( $this, $compatibility[$func] ), $args);
+			return call_user_func_array( array( $this, $compatibility[$func] ), $args );
 		} else {
 			throw new MWException( "Called non-existant $func method on "
 				. get_class( $this ) );
@@ -289,25 +523,32 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		return $this->assertTrue( $value == '', $msg );
 	}
 
-	static private function unprefixTable( $tableName ) {
+	private static function unprefixTable( $tableName ) {
 		global $wgDBprefix;
+
 		return substr( $tableName, strlen( $wgDBprefix ) );
 	}
 
-	static private function isNotUnittest( $table ) {
+	private static function isNotUnittest( $table ) {
 		return strpos( $table, 'unittest_' ) !== 0;
 	}
 
-	protected function listTables() {
+	public static function listTables( $db ) {
 		global $wgDBprefix;
 
-		$tables = $this->db->listTables( $wgDBprefix, __METHOD__ );
+		$tables = $db->listTables( $wgDBprefix, __METHOD__ );
+
+		if ( $db->getType() === 'mysql' ) {
+			# bug 43571: cannot clone VIEWs under MySQL
+			$views = $db->listViews( $wgDBprefix, __METHOD__ );
+			$tables = array_diff( $tables, $views );
+		}
 		$tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables );
 
 		// Don't duplicate test tables from the previous fataled run
 		$tables = array_filter( $tables, array( __CLASS__, 'isNotUnittest' ) );
 
-		if ( $this->db->getType() == 'sqlite' ) {
+		if ( $db->getType() == 'sqlite' ) {
 			$tables = array_flip( $tables );
 			// these are subtables of searchindex and don't need to be duped/dropped separately
 			unset( $tables['searchindex_content'] );
@@ -315,27 +556,26 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 			unset( $tables['searchindex_segments'] );
 			$tables = array_flip( $tables );
 		}
+
 		return $tables;
 	}
 
 	protected function checkDbIsSupported() {
-		if( !in_array( $this->db->getType(), $this->supportedDBs ) ) {
+		if ( !in_array( $this->db->getType(), $this->supportedDBs ) ) {
 			throw new MWException( $this->db->getType() . " is not currently supported for unit testing." );
 		}
 	}
 
 	public function getCliArg( $offset ) {
 
-		if( isset( MediaWikiPHPUnitCommand::$additionalOptions[$offset] ) ) {
+		if ( isset( MediaWikiPHPUnitCommand::$additionalOptions[$offset] ) ) {
 			return MediaWikiPHPUnitCommand::$additionalOptions[$offset];
 		}
-
 	}
 
 	public function setCliArg( $offset, $value ) {
 
 		MediaWikiPHPUnitCommand::$additionalOptions[$offset] = $value;
-
 	}
 
 	/**
@@ -368,10 +608,10 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 *         or list the tables under testing in $this->tablesUsed, or override the
 	 *         needsDB() method.
 	 */
-	protected function assertSelect( $table, $fields, $condition, Array $expectedRows ) {
+	protected function assertSelect( $table, $fields, $condition, array $expectedRows ) {
 		if ( !$this->needsDB() ) {
 			throw new MWException( 'When testing database state, the test cases\'s needDB()' .
-				' method should return true. Use @group Database or $this->tablesUsed.');
+				' method should return true. Use @group Database or $this->tablesUsed.' );
 		}
 
 		$db = wfGetDB( DB_SLAVE );
@@ -410,7 +650,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 */
 	protected function arrayWrap( array $elements ) {
 		return array_map(
-			function( $element ) {
+			function ( $element ) {
 				return array( $element );
 			},
 			$elements
@@ -458,9 +698,9 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * @param String $actual HTML on oneline
 	 * @param String $msg Optional message
 	 */
-	protected function assertHTMLEquals( $expected, $actual, $msg='' ) {
+	protected function assertHTMLEquals( $expected, $actual, $msg = '' ) {
 		$expected = str_replace( '>', ">\n", $expected );
-		$actual   = str_replace( '>', ">\n", $actual   );
+		$actual = str_replace( '>', ">\n", $actual );
 
 		$this->assertEquals( $expected, $actual, $msg );
 	}
@@ -475,7 +715,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	protected function objectAssociativeSort( array &$array ) {
 		uasort(
 			$array,
-			function( $a, $b ) {
+			function ( $a, $b ) {
 				return serialize( $a ) > serialize( $b ) ? 1 : -1;
 			}
 		);
@@ -518,8 +758,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	protected function assertTypeOrValue( $type, $actual, $value = false, $message = '' ) {
 		if ( $actual === $value ) {
 			$this->assertTrue( true, $message );
-		}
-		else {
+		} else {
 			$this->assertType( $type, $actual, $message );
 		}
 	}
@@ -536,12 +775,174 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	 * @param string $message
 	 */
 	protected function assertType( $type, $actual, $message = '' ) {
-		if ( is_object( $actual ) ) {
+		if ( class_exists( $type ) || interface_exists( $type ) ) {
 			$this->assertInstanceOf( $type, $actual, $message );
-		}
-		else {
+		} else {
 			$this->assertInternalType( $type, $actual, $message );
 		}
 	}
 
+	/**
+	 * Returns true if the given namespace defaults to Wikitext
+	 * according to $wgNamespaceContentModels
+	 *
+	 * @param int $ns The namespace ID to check
+	 *
+	 * @return bool
+	 * @since 1.21
+	 */
+	protected function isWikitextNS( $ns ) {
+		global $wgNamespaceContentModels;
+
+		if ( isset( $wgNamespaceContentModels[$ns] ) ) {
+			return $wgNamespaceContentModels[$ns] === CONTENT_MODEL_WIKITEXT;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the ID of a namespace that defaults to Wikitext.
+	 * Throws an MWException if there is none.
+	 *
+	 * @return int the ID of the wikitext Namespace
+	 * @since 1.21
+	 */
+	protected function getDefaultWikitextNS() {
+		global $wgNamespaceContentModels;
+
+		static $wikitextNS = null; // this is not going to change
+		if ( $wikitextNS !== null ) {
+			return $wikitextNS;
+		}
+
+		// quickly short out on most common case:
+		if ( !isset( $wgNamespaceContentModels[NS_MAIN] ) ) {
+			return NS_MAIN;
+		}
+
+		// NOTE: prefer content namespaces
+		$namespaces = array_unique( array_merge(
+			MWNamespace::getContentNamespaces(),
+			array( NS_MAIN, NS_HELP, NS_PROJECT ), // prefer these
+			MWNamespace::getValidNamespaces()
+		) );
+
+		$namespaces = array_diff( $namespaces, array(
+			NS_FILE, NS_CATEGORY, NS_MEDIAWIKI, NS_USER // don't mess with magic namespaces
+		) );
+
+		$talk = array_filter( $namespaces, function ( $ns ) {
+			return MWNamespace::isTalk( $ns );
+		} );
+
+		// prefer non-talk pages
+		$namespaces = array_diff( $namespaces, $talk );
+		$namespaces = array_merge( $namespaces, $talk );
+
+		// check default content model of each namespace
+		foreach ( $namespaces as $ns ) {
+			if ( !isset( $wgNamespaceContentModels[$ns] ) ||
+				$wgNamespaceContentModels[$ns] === CONTENT_MODEL_WIKITEXT
+			) {
+
+				$wikitextNS = $ns;
+
+				return $wikitextNS;
+			}
+		}
+
+		// give up
+		// @todo Inside a test, we could skip the test as incomplete.
+		//        But frequently, this is used in fixture setup.
+		throw new MWException( "No namespace defaults to wikitext!" );
+	}
+
+	/**
+	 * Check, if $wgDiff3 is set and ready to merge
+	 * Will mark the calling test as skipped, if not ready
+	 *
+	 * @since 1.21
+	 */
+	protected function checkHasDiff3() {
+		global $wgDiff3;
+
+		# This check may also protect against code injection in
+		# case of broken installations.
+		wfSuppressWarnings();
+		$haveDiff3 = $wgDiff3 && file_exists( $wgDiff3 );
+		wfRestoreWarnings();
+
+		if ( !$haveDiff3 ) {
+			$this->markTestSkipped( "Skip test, since diff3 is not configured" );
+		}
+	}
+
+	/**
+	 * Check whether we have the 'gzip' commandline utility, will skip
+	 * the test whenever "gzip -V" fails.
+	 *
+	 * Result is cached at the process level.
+	 *
+	 * @return bool
+	 *
+	 * @since 1.21
+	 */
+	protected function checkHasGzip() {
+		static $haveGzip;
+
+		if ( $haveGzip === null ) {
+			$retval = null;
+			wfShellExec( 'gzip -V', $retval );
+			$haveGzip = ( $retval === 0 );
+		}
+
+		if ( !$haveGzip ) {
+			$this->markTestSkipped( "Skip test, requires the gzip utility in PATH" );
+		}
+
+		return $haveGzip;
+	}
+
+	/**
+	 * Check if $extName is a loaded PHP extension, will skip the
+	 * test whenever it is not loaded.
+	 *
+	 * @since 1.21
+	 */
+	protected function checkPHPExtension( $extName ) {
+		$loaded = extension_loaded( $extName );
+		if ( !$loaded ) {
+			$this->markTestSkipped( "PHP extension '$extName' is not loaded, skipping." );
+		}
+
+		return $loaded;
+	}
+
+	/**
+	 * Asserts that an exception of the specified type occurs when running
+	 * the provided code.
+	 *
+	 * @since 1.21
+	 * @deprecated since 1.22 Use setExpectedException
+	 *
+	 * @param callable $code
+	 * @param string $expected
+	 * @param string $message
+	 */
+	protected function assertException( $code, $expected = 'Exception', $message = '' ) {
+		$pokemons = null;
+
+		try {
+			call_user_func( $code );
+		} catch ( Exception $pokemons ) {
+			// Gotta Catch 'Em All!
+		}
+
+		if ( $message === '' ) {
+			$message = 'An exception of type "' . $expected . '" should have been thrown';
+		}
+
+		$this->assertInstanceOf( $expected, $pokemons, $message );
+	}
 }