jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394390 )
Change subject: Stop adding "other usage" when we are using just the description
......................................................................
Stop adding "other usage" when we are using just the description
Description usage tracking has been implemented now ^_^
Bug: T176417
Change-Id: I9801d06c6f9f28107a43bb0160d4a4119a0e0089
---
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindings.php
M
client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindingsTest.php
3 files changed, 5 insertions(+), 89 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index 4290d37..a701969 100644
--- a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -242,7 +242,6 @@
private function newLanguageDependentLuaBindings() {
$wikibaseClient = WikibaseClient::getDefaultInstance();
- $usageAccumulator = $this->getUsageAccumulator();
$labelDescriptionLookup = new
LanguageFallbackLabelDescriptionLookup(
$wikibaseClient->getTermLookup(),
@@ -251,15 +250,14 @@
$usageTrackingLabelDescriptionLookup = new
UsageTrackingLanguageFallbackLabelDescriptionLookup(
$labelDescriptionLookup,
- $usageAccumulator,
+ $this->getUsageAccumulator(),
$this->getLanguageFallbackChain(),
$this->allowDataAccessInUserLanguage()
);
return new WikibaseLanguageDependentLuaBindings(
$this->getEntityIdParser(),
- $usageTrackingLabelDescriptionLookup,
- $usageAccumulator
+ $usageTrackingLabelDescriptionLookup
);
}
diff --git
a/client/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindings.php
b/client/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindings.php
index 984814a..4346afa 100644
---
a/client/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindings.php
+++
b/client/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindings.php
@@ -2,7 +2,6 @@
namespace Wikibase\Client\DataAccess\Scribunto;
-use Wikibase\Client\Usage\UsageAccumulator;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
@@ -30,26 +29,18 @@
private $labelDescriptionLookup;
/**
- * @var UsageAccumulator
- */
- private $usageAccumulator;
-
- /**
* @param EntityIdParser $entityIdParser
* @param LabelDescriptionLookup $labelDescriptionLookup
- * @param UsageAccumulator $usageAccumulator for tracking title usage
via getEntityId.
*
* @note: label usage is not tracked in $usageAccumulator. This should
be done inside
* the $labelDescriptionLookup or an underlying TermsLookup.
*/
public function __construct(
EntityIdParser $entityIdParser,
- LabelDescriptionLookup $labelDescriptionLookup,
- UsageAccumulator $usageAccumulator
+ LabelDescriptionLookup $labelDescriptionLookup
) {
$this->entityIdParser = $entityIdParser;
$this->labelDescriptionLookup = $labelDescriptionLookup;
- $this->usageAccumulator = $usageAccumulator;
}
/**
@@ -108,9 +99,6 @@
return [ null, null ];
}
- // XXX: This. Sucks. A lot.
- // Also notes about language fallbacks from getLabel apply
- $this->usageAccumulator->addOtherUsage( $entityId );
return [ $term->getText(), $term->getActualLanguageCode() ];
}
diff --git
a/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindingsTest.php
b/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindingsTest.php
index dfeaea9..0f283db 100644
---
a/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindingsTest.php
+++
b/client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLanguageDependentLuaBindingsTest.php
@@ -4,11 +4,6 @@
use PHPUnit_Framework_TestCase;
use Wikibase\Client\DataAccess\Scribunto\WikibaseLanguageDependentLuaBindings;
-use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\Client\Usage\HashUsageAccumulator;
-use Wikibase\Client\Usage\UsageAccumulator;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
use Wikibase\DataModel\Term\TermFallback;
@@ -37,18 +32,15 @@
/**
* @param LanguageFallbackLabelDescriptionLookup $labelDescriptionLookup
- * @param UsageAccumulator|null $usageAccumulator
*
* @return WikibaseLanguageDependentLuaBindings
*/
private function getWikibaseLanguageDependentLuaBindings(
- LanguageFallbackLabelDescriptionLookup $labelDescriptionLookup,
- UsageAccumulator $usageAccumulator = null
+ LanguageFallbackLabelDescriptionLookup $labelDescriptionLookup
) {
return new WikibaseLanguageDependentLuaBindings(
new ItemIdParser(),
- $labelDescriptionLookup,
- $usageAccumulator ?: new HashUsageAccumulator()
+ $labelDescriptionLookup
);
}
@@ -75,12 +67,6 @@
return $labelDescriptionLookup;
}
- private function hasUsage( $actualUsages, EntityId $entityId, $aspect )
{
- $usage = new EntityUsage( $entityId, $aspect );
- $key = $usage->getIdentityString();
- return isset( $actualUsages[$key] );
- }
-
public function getLabelProvider() {
return [
[ [ 'LabelString', 'lang-code' ], 'Q123' ],
@@ -102,29 +88,6 @@
$this->assertSame( $expected, $wikibaseLuaBindings->getLabel(
$itemId ) );
}
- public function testGetLabel_usage() {
- $usages = new HashUsageAccumulator();
-
- $wikibaseLuaBindings =
$this->getWikibaseLanguageDependentLuaBindings(
- $this->getLabelDescriptionLookup(),
- $usages
- );
-
- $itemId = new ItemId( 'Q7' );
- $wikibaseLuaBindings->getLabel( $itemId->getSerialization() );
-
- //NOTE: label usage is not tracked directly, this is done via
the LabelDescriptionLookup
- $this->assertFalse(
- $this->hasUsage( $usages->getUsages(), $itemId,
EntityUsage::TITLE_USAGE ),
- 'title usage'
- );
-
- $this->assertFalse(
- $this->hasUsage( $usages->getUsages(), $itemId,
EntityUsage::ALL_USAGE ),
- 'all usage'
- );
- }
-
public function getDescriptionProvider() {
return [
[ [ 'DescriptionString', 'lang-code' ], 'Q123' ],
@@ -144,39 +107,6 @@
);
$this->assertSame( $expected,
$wikibaseLuaBindings->getDescription( $itemId ) );
- }
-
- public function testGetDescription_usage() {
- $usages = new HashUsageAccumulator();
-
- $wikibaseLuaBindings =
$this->getWikibaseLanguageDependentLuaBindings(
- $this->getLabelDescriptionLookup(),
- $usages
- );
-
- $itemId = new ItemId( 'Q7' );
- $wikibaseLuaBindings->getDescription(
$itemId->getSerialization() );
-
- //NOTE: description usage is not tracked directly, this is done
via the LabelDescriptionLookup
- $this->assertTrue(
- $this->hasUsage( $usages->getUsages(), $itemId,
EntityUsage::OTHER_USAGE ),
- 'other usage'
- );
-
- $this->assertFalse(
- $this->hasUsage( $usages->getUsages(), $itemId,
EntityUsage::LABEL_USAGE ),
- 'label usage'
- );
-
- $this->assertFalse(
- $this->hasUsage( $usages->getUsages(), $itemId,
EntityUsage::TITLE_USAGE ),
- 'title usage'
- );
-
- $this->assertFalse(
- $this->hasUsage( $usages->getUsages(), $itemId,
EntityUsage::ALL_USAGE ),
- 'all usage'
- );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/394390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9801d06c6f9f28107a43bb0160d4a4119a0e0089
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Ladsgroup <[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
