From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 tests/phpunit/includes/db/DatabaseSqliteTest.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'tests/phpunit/includes/db/DatabaseSqliteTest.php')

diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index 914ab27c..067c731a 100644
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -19,6 +19,7 @@ class MockDatabaseSqlite extends DatabaseSqliteStandalone {
 
 /**
  * @group sqlite
+ * @group Database
  */
 class DatabaseSqliteTest extends MediaWikiTestCase {
 	var $db;
@@ -98,7 +99,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 		$this->assertEquals( 'sqlite_master', $db->tableName( 'sqlite_master' ) );
 		$this->assertEquals( 'foobar', $db->tableName( 'bar' ) );
 	}
-	
+
 	public function testDuplicateTableStructure() {
 		$db = new DatabaseSqliteStandalone( ':memory:' );
 		$db->query( 'CREATE TABLE foo(foo, barfoo)' );
@@ -119,7 +120,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 			'Create a temporary duplicate only'
 		);
 	}
-	
+
 	public function testDuplicateTableStructureVirtual() {
 		$db = new DatabaseSqliteStandalone( ':memory:' );
 		if ( $db->getFulltextSearchModule() != 'FTS3' ) {
@@ -191,13 +192,14 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 			'1.15',
 			'1.16',
 			'1.17',
+			'1.18',
 		);
 
 		// Mismatches for these columns we can safely ignore
 		$ignoredColumns = array(
 			'user_newtalk.user_last_timestamp', // r84185
 		);
-			
+
 		$currentDB = new DatabaseSqliteStandalone( ':memory:' );
 		$currentDB->sourceFile( "$IP/maintenance/tables.sql" );
 		$currentTables = $this->getTables( $currentDB );
@@ -254,9 +256,10 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 			$maint = new FakeMaintenance();
 			$maint->loadParamsAndArgs( null, array( 'quiet' => 1 ) );
 		}
-		
+
+		global $IP;
 		$db = new DatabaseSqliteStandalone( ':memory:' );
-		$db->sourceFile( dirname( __FILE__ ) . "/sqlite/tables-$version.sql" );
+		$db->sourceFile( "$IP/tests/phpunit/data/db/sqlite/tables-$version.sql" );
 		$updater = DatabaseUpdater::newForDB( $db, false, $maint );
 		$updater->doUpdates( array( 'core' ) );
 		return $db;
@@ -266,6 +269,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
 		$list = array_flip( $db->listTables() );
 		$excluded = array(
 			'math', // moved out of core in 1.18
+			'trackbacks', // removed from core in 1.19
 			'searchindex',
 			'searchindex_content',
 			'searchindex_segments',
-- 
cgit v1.2.3-54-g00ecf