Merge pull request #717 from wmde/fingerprint

Avoid calling getFingerprint where not necesarry

Author: manicki

tests/unit/Entity/ItemTest.php

@@ -200,7 +200,7 @@ public function testItemWithIdIsEmpty() {
 
 	public function testItemWithStuffIsNotEmpty() {
 		$item = new Item();
-		$item->getFingerprint()->setAliasGroup( 'en', [ 'foo' ] );
+		$item->setAliases( 'en', [ 'foo' ] );
 		$this->assertFalse( $item->isEmpty() );
 
 		$item = new Item();
@@ -292,11 +292,14 @@ public function testEquals( Item $firstItem, Item $secondItem ) {
 		$this->assertTrue( $secondItem->equals( $firstItem ) );
 	}
 
+	/**
+	 * @return Item
+	 */
 	private function getBaseItem() {
 		$item = new Item( new ItemId( 'Q42' ) );
-		$item->getFingerprint()->setLabel( 'en', 'Same' );
-		$item->getFingerprint()->setDescription( 'en', 'Same' );
-		$item->getFingerprint()->setAliasGroup( 'en', [ 'Same' ] );
+		$item->setLabel( 'en', 'Same' );
+		$item->setDescription( 'en', 'Same' );
+		$item->setAliases( 'en', [ 'Same' ] );
 		$item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Same' );
 		$item->getStatements()->addNewStatement( new PropertyNoValueSnak( 42 ) );
 
@@ -305,13 +308,13 @@ private function getBaseItem() {
 
 	public function notEqualsProvider() {
 		$differentLabel = $this->getBaseItem();
-		$differentLabel->getFingerprint()->setLabel( 'en', 'Different' );
+		$differentLabel->setLabel( 'en', 'Different' );
 
 		$differentDescription = $this->getBaseItem();
-		$differentDescription->getFingerprint()->setDescription( 'en', 'Different' );
+		$differentDescription->setDescription( 'en', 'Different' );
 
 		$differentAlias = $this->getBaseItem();
-		$differentAlias->getFingerprint()->setAliasGroup( 'en', [ 'Different' ] );
+		$differentAlias->setAliases( 'en', [ 'Different' ] );
 
 		$differentSiteLink = $this->getBaseItem();
 		$differentSiteLink->getSiteLinkList()->removeLinkWithSiteId( 'enwiki' );

tests/unit/Entity/PropertyTest.php

@@ -27,6 +27,9 @@
  */
 class PropertyTest extends PHPUnit_Framework_TestCase {
 
+	/**
+	 * @return Property
+	 */
 	private function getNewEmpty() {
 		return Property::newFromType( 'string' );
 	}
@@ -106,7 +109,7 @@ public function testPropertyWithIdIsEmpty() {
 
 	public function testPropertyWithFingerprintIsNotEmpty() {
 		$property = Property::newFromType( 'string' );
-		$property->getFingerprint()->setAliasGroup( 'en', [ 'foo' ] );
+		$property->setAliases( 'en', [ 'foo' ] );
 		$this->assertFalse( $property->isEmpty() );
 	}
 
@@ -166,23 +169,23 @@ private function getBaseProperty() {
 		$property = Property::newFromType( 'string' );
 
 		$property->setId( 42 );
-		$property->getFingerprint()->setLabel( 'en', 'Same' );
-		$property->getFingerprint()->setDescription( 'en', 'Same' );
-		$property->getFingerprint()->setAliasGroup( 'en', [ 'Same' ] );
+		$property->setLabel( 'en', 'Same' );
+		$property->setDescription( 'en', 'Same' );
+		$property->setAliases( 'en', [ 'Same' ] );
 		$property->setStatements( $this->newNonEmptyStatementList() );
 
 		return $property;
 	}
 
 	public function notEqualsProvider() {
 		$differentLabel = $this->getBaseProperty();
-		$differentLabel->getFingerprint()->setLabel( 'en', 'Different' );
+		$differentLabel->setLabel( 'en', 'Different' );
 
 		$differentDescription = $this->getBaseProperty();
-		$differentDescription->getFingerprint()->setDescription( 'en', 'Different' );
+		$differentDescription->setDescription( 'en', 'Different' );
 
 		$differentAlias = $this->getBaseProperty();
-		$differentAlias->getFingerprint()->setAliasGroup( 'en', [ 'Different' ] );
+		$differentAlias->setAliases( 'en', [ 'Different' ] );
 
 		$differentStatement = $this->getBaseProperty();
 		$differentStatement->setStatements( new StatementList() );
@@ -262,9 +265,9 @@ public function testOriginalDoesNotChangeWithClone( Property $original, Property
 		$clonedStatement->getQualifiers()->addSnak( new PropertyNoValueSnak( 1 ) );
 		$clonedStatement->getReferences()->addNewReference( new PropertyNoValueSnak( 1 ) );
 
-		$this->assertSame( 'original', $original->getFingerprint()->getLabel( 'en' )->getText() );
-		$this->assertFalse( $original->getFingerprint()->hasDescription( 'en' ) );
-		$this->assertFalse( $original->getFingerprint()->hasAliasGroup( 'en' ) );
+		$this->assertSame( 'original', $original->getLabels()->getByLanguage( 'en' )->getText() );
+		$this->assertFalse( $original->getDescriptions()->hasTermForLanguage( 'en' ) );
+		$this->assertFalse( $original->getAliasGroups()->hasGroupForLanguage( 'en' ) );
 		$this->assertNull( $originalStatement->getGuid() );
 		$this->assertSame( 'novalue', $originalStatement->getMainSnak()->getType() );
 		$this->assertSame( Statement::RANK_NORMAL, $originalStatement->getRank() );

tests/unit/HashArray/HashArrayTest.php

@@ -2,9 +2,7 @@
 
 namespace Wikibase\DataModel\Tests\HashArray;
 
-use Hashable;
 use Wikibase\DataModel\HashArray;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 
 /**
  * @covers Wikibase\DataModel\HashArray