X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Flanguages%2FLanguageConverterTest.php;h=82ab7def22a358789f08ec282eca1eeb218f64c0;hb=3df17fdce8f3e07a6cfddc897ce6573142990f2f;hp=b5db2ec11acfedfd05b4da132aba9e6982b55419;hpb=cac0f01194d7ce89ae1da797e045bafa3df61188;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/languages/LanguageConverterTest.php b/tests/phpunit/languages/LanguageConverterTest.php
index b5db2ec11a..82ab7def22 100644
--- a/tests/phpunit/languages/LanguageConverterTest.php
+++ b/tests/phpunit/languages/LanguageConverterTest.php
@@ -20,9 +20,7 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$this->lang = new LanguageToTest();
 		$this->lc = new TestConverter(
 			$this->lang, 'tg',
-			# Adding 'sgs' as a variant to ensure we handle deprecated codes
-			# adding 'simple' as a variant to ensure we handle non BCP 47 codes
-			[ 'tg', 'tg-latn', 'sgs', 'simple' ]
+			[ 'tg', 'tg-latn' ]
 		);
 	}
 
@@ -40,39 +38,6 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 'tg', $this->lc->getPreferredVariant() );
 	}
 
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 * @covers LanguageConverter::getURLVariant
-	 */
-	public function testGetPreferredVariantUrl() {
-		global $wgRequest;
-		$wgRequest->setVal( 'variant', 'tg-latn' );
-
-		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
-	}
-
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 * @covers LanguageConverter::getURLVariant
-	 */
-	public function testGetPreferredVariantUrlDeprecated() {
-		global $wgRequest;
-		$wgRequest->setVal( 'variant', 'bat-smg' );
-
-		$this->assertEquals( 'sgs', $this->lc->getPreferredVariant() );
-	}
-
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 * @covers LanguageConverter::getURLVariant
-	 */
-	public function testGetPreferredVariantUrlBCP47() {
-		global $wgRequest;
-		$wgRequest->setVal( 'variant', 'en-simple' );
-
-		$this->assertEquals( 'simple', $this->lc->getPreferredVariant() );
-	}
-
 	/**
 	 * @covers LanguageConverter::getPreferredVariant
 	 * @covers LanguageConverter::getHeaderVariant
@@ -84,17 +49,6 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
 	}
 
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 * @covers LanguageConverter::getHeaderVariant
-	 */
-	public function testGetPreferredVariantHeadersBCP47() {
-		global $wgRequest;
-		$wgRequest->setHeader( 'Accept-Language', 'en-simple' );
-
-		$this->assertEquals( 'simple', $this->lc->getPreferredVariant() );
-	}
-
 	/**
 	 * @covers LanguageConverter::getPreferredVariant
 	 * @covers LanguageConverter::getHeaderVariant
@@ -144,38 +98,6 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
 	}
 
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 */
-	public function testGetPreferredVariantUserOptionDeprecated() {
-		global $wgUser;
-
-		$wgUser = new User;
-		$wgUser->load(); // from 'defaults'
-		$wgUser->mId = 1;
-		$wgUser->mDataLoaded = true;
-		$wgUser->mOptionsLoaded = true;
-		$wgUser->setOption( 'variant', 'bat-smg' );
-
-		$this->assertEquals( 'sgs', $this->lc->getPreferredVariant() );
-	}
-
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 */
-	public function testGetPreferredVariantUserOptionBCP47() {
-		global $wgUser;
-
-		$wgUser = new User;
-		$wgUser->load(); // from 'defaults'
-		$wgUser->mId = 1;
-		$wgUser->mDataLoaded = true;
-		$wgUser->mOptionsLoaded = true;
-		$wgUser->setOption( 'variant', 'en-simple' );
-
-		$this->assertEquals( 'simple', $this->lc->getPreferredVariant() );
-	}
-
 	/**
 	 * @covers LanguageConverter::getPreferredVariant
 	 * @covers LanguageConverter::getUserVariant
@@ -194,42 +116,6 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
 	}
 
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 * @covers LanguageConverter::getUserVariant
-	 */
-	public function testGetPreferredVariantUserOptionForForeignLanguageDeprecated() {
-		global $wgContLang, $wgUser;
-
-		$wgContLang = Language::factory( 'en' );
-		$wgUser = new User;
-		$wgUser->load(); // from 'defaults'
-		$wgUser->mId = 1;
-		$wgUser->mDataLoaded = true;
-		$wgUser->mOptionsLoaded = true;
-		$wgUser->setOption( 'variant-tg', 'bat-smg' );
-
-		$this->assertEquals( 'sgs', $this->lc->getPreferredVariant() );
-	}
-
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 * @covers LanguageConverter::getUserVariant
-	 */
-	public function testGetPreferredVariantUserOptionForForeignLanguageBCP47() {
-		global $wgContLang, $wgUser;
-
-		$wgContLang = Language::factory( 'en' );
-		$wgUser = new User;
-		$wgUser->load(); // from 'defaults'
-		$wgUser->mId = 1;
-		$wgUser->mDataLoaded = true;
-		$wgUser->mOptionsLoaded = true;
-		$wgUser->setOption( 'variant-tg', 'en-simple' );
-
-		$this->assertEquals( 'simple', $this->lc->getPreferredVariant() );
-	}
-
 	/**
 	 * @covers LanguageConverter::getPreferredVariant
 	 * @covers LanguageConverter::getUserVariant
@@ -259,26 +145,6 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 'tg-latn', $this->lc->getPreferredVariant() );
 	}
 
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 */
-	public function testGetPreferredVariantDefaultLanguageVariantDeprecated() {
-		global $wgDefaultLanguageVariant;
-
-		$wgDefaultLanguageVariant = 'bat-smg';
-		$this->assertEquals( 'sgs', $this->lc->getPreferredVariant() );
-	}
-
-	/**
-	 * @covers LanguageConverter::getPreferredVariant
-	 */
-	public function testGetPreferredVariantDefaultLanguageVariantBCP47() {
-		global $wgDefaultLanguageVariant;
-
-		$wgDefaultLanguageVariant = 'en-simple';
-		$this->assertEquals( 'simple', $this->lc->getPreferredVariant() );
-	}
-
 	/**
 	 * @covers LanguageConverter::getPreferredVariant
 	 * @covers LanguageConverter::getURLVariant
@@ -326,8 +192,6 @@ class TestConverter extends LanguageConverter {
 
 	function loadDefaultTables() {
 		$this->mTables = [
-			'sgs' => new ReplacementArray(),
-			'simple' => new ReplacementArray(),
 			'tg-latn' => new ReplacementArray( $this->table ),
 			'tg' => new ReplacementArray()
 		];