[MediaWiki-commits] [Gerrit] Reduce number of Entity::setId calls - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/189741

Change subject: Reduce number of Entity::setId calls
......................................................................

Reduce number of Entity::setId calls

This is a follow-up to I19503fa.

Change-Id: I266665dc83dd057f6c1f35618dce2c2de256629f
---
M lib/tests/phpunit/store/TermIndexTest.php
M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
2 files changed, 6 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/41/189741/1

diff --git a/lib/tests/phpunit/store/TermIndexTest.php 
b/lib/tests/phpunit/store/TermIndexTest.php
index e9151e1..0155d1d 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -30,9 +30,8 @@
        public function testGetMatchingIDs() {
                $lookup = $this->getTermIndex();
 
-               $item0 = Item::newEmpty();
                $id0 = new ItemId( 'Q10' );
-               $item0->setId( $id0 );
+               $item0 = new Item( $id0 );
 
                $item0->setLabel( 'en', 'foobar' );
                $item0->setLabel( 'de', 'foobar' );
@@ -125,15 +124,13 @@
        public function testGetMatchingPrefixTerms() {
                $lookup = $this->getTermIndex();
 
-               $item0 = Item::newEmpty();
+               $item0 = new Item( new ItemId( 'Q10' ) );
                $item0->setLabel( 'en', 'prefix' );
-               $item0->setId( new ItemId( 'Q10' ) );
                $id0 = $item0->getId()->getSerialization();
                $lookup->saveTermsOfEntity( $item0 );
 
-               $item1 = Item::newEmpty();
+               $item1 = new Item( new ItemId( 'Q11' ) );
                $item1->setLabel( 'nl', 'postfix' );
-               $item1->setId( new ItemId( 'Q11' ) );
                $id1 = $item1->getId()->getSerialization();
                $lookup->saveTermsOfEntity( $item1 );
 
@@ -196,7 +193,8 @@
        public function testDeleteTermsForEntity() {
                $lookup = $this->getTermIndex();
 
-               $item = Item::newEmpty();
+               $id = new ItemId( 'Q10' );
+               $item = new Item( $id );
 
                $item->setLabel( 'en', 'abc' );
                $item->setLabel( 'de', 'def' );
@@ -204,8 +202,6 @@
                $item->setDescription( 'en', 'testDeleteTermsForEntity' );
                $item->setAliases( 'fr', array( 'o', '_', 'O' ) );
 
-               $id = new ItemId( 'Q10' );
-               $item->setId( $id );
                $lookup->saveTermsOfEntity( $item );
 
                $this->assertTermExists( $lookup, 'testDeleteTermsForEntity' );
diff --git a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php 
b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
index 5d61ae5..3564193 100644
--- a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
+++ b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
@@ -118,9 +118,7 @@
        }
 
        private function getMainItem() {
-               $item = Item::newEmpty();
-               $itemId = new ItemId( 'Q5881' );
-               $item->setId( $itemId );
+               $item = new Item( new ItemId( 'Q5881' ) );
                $item->setLabel( 'en', 'Cake' );
 
                $snak = new PropertyValueSnak(

-- 
To view, visit https://gerrit.wikimedia.org/r/189741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I266665dc83dd057f6c1f35618dce2c2de256629f
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