Hoo man has submitted this change and it was merged.
Change subject: Basic cleanup inLangLinkHandlerTest
......................................................................
Basic cleanup inLangLinkHandlerTest
Change-Id: I42b03c406d0e3ce4a8b4ac6bc24963bfc5ab5073
---
M client/tests/phpunit/includes/LangLinkHandlerTest.php
1 file changed, 18 insertions(+), 17 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
WikidataJenkins: Verified
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index e998870..a4b5305 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -5,7 +5,7 @@
use MediaWikiSite;
use ParserOutput;
use Title;
-use Wikibase\Item;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\LangLinkHandler;
use Wikibase\NamespaceChecker;
@@ -22,10 +22,10 @@
class LangLinkHandlerTest extends \MediaWikiTestCase {
/* @var MockRepository $mockRepo */
- protected $mockRepo;
+ private $mockRepo;
/* @var LangLinkHandler $langLinkHandler */
- protected $langLinkHandler;
+ private $langLinkHandler;
static $itemData = array(
1 => array( // matching item
@@ -130,11 +130,11 @@
);
}
- protected function makeParserOutput( $langlinks, $noexternallanglinks =
array() ) {
+ protected function makeParserOutput( $langLinks, $noExternalLangLinks =
array() ) {
$out = new ParserOutput();
- $this->langLinkHandler->setNoExternalLangLinks( $out,
$noexternallanglinks );
+ $this->langLinkHandler->setNoExternalLangLinks( $out,
$noExternalLangLinks );
- foreach ( $langlinks as $lang => $link ) {
+ foreach ( $langLinks as $lang => $link ) {
$out->addLanguageLink( "$lang:$link" );
}
@@ -144,11 +144,11 @@
/**
* @dataProvider provideGetNoExternalLangLinks
*/
- public function testGetNoExternalLangLinks( $noexternallanglinks ) {
- $out = $this->makeParserOutput( array(), $noexternallanglinks );
+ public function testGetNoExternalLangLinks( $noExternalLangLinks ) {
+ $out = $this->makeParserOutput( array(), $noExternalLangLinks );
$nel = $this->langLinkHandler->getNoExternalLangLinks( $out );
- $this->assertEquals( $noexternallanglinks, $nel );
+ $this->assertEquals( $noExternalLangLinks, $nel );
}
public static function provideExcludeRepoLinks() {
@@ -216,13 +216,13 @@
/**
* @dataProvider provideUseRepoLinks
*/
- public function testUseRepoLinks( $title, $noexternallanglinks,
$expected ) {
+ public function testUseRepoLinks( $title, $noExternalLangLinks,
$expected ) {
if ( is_string( $title ) ) {
$title = Title::newFromText( $title );
$title->resetArticleID( 1 );
}
- $out = $this->makeParserOutput( array(), $noexternallanglinks );
+ $out = $this->makeParserOutput( array(), $noExternalLangLinks );
$useRepoLinks = $this->langLinkHandler->useRepoLinks( $title,
$out );
@@ -297,12 +297,12 @@
/**
* @dataProvider provideGetEffectiveRepoLinks
*/
- public function testGetEffectiveRepoLinks( $title, $langlinks,
$noexternallanglinks, $expectedLinks ) {
+ public function testGetEffectiveRepoLinks( $title, $langLinks,
$noExternalLangLinks, $expectedLinks ) {
if ( is_string( $title ) ) {
$title = Title::newFromText( $title );
}
- $out = $this->makeParserOutput( $langlinks,
$noexternallanglinks );
+ $out = $this->makeParserOutput( $langLinks,
$noExternalLangLinks );
$links = $this->langLinkHandler->getEffectiveRepoLinks( $title,
$out );
@@ -314,11 +314,11 @@
foreach ( $cases as $i => $case ) {
// convert associative array to list of links
- $langlinks = self::mapToLinks( $case[1] );
+ $langLinks = self::mapToLinks( $case[1] );
$expectedLinks = self::mapToLinks( $case[3] );
// expect the expected effective links plus the
provided language links
- $expectedLinks = array_merge( $expectedLinks,
$langlinks );
+ $expectedLinks = array_merge( $expectedLinks,
$langLinks );
$cases[$i] = array(
$case[0],
@@ -334,12 +334,12 @@
/**
* @dataProvider provideAddLinksFromRepository
*/
- public function testAddLinksFromRepository( $title, $langlinks,
$noexternallanglinks, $expectedLinks ) {
+ public function testAddLinksFromRepository( $title, $langLinks,
$noExternalLangLinks, $expectedLinks ) {
if ( is_string( $title ) ) {
$title = Title::newFromText( $title );
}
- $out = $this->makeParserOutput( $langlinks,
$noexternallanglinks );
+ $out = $this->makeParserOutput( $langLinks,
$noExternalLangLinks );
$this->langLinkHandler->addLinksFromRepository( $title, $out );
$links = $out->getLanguageLinks();
@@ -480,4 +480,5 @@
array( $dewikivoyage, 'de' )
);
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/137859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42b03c406d0e3ce4a8b4ac6bc24963bfc5ab5073
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
