X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Finterwiki%2FInterwikiTest.php;h=137dfb77ec3609dd1c460cd8ff2fa20a934c99a7;hb=c2b506a59f3ad1b8b4a7123b91a6b1395841743a;hp=411d6a3ff62a08aa878a4bfea6ecfba54011f67d;hpb=83691ed06e8ec7ef1f6f7290b8c5c175ab9f4928;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/interwiki/InterwikiTest.php b/tests/phpunit/includes/interwiki/InterwikiTest.php
index 411d6a3ff6..409805bab7 100644
--- a/tests/phpunit/includes/interwiki/InterwikiTest.php
+++ b/tests/phpunit/includes/interwiki/InterwikiTest.php
@@ -1,4 +1,6 @@
 <?php
+use MediaWiki\MediaWikiServices;
+
 /**
  * @covers Interwiki
  *
@@ -47,7 +49,15 @@ class InterwikiTest extends MediaWikiTestCase {
 		$this->tablesUsed[] = 'interwiki';
 	}
 
+	private function setWgInterwikiCache( $interwikiCache ) {
+		$this->overrideMwServices();
+		MediaWikiServices::getInstance()->resetServiceForTesting( 'InterwikiLookup' );
+		$this->setMwGlobals( 'wgInterwikiCache', $interwikiCache );
+	}
+
 	public function testDatabaseStorage() {
+		$this->markTestSkipped( 'Needs I37b8e8018b3 <https://gerrit.wikimedia.org/r/#/c/270555/>' );
+
 		// NOTE: database setup is expensive, so we only do
 		//  it once and run all the tests in one go.
 		$dewiki = [
@@ -70,34 +80,34 @@ class InterwikiTest extends MediaWikiTestCase {
 
 		$this->populateDB( [ $dewiki, $zzwiki ] );
 
-		Interwiki::resetLocalCache();
-		$this->setMwGlobals( 'wgInterwikiCache', false );
+		$this->setWgInterwikiCache( false );
 
+		$interwikiLookup = MediaWikiServices::getInstance()->getInterwikiLookup();
 		$this->assertEquals(
 			[ $dewiki, $zzwiki ],
-			Interwiki::getAllPrefixes(),
+			$interwikiLookup->getAllPrefixes(),
 			'getAllPrefixes()'
 		);
 		$this->assertEquals(
 			[ $dewiki ],
-			Interwiki::getAllPrefixes( true ),
+			$interwikiLookup->getAllPrefixes( true ),
 			'getAllPrefixes()'
 		);
 		$this->assertEquals(
 			[ $zzwiki ],
-			Interwiki::getAllPrefixes( false ),
+			$interwikiLookup->getAllPrefixes( false ),
 			'getAllPrefixes()'
 		);
 
-		$this->assertTrue( Interwiki::isValidInterwiki( 'de' ), 'known prefix is valid' );
-		$this->assertFalse( Interwiki::isValidInterwiki( 'xyz' ), 'unknown prefix is valid' );
+		$this->assertTrue( $interwikiLookup->isValidInterwiki( 'de' ), 'known prefix is valid' );
+		$this->assertFalse( $interwikiLookup->isValidInterwiki( 'xyz' ), 'unknown prefix is valid' );
 
-		$this->assertNull( Interwiki::fetch( null ), 'no prefix' );
-		$this->assertFalse( Interwiki::fetch( 'xyz' ), 'unknown prefix' );
+		$this->assertNull( $interwikiLookup->fetch( null ), 'no prefix' );
+		$this->assertFalse( $interwikiLookup->fetch( 'xyz' ), 'unknown prefix' );
 
-		$interwiki = Interwiki::fetch( 'de' );
-		$this->assertInstanceOf( 'Interwiki', $interwiki );
-		$this->assertSame( $interwiki, Interwiki::fetch( 'de' ), 'in-process caching' );
+		$interwiki = $interwikiLookup->fetch( 'de' );
+		$this->assertInstanceOf( Interwiki::class, $interwiki );
+		$this->assertSame( $interwiki, $interwikiLookup->fetch( 'de' ), 'in-process caching' );
 
 		$this->assertSame( 'http://de.wikipedia.org/wiki/', $interwiki->getURL(), 'getURL' );
 		$this->assertSame( 'http://de.wikipedia.org/w/api.php', $interwiki->getAPI(), 'getAPI' );
@@ -105,150 +115,8 @@ class InterwikiTest extends MediaWikiTestCase {
 		$this->assertSame( true, $interwiki->isLocal(), 'isLocal' );
 		$this->assertSame( false, $interwiki->isTranscludable(), 'isTranscludable' );
 
-		Interwiki::invalidateCache( 'de' );
-		$this->assertNotSame( $interwiki, Interwiki::fetch( 'de' ), 'invalidate cache' );
-	}
-
-	/**
-	 * @param string $thisSite
-	 * @param string[] $local
-	 * @param string[] $global
-	 *
-	 * @return string[]
-	 */
-	private function populateHash( $thisSite, $local, $global ) {
-		$hash = [];
-		$hash[ '__sites:' . wfWikiID() ] = $thisSite;
-
-		$globals = [];
-		$locals = [];
-
-		foreach ( $local as $row ) {
-			$prefix = $row['iw_prefix'];
-			$data = $row['iw_local'] . ' ' . $row['iw_url'];
-			$locals[] = $prefix;
-			$hash[ "_{$thisSite}:{$prefix}" ] = $data;
-		}
-
-		foreach ( $global as $row ) {
-			$prefix = $row['iw_prefix'];
-			$data = $row['iw_local'] . ' ' . $row['iw_url'];
-			$globals[] = $prefix;
-			$hash[ "__global:{$prefix}" ] = $data;
-		}
-
-		$hash[ '__list:__global' ] = implode( ' ', $globals );
-		$hash[ '__list:_' . $thisSite ] = implode( ' ', $locals );
-
-		return $hash;
-	}
-
-	private function populateCDB( $thisSite, $local, $global ) {
-		$cdbFile = tempnam( wfTempDir(), 'MW-ClassicInterwikiLookupTest-' ) . '.cdb';
-		$cdb = CdbWriter::open( $cdbFile );
-
-		$hash = $this->populateHash( $thisSite, $local, $global );
-
-		foreach ( $hash as $key => $value ) {
-			$cdb->set( $key, $value );
-		}
-
-		$cdb->close();
-		return $cdbFile;
-	}
-
-	public function testCDBStorage() {
-		// NOTE: CDB setup is expensive, so we only do
-		//  it once and run all the tests in one go.
-
-		$dewiki = [
-			'iw_prefix' => 'de',
-			'iw_url' => 'http://de.wikipedia.org/wiki/',
-			'iw_local' => 1
-		];
-
-		$zzwiki = [
-			'iw_prefix' => 'zz',
-			'iw_url' => 'http://zzwiki.org/wiki/',
-			'iw_local' => 0
-		];
-
-		$cdbFile = $this->populateCDB(
-			'en',
-			[ $dewiki ],
-			[ $zzwiki ]
-		);
-
-		Interwiki::resetLocalCache();
-		$this->setMwGlobals( 'wgInterwikiCache', $cdbFile );
-
-		$this->assertEquals(
-			[ $dewiki, $zzwiki ],
-			Interwiki::getAllPrefixes(),
-			'getAllPrefixes()'
-		);
-
-		$this->assertTrue( Interwiki::isValidInterwiki( 'de' ), 'known prefix is valid' );
-		$this->assertTrue( Interwiki::isValidInterwiki( 'zz' ), 'known prefix is valid' );
-
-		$interwiki = Interwiki::fetch( 'de' );
-		$this->assertInstanceOf( 'Interwiki', $interwiki );
-
-		$this->assertSame( 'http://de.wikipedia.org/wiki/', $interwiki->getURL(), 'getURL' );
-		$this->assertSame( true, $interwiki->isLocal(), 'isLocal' );
-
-		$interwiki = Interwiki::fetch( 'zz' );
-		$this->assertInstanceOf( 'Interwiki', $interwiki );
-
-		$this->assertSame( 'http://zzwiki.org/wiki/', $interwiki->getURL(), 'getURL' );
-		$this->assertSame( false, $interwiki->isLocal(), 'isLocal' );
-
-		// cleanup temp file
-		unlink( $cdbFile );
-	}
-
-	public function testArrayStorage() {
-		$dewiki = [
-			'iw_prefix' => 'de',
-			'iw_url' => 'http://de.wikipedia.org/wiki/',
-			'iw_local' => 1
-		];
-
-		$zzwiki = [
-			'iw_prefix' => 'zz',
-			'iw_url' => 'http://zzwiki.org/wiki/',
-			'iw_local' => 0
-		];
-
-		$cdbData = $this->populateHash(
-			'en',
-			[ $dewiki ],
-			[ $zzwiki ]
-		);
-
-		Interwiki::resetLocalCache();
-		$this->setMwGlobals( 'wgInterwikiCache', $cdbData );
-
-		$this->assertEquals(
-			[ $dewiki, $zzwiki ],
-			Interwiki::getAllPrefixes(),
-			'getAllPrefixes()'
-		);
-
-		$this->assertTrue( Interwiki::isValidInterwiki( 'de' ), 'known prefix is valid' );
-		$this->assertTrue( Interwiki::isValidInterwiki( 'zz' ), 'known prefix is valid' );
-
-		$interwiki = Interwiki::fetch( 'de' );
-		$this->assertInstanceOf( 'Interwiki', $interwiki );
-
-		$this->assertSame( 'http://de.wikipedia.org/wiki/', $interwiki->getURL(), 'getURL' );
-		$this->assertSame( true, $interwiki->isLocal(), 'isLocal' );
-
-		$interwiki = Interwiki::fetch( 'zz' );
-		$this->assertInstanceOf( 'Interwiki', $interwiki );
-
-		$this->assertSame( 'http://zzwiki.org/wiki/', $interwiki->getURL(), 'getURL' );
-		$this->assertSame( false, $interwiki->isLocal(), 'isLocal' );
+		$interwikiLookup->invalidateCache( 'de' );
+		$this->assertNotSame( $interwiki, $interwikiLookup->fetch( 'de' ), 'invalidate cache' );
 	}
 
 }