Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236535
Change subject: Remove lots of unused code from LangLinkHandlerTest
......................................................................
Remove lots of unused code from LangLinkHandlerTest
This is a direct follow-up for Id2a1c3f. This patch removes dead code
and replaces MediaWikiSite with the Site base class. The test obviously
does not need the specialized class, otherwise it would fail.
Change-Id: I829c5165fff93cbb551780a9b9e7bdbea5e1a86c
---
M client/tests/phpunit/includes/LangLinkHandlerTest.php
1 file changed, 5 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/35/236535/1
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index efce1ff..909e5ff 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -2,15 +2,10 @@
namespace Wikibase\Client\Tests;
-use MediaWikiSite;
use ParserOutput;
+use Site;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
-use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
-use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
-use Wikibase\Client\ParserOutputDataUpdater;
-use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
@@ -73,11 +68,9 @@
}
/**
- * @param string[] $otherProjects
- *
* @return LangLinkHandler
*/
- private function getLangLinkHandler( array $otherProjects = array() ) {
+ private function getLangLinkHandler() {
$this->mockRepo = new MockRepository();
foreach ( $this->getItems() as $item ) {
@@ -95,44 +88,6 @@
'srwiki',
'wikipedia'
);
- }
-
- /**
- * @param string[] $otherProjects
- *
- * @return OtherProjectsSidebarGeneratorFactory
- */
- private function getOtherProjectsSidebarGeneratorFactory( array
$otherProjects ) {
- $otherProjectsSidebarGenerator =
$this->getOtherProjectsSidebarGenerator( $otherProjects );
-
- $otherProjectsSidebarGeneratorFactory = $this->getMockBuilder(
-
'Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory'
- )
- ->disableOriginalConstructor()
- ->getMock();
-
- $otherProjectsSidebarGeneratorFactory->expects( $this->any() )
- ->method( 'getOtherProjectsSidebarGenerator' )
- ->will( $this->returnValue(
$otherProjectsSidebarGenerator ) );
-
- return $otherProjectsSidebarGeneratorFactory;
- }
-
- /**
- * @param string[] $otherProjects
- *
- * @return OtherProjectsSidebarGenerator
- */
- private function getOtherProjectsSidebarGenerator( array $otherProjects
) {
- $otherProjectsSidebarGenerator = $this->getMockBuilder(
'Wikibase\Client\Hooks\OtherProjectsSidebarGenerator' )
- ->disableOriginalConstructor()
- ->getMock();
-
- $otherProjectsSidebarGenerator->expects( $this->any() )
- ->method( 'buildProjectLinkSidebar' )
- ->will( $this->returnValue( $otherProjects ) );
-
- return $otherProjectsSidebarGenerator;
}
/**
@@ -608,15 +563,15 @@
}
public function getInterwikiCodeFromSiteProvider() {
- $enwiki = new MediaWikiSite();
+ $enwiki = new Site();
$enwiki->setGlobalId( 'enwiki' );
$enwiki->setLanguageCode( 'en' );
- $bexold = new MediaWikiSite();
+ $bexold = new Site();
$bexold->setGlobalId( 'be_x_oldwiki' );
$bexold->setLanguageCode( 'be-x-old' );
- $dewikivoyage = new MediaWikiSite();
+ $dewikivoyage = new Site();
$dewikivoyage->setGlobalId( 'dewikivoyage' );
$dewikivoyage->setLanguageCode( 'de' );
--
To view, visit https://gerrit.wikimedia.org/r/236535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I829c5165fff93cbb551780a9b9e7bdbea5e1a86c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
