From ffe62978e32e580a8e193bfbdda5b225b97c83bd Mon Sep 17 00:00:00 2001
From: aude <aude.wiki@gmail.com>
Date: Sat, 18 Mar 2017 19:06:47 -0400
Subject: [PATCH] Avoid database access in ImportTitleFactory tests
 dataProviders

data providers run when the test database tables are not setup
and thus hit the regular database.

If possible, we should avoid this which can be done in these
tests by creating the Title objects in the tests themselves.

Change-Id: I084938b79d7b719a9bb524d4596635b9e1eb4486
---
 .../title/NaiveImportTitleFactoryTest.php     | 21 ++++++++++---------
 .../title/NamespaceImportTitleFactoryTest.php | 13 ++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
index 067d159f4f..d711bac5f6 100644
--- a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
+++ b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
@@ -40,39 +40,39 @@ class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
 		return [
 			[
 				new ForeignTitle( 0, '', 'MainNamespaceArticle' ),
-				Title::newFromText( 'MainNamespaceArticle' )
+				'MainNamespaceArticle'
 			],
 			[
 				new ForeignTitle( null, '', 'MainNamespaceArticle' ),
-				Title::newFromText( 'MainNamespaceArticle' )
+				'MainNamespaceArticle'
 			],
 			[
 				new ForeignTitle( 1, 'Discussion', 'Nice_talk' ),
-				Title::newFromText( 'Talk:Nice_talk' )
+				'Talk:Nice_talk'
 			],
 			[
 				new ForeignTitle( 0, '', 'Bogus:Nice_talk' ),
-				Title::newFromText( 'Bogus:Nice_talk' )
+				'Bogus:Nice_talk'
 			],
 			[
 				new ForeignTitle( 100, 'Bogus', 'Nice_talk' ),
-				Title::newFromText( 'Bogus:Nice_talk' ) // not Portal:Nice_talk
+				'Bogus:Nice_talk' // not Portal:Nice_talk
 			],
 			[
 				new ForeignTitle( 1, 'Bogus', 'Nice_talk' ),
-				Title::newFromText( 'Talk:Nice_talk' ) // not Bogus:Nice_talk
+				'Talk:Nice_talk' // not Bogus:Nice_talk
 			],
 			[
 				new ForeignTitle( 100, 'Portal', 'Nice_talk' ),
-				Title::newFromText( 'Portal:Nice_talk' )
+				'Portal:Nice_talk'
 			],
 			[
 				new ForeignTitle( 724, 'Portal', 'Nice_talk' ),
-				Title::newFromText( 'Portal:Nice_talk' )
+				'Portal:Nice_talk'
 			],
 			[
 				new ForeignTitle( 2, 'Portal', 'Nice_talk' ),
-				Title::newFromText( 'User:Nice_talk' )
+				'User:Nice_talk'
 			],
 		];
 	}
@@ -80,9 +80,10 @@ class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider basicProvider
 	 */
-	public function testBasic( ForeignTitle $foreignTitle, Title $title ) {
+	public function testBasic( ForeignTitle $foreignTitle, $titleText ) {
 		$factory = new NaiveImportTitleFactory();
 		$testTitle = $factory->createTitleFromForeignTitle( $foreignTitle );
+		$title = Title::newFromText( $titleText );
 
 		$this->assertTrue( $title->equals( $testTitle ) );
 	}
diff --git a/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php b/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php
index 01c47fd974..9b6ac93c37 100644
--- a/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php
+++ b/tests/phpunit/includes/title/NamespaceImportTitleFactoryTest.php
@@ -40,27 +40,27 @@ class NamespaceImportTitleFactoryTest extends MediaWikiTestCase {
 			[
 				new ForeignTitle( 0, '', 'MainNamespaceArticle' ),
 				0,
-				Title::newFromText( 'MainNamespaceArticle' )
+				'MainNamespaceArticle'
 			],
 			[
 				new ForeignTitle( 0, '', 'MainNamespaceArticle' ),
 				2,
-				Title::newFromText( 'User:MainNamespaceArticle' )
+				'User:MainNamespaceArticle'
 			],
 			[
 				new ForeignTitle( 1, 'Discussion', 'Nice_talk' ),
 				0,
-				Title::newFromText( 'Nice_talk' )
+				'Nice_talk'
 			],
 			[
 				new ForeignTitle( 0, '', 'Bogus:Nice_talk' ),
 				0,
-				Title::newFromText( 'Bogus:Nice_talk' )
+				'Bogus:Nice_talk'
 			],
 			[
 				new ForeignTitle( 0, '', 'Bogus:Nice_talk' ),
 				2,
-				Title::newFromText( 'User:Bogus:Nice_talk' )
+				'User:Bogus:Nice_talk'
 			],
 		];
 	}
@@ -68,9 +68,10 @@ class NamespaceImportTitleFactoryTest extends MediaWikiTestCase {
 	/**
 	 * @dataProvider basicProvider
 	 */
-	public function testBasic( ForeignTitle $foreignTitle, $ns, Title $title ) {
+	public function testBasic( ForeignTitle $foreignTitle, $ns, $titleText ) {
 		$factory = new NamespaceImportTitleFactory( $ns );
 		$testTitle = $factory->createTitleFromForeignTitle( $foreignTitle );
+		$title = Title::newFromText( $titleText );
 
 		$this->assertTrue( $title->equals( $testTitle ) );
 	}
-- 
2.20.1