Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334979 )
Change subject: Remove not needed FingerprintProvider type hints from repo tests
......................................................................
Remove not needed FingerprintProvider type hints from repo tests
These tests do not need this interface. They can either use the more
specific LabelsProvider interface, or simply work with the actual Item
object that is there. The later is not a problem because this is
private anyway.
Change-Id: I25cc1568669164759ad96bcab4e129c73cdda8e7
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
M repo/tests/phpunit/includes/Content/EntityHandlerTest.php
M repo/tests/phpunit/includes/ParserOutput/ParserOutputJsConfigBuilderTest.php
3 files changed, 32 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/79/334979/1
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
index 9f37e59..730bd08 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
@@ -8,7 +8,6 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Term\FingerprintProvider;
use Wikibase\Summary;
/**
@@ -57,14 +56,14 @@
*/
public function testApply( ChangeOp $changeOpDescription,
$expectedDescription ) {
$entity = $this->provideNewEntity();
- $entity->getFingerprint()->setDescription( 'en', 'INVALID' );
+ $entity->setDescription( 'en', 'INVALID' );
$changeOpDescription->apply( $entity );
if ( $expectedDescription === '' ) {
- $this->assertFalse(
$entity->getFingerprint()->hasDescription( 'en' ) );
+ $this->assertFalse(
$entity->getDescriptions()->hasTermForLanguage( 'en' ) );
} else {
- $this->assertEquals( $expectedDescription,
$entity->getFingerprint()->getDescription( 'en' )->getText() );
+ $this->assertEquals( $expectedDescription,
$entity->getDescriptions()->getByLanguage( 'en' )->getText() );
}
}
@@ -91,18 +90,18 @@
public function testValidate( ChangeOp $changeOp, $valid ) {
$entity = $this->provideNewEntity();
- $oldDescriptions =
$entity->getFingerprint()->getDescriptions()->toTextArray();
+ $oldDescriptions = $entity->getDescriptions()->toTextArray();
$result = $changeOp->validate( $entity );
$this->assertEquals( $valid, $result->isValid(), 'isValid()' );
// descriptions should not have changed during validation
- $newDescriptions =
$entity->getFingerprint()->getDescriptions()->toTextArray();
+ $newDescriptions = $entity->getDescriptions()->toTextArray();
$this->assertEquals( $oldDescriptions, $newDescriptions,
'Descriptions modified by validation!' );
}
/**
- * @return EntityDocument|FingerprintProvider
+ * @return Item
*/
private function provideNewEntity() {
$item = new Item( new ItemId( 'Q23' ) );
@@ -119,11 +118,11 @@
$args = array();
$entity = $this->provideNewEntity();
- $entity->getFingerprint()->setDescription( 'de', 'Test' );
+ $entity->setDescription( 'de', 'Test' );
$args[] = array( $entity, new ChangeOpDescription( 'de',
'Zusammenfassung', $validatorFactory ), 'set', 'de' );
$entity = $this->provideNewEntity();
- $entity->getFingerprint()->setDescription( 'de', 'Test' );
+ $entity->setDescription( 'de', 'Test' );
$args[] = array( $entity, new ChangeOpDescription( 'de', null,
$validatorFactory ), 'remove', 'de' );
$entity = $this->provideNewEntity();
diff --git a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
index 109678c..3ab72f0 100644
--- a/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/Content/EntityHandlerTest.php
@@ -16,7 +16,7 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityRedirect;
-use Wikibase\DataModel\Term\FingerprintProvider;
+use Wikibase\DataModel\Term\LabelsProvider;
use Wikibase\EntityContent;
use Wikibase\InternalSerialization\SerializerFactory;
use Wikibase\Lib\DataTypeDefinitions;
@@ -246,44 +246,43 @@
}
public function provideGetUndoContent() {
- /** @var FingerprintProvider $e1 */
- /** @var FingerprintProvider $e2 */
- /** @var FingerprintProvider $e3 */
- /** @var FingerprintProvider $e4 */
- /** @var FingerprintProvider $e5 */
- /** @var FingerprintProvider $e5u4 */
- /** @var FingerprintProvider $e5u4u3 */
+ /** @var LabelsProvider $e2 */
+ /** @var LabelsProvider $e3 */
+ /** @var LabelsProvider $e4 */
+ /** @var LabelsProvider $e5 */
+ /** @var LabelsProvider $e5u4 */
+ /** @var LabelsProvider $e5u4u3 */
$e1 = $this->newEntity();
$r1 = $this->fakeRevision( $this->newEntityContent( $e1 ), 1 );
$e2 = $this->newEntity();
- $e2->getFingerprint()->setLabel( 'en', 'Foo' );
+ $e2->getLabels()->setTextForLanguage( 'en', 'Foo' );
$r2 = $this->fakeRevision( $this->newEntityContent( $e2 ), 2 );
$e3 = $this->newEntity();
- $e3->getFingerprint()->setLabel( 'en', 'Foo' );
- $e3->getFingerprint()->setLabel( 'de', 'Fuh' );
+ $e3->getLabels()->setTextForLanguage( 'en', 'Foo' );
+ $e3->getLabels()->setTextForLanguage( 'de', 'Fuh' );
$r3 = $this->fakeRevision( $this->newEntityContent( $e3 ), 3 );
$e4 = $this->newEntity();
- $e4->getFingerprint()->setLabel( 'en', 'Foo' );
- $e4->getFingerprint()->setLabel( 'de', 'Fuh' );
- $e4->getFingerprint()->setLabel( 'fr', 'Fu' );
+ $e4->getLabels()->setTextForLanguage( 'en', 'Foo' );
+ $e4->getLabels()->setTextForLanguage( 'de', 'Fuh' );
+ $e4->getLabels()->setTextForLanguage( 'fr', 'Fu' );
$r4 = $this->fakeRevision( $this->newEntityContent( $e4 ), 4 );
$e5 = $this->newEntity();
- $e5->getFingerprint()->setLabel( 'en', 'F00' );
- $e5->getFingerprint()->setLabel( 'de', 'Fuh' );
- $e5->getFingerprint()->setLabel( 'fr', 'Fu' );
+ $e5->getLabels()->setTextForLanguage( 'en', 'F00' );
+ $e5->getLabels()->setTextForLanguage( 'de', 'Fuh' );
+ $e5->getLabels()->setTextForLanguage( 'fr', 'Fu' );
$r5 = $this->fakeRevision( $this->newEntityContent( $e5 ), 5 );
$e5u4 = $this->newEntity();
- $e5u4->getFingerprint()->setLabel( 'en', 'F00' );
- $e5u4->getFingerprint()->setLabel( 'de', 'Fuh' );
+ $e5u4->getLabels()->setTextForLanguage( 'en', 'F00' );
+ $e5u4->getLabels()->setTextForLanguage( 'de', 'Fuh' );
$e5u4u3 = $this->newEntity();
- $e5u4u3->getFingerprint()->setLabel( 'en', 'F00' );
+ $e5u4u3->getLabels()->setTextForLanguage( 'en', 'F00' );
return array(
array( $r5, $r5, $r4, $this->newEntityContent( $e4 ),
"undo last edit" ),
diff --git
a/repo/tests/phpunit/includes/ParserOutput/ParserOutputJsConfigBuilderTest.php
b/repo/tests/phpunit/includes/ParserOutput/ParserOutputJsConfigBuilderTest.php
index bd586c7..f23c87f 100644
---
a/repo/tests/phpunit/includes/ParserOutput/ParserOutputJsConfigBuilderTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/ParserOutputJsConfigBuilderTest.php
@@ -17,7 +17,7 @@
use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\StatementListProvider;
-use Wikibase\DataModel\Term\FingerprintProvider;
+use Wikibase\DataModel\Term\LabelsProvider;
use Wikibase\Repo\ParserOutput\ParserOutputJsConfigBuilder;
/**
@@ -112,9 +112,10 @@
);
}
- private function addLabels( FingerprintProvider $fingerprintProvider ) {
- $fingerprintProvider->getFingerprint()->setLabel( 'en', 'Cake'
);
- $fingerprintProvider->getFingerprint()->setLabel( 'de',
'Kuchen' );
+ private function addLabels( LabelsProvider $entity ) {
+ $termList = $entity->getLabels();
+ $termList->setTextForLanguage( 'en', 'Cake' );
+ $termList->setTextForLanguage( 'de', 'Kuchen' );
}
private function addStatements( StatementListProvider
$statementListProvider ) {
--
To view, visit https://gerrit.wikimedia.org/r/334979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25cc1568669164759ad96bcab4e129c73cdda8e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
