X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fbootstrap.php;h=933767e7e9b63e5330fdd68135eb1c021802ccee;hb=d76e670c7694773c0779cc51e684ed70f2cd4f3b;hp=0b6ff9b4d5f9d5fba01f8c2e0988b1560ad54bb8;hpb=d74edea7e41d0c0177545abdd1e215f5b92fe95e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 0b6ff9b4d5..933767e7e9 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -11,15 +11,15 @@ if ( !defined( 'MW_PHPUNIT_TEST' ) ) {
 You are running these tests directly from phpunit. You may not have all globals correctly set.
 Running phpunit.php instead is recommended.
 EOF;
-	require_once ( dirname( __FILE__ ) . "/phpunit.php" );
+	require_once ( __DIR__ . "/phpunit.php" );
 }
 
 // Output a notice when running with older versions of PHPUnit
-if ( !version_compare( PHPUnit_Runner_Version::id(), "3.4.1", ">" ) ) {
+if ( version_compare( PHPUnit_Runner_Version::id(), "3.6.7", "<" ) ) {
   echo <<<EOF
 ********************************************************************************
 
-These tests run best with version PHPUnit 3.4.2 or better. Earlier versions may
+These tests run best with version PHPUnit 3.6.7 or better. Earlier versions may
 show failures because earlier versions of PHPUnit do not properly implement
 dependencies.
 
@@ -28,193 +28,5 @@ dependencies.
 EOF;
 }
 
-global $wgLocalisationCacheConf, $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
-global $wgMessageCache, $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgMemc;
-$wgLocalisationCacheConf['storeClass'] =  'LCStore_Null';
-$wgMainCacheType = CACHE_NONE;
-$wgMessageCacheType = CACHE_NONE;
-$wgParserCacheType = CACHE_NONE;
-$wgUseDatabaseMessages = false; # Set for future resets
-$wgMemc = new FakeMemCachedClient;
-
-# The message cache was already created in Setup.php
-$wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
-	array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry ) );
-
-/* Classes */
-
-abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
-	public $suite;
-	public $regex = '';
-	public $runDisabled = false;
-	
-	protected static $databaseSetupDone = false;
-	protected $db;
-	protected $dbClone;
-	protected $oldTablePrefix;
-	protected $useTemporaryTables = true;
-
-	function  __construct( $name = null, array $data = array(), $dataName = '' ) {
-        if ($name !== null) {
-            $this->setName($name);
-        }
-
-        $this->data = $data;
-        $this->dataName = $dataName;
-	}
-	
-	function run( PHPUnit_Framework_TestResult $result = NULL ) {
-		if( $this->needsDB() && !is_object( $this->dbClone ) ) {
-			$this->initDB();
-			$this->addCoreDBData();
-			$this->addDBData();
-		}
-		parent::run( $result );
-	}
-
-	function __destruct() {
-		if( is_object( $this->dbClone ) && $this->dbClone instanceof CloneDatabase ) {
-			$this->destroyDB();
-		}
-	}
-	
-	function needsDB() {
-		$rc = new ReflectionClass( $this );
-		return strpos( $rc->getDocComment(), '@group Database' ) !== false;
-	}
-	
-	function addDBData() {}
-	
-	private function addCoreDBData() {
-		
-		//Make sysop user
-		$user = User::newFromName( 'UTSysop' );
-		
-		if ( $user->idForName() == 0 ) {
-			$user->addToDatabase();
-			$user->setPassword( 'UTSysopPassword' );
-
-			$user->addGroup( 'sysop' );
-			$user->addGroup( 'bureaucrat' );
-			$user->saveSettings();
-		}
-
-		
-		//Make 1 page with 1 revision
-		$article = new Article( Title::newFromText( 'UTPage' ) );
-		$article->doEdit( 'UTContent',
-							'UTPageSummary',
-							EDIT_NEW,
-							false,
-							User::newFromName( 'UTSysop' ) );
-	}
-	
-	private function initDB() {
-		global $wgDBprefix;
-
-		if ( self::$databaseSetupDone ) {
-			return;
-		}
-
-		$this->db = wfGetDB( DB_MASTER );
-		$dbType = $this->db->getType();
-		
-		if ( $wgDBprefix === 'unittest_' || ( $dbType == 'oracle' && $wgDBprefix === 'ut_' ) ) {
-			throw new MWException( 'Cannot run unit tests, the database prefix is already "unittest_"' );
-		}
-
-		self::$databaseSetupDone = true;
-		$this->oldTablePrefix = $wgDBprefix;
-
-		# SqlBagOStuff broke when using temporary tables on r40209 (bug 15892).
-		# It seems to have been fixed since (r55079?).
-		# If it fails, $wgCaches[CACHE_DB] = new HashBagOStuff(); should work around it.
-
-		# CREATE TEMPORARY TABLE breaks if there is more than one server
-		if ( wfGetLB()->getServerCount() != 1 ) {
-			$this->useTemporaryTables = false;
-		}
-
-		$temporary = $this->useTemporaryTables || $dbType == 'postgres';
-		
-		$tables = $this->listTables();
-		
-		$prefix = $dbType != 'oracle' ? 'unittest_' : 'ut_';
-
-		$this->dbClone = new CloneDatabase( $this->db, $tables, $prefix );
-		$this->dbClone->useTemporaryTables( $temporary );
-		$this->dbClone->cloneTableStructure();
-
-		if ( $dbType == 'oracle' )
-			$this->db->query( 'BEGIN FILL_WIKI_INFO; END;' );
-
-		if ( $dbType == 'oracle' ) {
-			# Insert 0 user to prevent FK violations
-			
-			# Anonymous user
-			$this->db->insert( 'user', array(
-				'user_id'         => 0,
-				'user_name'       => 'Anonymous' ) );
-		}
-		
-	}
-	
-	protected function destroyDB() {
-		if ( !self::$databaseSetupDone ) {
-			return;
-		}
-		
-		$this->dbClone->destroy();
-		self::$databaseSetupDone = false;
-
-		if ( $this->useTemporaryTables ) {
-			# Don't need to do anything
-			//return;
-			//Temporary tables seem to be broken ATM, delete anyway
-		}
-
-		if( $this->db->getType() == 'oracle' ) {
-			$tables = $this->db->listTables( 'ut_', __METHOD__ );
-		}
-		else {
-			$tables = $this->db->listTables( 'unittest_', __METHOD__ );
-		}
-		
-		foreach ( $tables as $table ) {
-			$sql = $this->db->getType() == 'oracle' ? "DROP TABLE $table DROP CONSTRAINTS" : "DROP TABLE `$table`";
-			$this->db->query( $sql );
-		}
-
-		if ( $this->db->getType() == 'oracle' )
-			$this->db->query( 'BEGIN FILL_WIKI_INFO; END;' );
-		
-		
-	}
-
-	function __call( $func, $args ) {
-		static $compatibility = array(
-			'assertInternalType' => 'assertType',
-			'assertNotInternalType' => 'assertNotType',
-			'assertInstanceOf' => 'assertType',
-		);
-
-		if ( method_exists( $this->suite, $func ) ) {
-			return call_user_func_array( array( $this->suite, $func ), $args);
-		} elseif ( isset( $compatibility[$func] ) ) {
-			return call_user_func_array( array( $this, $compatibility[$func] ), $args);
-		} else {
-			throw new MWException( "Called non-existant $func method on "
-				. get_class( $this ) );
-		}
-	}
-	
-	protected function listTables() {
-		global $wgDBprefix;
-		
-		$tables = $this->db->listTables( $wgDBprefix, __METHOD__ );
-		$tables = array_map( create_function( '$table', 'global $wgDBprefix; return substr( $table, strlen( $wgDBprefix ) );' ), $tables );
-		return $tables;
-		
-	}
-}
-
+/** @todo Check if this is really needed */
+MessageCache::destroyInstance();