jenkins-bot has submitted this change and it was merged.
Change subject: Simplify mocking methods in SpecialWikibaseRepoPage
......................................................................
Simplify mocking methods in SpecialWikibaseRepoPage
This drops some methods from abstract base classes that are not
really needed. You know, I usually don't have a problem with
abstract base classes. But in this case the base code is not even
executed.
Change-Id: I4c5ca538de4341ae06a2f29b9e44b3f822d0f000
---
M repo/includes/specials/SpecialSetLabelDescriptionAliases.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
M repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
3 files changed, 9 insertions(+), 47 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
b/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
index 621d0d4..d0d71b7 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::setSpecialWikibaseRepoPageServices
*
* @param SummaryFormatter $summaryFormatter
* @param EntityRevisionLookup $entityRevisionLookup
@@ -92,7 +90,7 @@
FingerprintChangeOpFactory $changeOpFactory,
ContentLanguages $termsLanguages
) {
- self::setSpecialWikibaseRepoPageServices(
+ $this->setSpecialWikibaseRepoPageServices(
$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/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index b2ae5c8..133b30b 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()
*
@@ -43,15 +41,6 @@
protected function newSpecialPage() {
$page = new SpecialSetLabelDescriptionAliases();
- $this->setMockServices( $page );
-
- return $page;
- }
-
- /**
- * @param SpecialSetLabelDescriptionAliases $page
- */
- protected function setMockServices( SpecialWikibaseRepoPage $page ) {
$page->setServices(
$this->getSummaryFormatter(),
$this->getEntityRevisionLookup(),
@@ -62,6 +51,8 @@
$this->getFingerprintChangeOpsFactory(),
$this->getContentLanguages()
);
+
+ return $page;
}
/**
@@ -69,7 +60,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..e0cb392 100644
--- a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
+++ b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
@@ -20,7 +20,6 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\Specials\SpecialWikibaseRepoPage;
use Wikibase\Repo\Store\EntityPermissionChecker;
use Wikibase\SummaryFormatter;
@@ -41,22 +40,6 @@
parent::setUp();
$this->mockRepository = new MockRepository();
- }
-
- /**
- * Call $page->setSpecialWikibaseRepoPageServices with the default mock
services.
- *
- * @param SpecialWikibaseRepoPage $page
- */
- protected function setMockServices( SpecialWikibaseRepoPage $page ) {
- $page->setSpecialWikibaseRepoPageServices(
- $this->getSummaryFormatter(),
- $this->getEntityRevisionLookup(),
- $this->getEntityTitleLookup(),
- $this->getEntityStore(),
- $this->getEntityPermissionChecker(),
- $this->getSiteStore()
- );
}
protected function getSummaryFormatter() {
@@ -190,4 +173,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: merged
Gerrit-Change-Id: I4c5ca538de4341ae06a2f29b9e44b3f822d0f000
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
