X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Ftitle%2FNaiveImportTitleFactoryTest.php;h=71e52e8fedb6bff065a77bdd2b8d930f6f6cd23d;hb=5f4cf303e22c522a63d08cac61b38e74a8dfd0f7;hp=067d159f4f27ec5a73688e24cf2951683b42efcd;hpb=96906168cac0e9a7748511b48c369cf22c8406d5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
index 067d159f4f..71e52e8fed 100644
--- a/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
+++ b/tests/phpunit/includes/title/NaiveImportTitleFactoryTest.php
@@ -29,9 +29,8 @@ class NaiveImportTitleFactoryTest extends MediaWikiTestCase {
 	protected function setUp() {
 		parent::setUp();
 
+		$this->setContentLang( 'en' );
 		$this->setMwGlobals( [
-			'wgLanguageCode' => 'en',
-			'wgContLang' => Language::factory( 'en' ),
 			'wgExtraNamespaces' => [ 100 => 'Portal' ],
 		] );
 	}
@@ -40,39 +39,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 +79,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 ) );
 	}