Move MediaWikiTestCase class to a new file and load it from phpunit.php

This restores the ability to run single tests with
php phpunit.php includes/filename.php

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
new file mode 100644 (file)
index 0000000..d58ebc8
--- /dev/null
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -0,0 +1,177 @@
+<?php
+
+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;
+               
+       }
+}
+

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 0b6ff9b..101418f 100644 (file)
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -40,181 +40,3 @@ $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;
-               
-       }
-}
-

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 3b8795a..6935441 100755 (executable)
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -40,5 +40,6 @@ $additionalMWCLIArgs = array(
 );
 
 require_once( "$IP/tests/phpunit/MediaWikiPHPUnitCommand.php" );
+require_once( "$IP/tests/phpunit/MediaWikiTestCase.php" );
 MediaWikiPHPUnitCommand::main();