Merge pull request #360 from wmde/setid

Reduce number of setId calls

Author: JeroenDeDauw

tests/unit/Entity/Diff/EntityPatcherTest.php

@@ -6,6 +6,7 @@
 use Wikibase\DataModel\Entity\Diff\EntityPatcher;
 use Wikibase\DataModel\Entity\Diff\ItemDiff;
 use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Fixtures\EntityOfUnknownType;
 
 /**
@@ -32,8 +33,7 @@ public function testGivenEmptyDiffItemRemainsUnchanged( Item $item ) {
 	public function itemProvider() {
 		$argLists = array();
 
-		$nonEmptyItem = new Item();
-		$nonEmptyItem->setId( 2 );
+		$nonEmptyItem = new Item( new ItemId( 'Q2' ) );
 
 		$argLists[] = array( new Item() );
 		$argLists[] = array( $nonEmptyItem );

tests/unit/Entity/ItemTest.php

@@ -609,8 +609,7 @@ public function testEmptyItemIsEmpty() {
 	}
 
 	public function testItemWithIdIsEmpty() {
-		$item = new Item();
-		$item->setId( 1337 );
+		$item = new Item( new ItemId( 'Q1337' ) );
 		$this->assertTrue( $item->isEmpty() );
 	}
 
@@ -646,9 +645,7 @@ private function newStatement() {
 	}
 
 	public function testClearRemovesAllButId() {
-		$item = new Item();
-
-		$item->setId( 42 );
+		$item = new Item( new ItemId( 'Q42' ) );
 		$item->getFingerprint()->setLabel( 'en', 'foo' );
 		$item->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Foo' );
 		$item->addClaim( $this->newStatement() );
@@ -729,9 +726,7 @@ public function testEquals( Item $firstItem, Item $secondItem ) {
 	}
 
 	private function getBaseItem() {
-		$item = new Item();
-
-		$item->setId( 42 );
+		$item = new Item( new ItemId( 'Q42' ) );
 		$item->getFingerprint()->setLabel( 'en', 'Same' );
 		$item->getFingerprint()->setDescription( 'en', 'Same' );
 		$item->getFingerprint()->setAliasGroup( 'en', array( 'Same' ) );