Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197952
Change subject: Simplify mocking methods in SpecialWikibaseRepoPage
......................................................................
Simplify mocking methods in SpecialWikibaseRepoPage
Change-Id: I4c5ca538de4341ae06a2f29b9e44b3f822d0f000
---
M repo/includes/specials/SpecialSetLabelDescriptionAliases.php
M repo/includes/specials/SpecialWikibaseRepoPage.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
M repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
4 files changed, 14 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/52/197952/1
diff --git a/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
b/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
index 621d0d4..bb327c2 100644
--- a/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
+++ b/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
@@ -63,15 +63,13 @@
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $this->setAdditionalServices(
- $wikibaseRepo->getChangeOpFactoryProvider()
- ->getFingerprintChangeOpFactory(),
- $wikibaseRepo->getTermsLanguages()
- );
+ $this->changeOpFactory =
$wikibaseRepo->getChangeOpFactoryProvider()
+ ->getFingerprintChangeOpFactory();
+ $this->termsLanguages = $wikibaseRepo->getTermsLanguages();
}
/**
- * Override services (for testing).
+ * @see SpecialWikibaseRepoPage::setServices
*
* @param SummaryFormatter $summaryFormatter
* @param EntityRevisionLookup $entityRevisionLookup
@@ -92,7 +90,7 @@
FingerprintChangeOpFactory $changeOpFactory,
ContentLanguages $termsLanguages
) {
- self::setSpecialWikibaseRepoPageServices(
+ parent::setServices(
$summaryFormatter,
$entityRevisionLookup,
$entityTitleLookup,
@@ -101,17 +99,6 @@
$siteStore
);
- $this->setAdditionalServices( $changeOpFactory, $termsLanguages
);
- }
-
- /**
- * @param FingerprintChangeOpFactory $changeOpFactory
- * @param ContentLanguages $termsLanguages
- */
- private function setAdditionalServices(
- FingerprintChangeOpFactory $changeOpFactory,
- ContentLanguages $termsLanguages
- ) {
$this->changeOpFactory = $changeOpFactory;
$this->termsLanguages = $termsLanguages;
}
diff --git a/repo/includes/specials/SpecialWikibaseRepoPage.php
b/repo/includes/specials/SpecialWikibaseRepoPage.php
index 2a103e6..add6a01 100644
--- a/repo/includes/specials/SpecialWikibaseRepoPage.php
+++ b/repo/includes/specials/SpecialWikibaseRepoPage.php
@@ -73,7 +73,7 @@
parent::__construct( $title, $restriction );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $this->setSpecialWikibaseRepoPageServices(
+ $this->setServices(
$wikibaseRepo->getSummaryFormatter(),
$wikibaseRepo->getEntityRevisionLookup( 'uncached' ),
$wikibaseRepo->getEntityTitleLookup(),
@@ -93,7 +93,7 @@
* @param EntityPermissionChecker $permissionChecker
* @param SiteStore $siteStore
*/
- public function setSpecialWikibaseRepoPageServices(
+ public function setServices(
SummaryFormatter $summaryFormatter,
EntityRevisionLookup $entityRevisionLookup,
EntityTitleLookup $entityTitleLookup,
diff --git
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index b2ae5c8..beb9788 100644
---
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
+++
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
@@ -10,7 +10,6 @@
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Repo\Specials\SpecialSetLabelDescriptionAliases;
-use Wikibase\Repo\Specials\SpecialWikibaseRepoPage;
use Wikibase\Validators\TermValidatorFactory;
use Wikibase\Validators\UniquenessViolation;
@@ -34,7 +33,6 @@
protected $languageCodes = array( 'en', 'de', 'de-ch', 'ii', 'zh' );
-
/**
* @see SpecialPageTestBase::newSpecialPage()
*
@@ -49,9 +47,11 @@
}
/**
+ * @see SpecialWikibaseRepoPageTestBase::setMockServices
+ *
* @param SpecialSetLabelDescriptionAliases $page
*/
- protected function setMockServices( SpecialWikibaseRepoPage $page ) {
+ protected function setMockServices( SpecialSetLabelDescriptionAliases
$page ) {
$page->setServices(
$this->getSummaryFormatter(),
$this->getEntityRevisionLookup(),
@@ -69,7 +69,7 @@
*/
private function getFingerprintChangeOpsFactory() {
$maxLength = 32;
-
+
return new FingerprintChangeOpFactory(
new TermValidatorFactory(
$maxLength,
diff --git
a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
index ee7dd8a..7015281 100644
--- a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
+++ b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
@@ -44,12 +44,12 @@
}
/**
- * Call $page->setSpecialWikibaseRepoPageServices with the default mock
services.
+ * Call $page->setServices with the default mock services.
*
* @param SpecialWikibaseRepoPage $page
*/
protected function setMockServices( SpecialWikibaseRepoPage $page ) {
- $page->setSpecialWikibaseRepoPageServices(
+ $page->setServices(
$this->getSummaryFormatter(),
$this->getEntityRevisionLookup(),
$this->getEntityTitleLookup(),
@@ -190,4 +190,5 @@
protected function getIdParser() {
return new BasicEntityIdParser();
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/197952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c5ca538de4341ae06a2f29b9e44b3f822d0f000
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
