X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fdb%2FDatabaseSqliteTest.php;h=451d82a54cf2f8529523feb2167b8c4cb30335ed;hb=340f3e9c57df2846d403f969fcc4889a457176ac;hp=588e5440879ea3ec23a4314a4915e39b71662022;hpb=30e009794bacc2e3138c372e6ddf876dca2d4a9c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index 588e544087..451d82a54c 100644
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -1,10 +1,13 @@
 <?php
 
-class MockDatabaseSqlite extends DatabaseSqliteStandalone {
+class DatabaseSqliteMock extends DatabaseSqlite {
 	private $lastQuery;
 
-	function __construct() {
-		parent::__construct( ':memory:' );
+	public static function newInstance( array $p = array() ) {
+		$p['dbFilePath'] = ':memory:';
+		$p['schema'] = false;
+
+		return DatabaseBase::factory( 'SqliteMock', $p );
 	}
 
 	function query( $sql, $fname = '', $tempIgnore = false ) {
@@ -27,7 +30,7 @@ class MockDatabaseSqlite extends DatabaseSqliteStandalone {
  * @group medium
  */
 class DatabaseSqliteTest extends MediaWikiTestCase {
-	/** @var MockDatabaseSqlite */
+	/** @var DatabaseSqliteMock */
 	protected $db;
 
 	protected function setUp() {
@@ -36,7 +39,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 		if ( !Sqlite::isPresent() ) {
 			$this->markTestSkipped( 'No SQLite support detected' );
 		}
-		$this->db = new MockDatabaseSqlite();
+		$this->db = DatabaseSqliteMock::newInstance();
 		if ( version_compare( $this->db->getServerVersion(), '3.6.0', '<' ) ) {
 			$this->markTestSkipped( "SQLite at least 3.6 required, {$this->db->getServerVersion()} found" );
 		}
@@ -89,7 +92,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 */
 	public function testAddQuotes( $value, $expected ) {
 		// check quoting
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$this->assertEquals( $expected, $db->addQuotes( $value ), 'string not quoted as expected' );
 
 		// ok, quoting works as expected, now try a round trip.
@@ -172,7 +175,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 */
 	public function testTableName() {
 		// @todo Moar!
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$this->assertEquals( 'foo', $db->tableName( 'foo' ) );
 		$this->assertEquals( 'sqlite_master', $db->tableName( 'sqlite_master' ) );
 		$db->tablePrefix( 'foo' );
@@ -184,7 +187,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 * @covers DatabaseSqlite::duplicateTableStructure
 	 */
 	public function testDuplicateTableStructure() {
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$db->query( 'CREATE TABLE foo(foo, barfoo)' );
 
 		$db->duplicateTableStructure( 'foo', 'bar' );
@@ -208,7 +211,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 * @covers DatabaseSqlite::duplicateTableStructure
 	 */
 	public function testDuplicateTableStructureVirtual() {
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		if ( $db->getFulltextSearchModule() != 'FTS3' ) {
 			$this->markTestSkipped( 'FTS3 not supported, cannot create virtual tables' );
 		}
@@ -231,7 +234,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 * @covers DatabaseSqlite::deleteJoin
 	 */
 	public function testDeleteJoin() {
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$db->query( 'CREATE TABLE a (a_1)', __METHOD__ );
 		$db->query( 'CREATE TABLE b (b_1, b_2)', __METHOD__ );
 		$db->insert( 'a', array(
@@ -289,7 +292,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 			'user_newtalk.user_last_timestamp', // r84185
 		);
 
-		$currentDB = new DatabaseSqliteStandalone( ':memory:' );
+		$currentDB = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$currentDB->sourceFile( "$IP/maintenance/tables.sql" );
 
 		$profileToDb = false;
@@ -297,7 +300,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 			$out = $wgProfiler['output'];
 			if ( $out === 'db' ) {
 				$profileToDb = true;
-			} elseif( is_array( $out ) && in_array( 'db', $out ) ) {
+			} elseif ( is_array( $out ) && in_array( 'db', $out ) ) {
 				$profileToDb = true;
 			}
 		}
@@ -357,7 +360,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 * @covers DatabaseSqlite::insertId
 	 */
 	public function testInsertIdType() {
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 
 		$databaseCreation = $db->query( 'CREATE TABLE a ( a_1 )', __METHOD__ );
 		$this->assertInstanceOf( 'ResultWrapper', $databaseCreation, "Database creation" );
@@ -377,7 +380,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 		}
 
 		global $IP;
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$db->sourceFile( "$IP/tests/phpunit/data/db/sqlite/tables-$version.sql" );
 		$updater = DatabaseUpdater::newForDB( $db, false, $maint );
 		$updater->doUpdates( array( 'core' ) );
@@ -440,7 +443,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 
 	public function testCaseInsensitiveLike() {
 		// TODO: Test this for all databases
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 		$res = $db->query( 'SELECT "a" LIKE "A" AS a' );
 		$row = $res->fetchRow();
 		$this->assertFalse( (bool)$row['a'] );
@@ -450,7 +453,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 	 * @covers DatabaseSqlite::numFields
 	 */
 	public function testNumFields() {
-		$db = new DatabaseSqliteStandalone( ':memory:' );
+		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
 
 		$databaseCreation = $db->query( 'CREATE TABLE a ( a_1 )', __METHOD__ );
 		$this->assertInstanceOf( 'ResultWrapper', $databaseCreation, "Failed to create table a" );