[MediaWiki-commits] [Gerrit] Remove silly ItemCOntent refs in ChangeOpReferenceTest - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has submitted this change and it was merged.

Change subject: Remove silly ItemCOntent refs in ChangeOpReferenceTest
......................................................................


Remove silly ItemCOntent refs in ChangeOpReferenceTest

Change-Id: Id88e5beb8653170917443b2ed1283e748275f546
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
1 file changed, 16 insertions(+), 13 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  WikidataJenkins: Verified



diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
index fbbf560..46aa8b5 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
@@ -16,7 +16,6 @@
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\SnakList;
-use Wikibase\ItemContent;
 use Wikibase\Lib\ClaimGuidGenerator;
 
 /**
@@ -35,7 +34,7 @@
        /**
         * @var ChangeOpTestMockProvider
         */
-       protected $mockProvider;
+       private $mockProvider;
 
        /**
         * @param string|null $name
@@ -49,7 +48,9 @@
        }
 
        public function invalidArgumentProvider() {
-               $item = ItemContent::newFromArray( array( 'entity' => 'q42' ) 
)->getEntity();
+               $item = Item::newEmpty();
+               $item->setId( 42 );
+
                $guidGenerator = new ClaimGuidGenerator();
                $validClaimGuid = $guidGenerator->newGuid( $item->getId() );
                $snaks = new SnakList();
@@ -79,7 +80,7 @@
                $snak = new PropertyValueSnak( 2754236, new StringValue( 'test' 
) );
                $args = array();
 
-               $item = $this->provideNewItemWithClaim( 'q123', $snak );
+               $item = $this->newItemWithClaim( $snak );
                $claims = $item->getClaims();
                $claim = reset( $claims );
                $claimGuid = $claim->getGuid();
@@ -113,7 +114,7 @@
                $snak = new PropertyNoValueSnak( 1 );
                $args = array();
 
-               $item = $this->provideNewItemWithClaim( 'q123', $snak );
+               $item = $this->newItemWithClaim( $snak );
                $claims = $item->getClaims();
                /** @var Statement $claim */
                $claim = reset( $claims );
@@ -173,7 +174,7 @@
                $snak = new PropertyValueSnak( 2754236, new StringValue( 'test' 
) );
                $args = array();
 
-               $item = $this->provideNewItemWithClaim( 'q123', $snak );
+               $item = $this->newItemWithClaim( $snak );
                $claims = $item->getClaims();
                /** @var Statement $claim */
                $claim = reset( $claims );
@@ -193,7 +194,7 @@
                $args[] = array ( $item, $changeOp, 
$changedReference->getHash() );
 
                // Just change a reference's index:
-               $item = $this->provideNewItemWithClaim( 'q123', $snak );
+               $item = $this->newItemWithClaim( $snak );
                $claims = $item->getClaims();
                $claim = reset( $claims );
 
@@ -237,15 +238,17 @@
                $this->assertTrue( $references->hasReferenceHash( 
$referenceHash ), "No reference with expected hash" );
        }
 
-       protected function provideNewItemWithClaim( $itemId, $snak ) {
-               $entity = ItemContent::newFromArray( array( 'entity' => $itemId 
) )->getEntity();
-               $claim = $entity->newClaim( $snak );
-               $claim->setGuid( $entity->getId()->getPrefixedId() . 
'$D8494TYA-25E4-4334-AG03-A3290BCT9CQP' );
+       private function newItemWithClaim( $snak ) {
+               $item = Item::newEmpty();
+               $item->setId( 123 );
+
+               $claim = $item->newClaim( $snak );
+               $claim->setGuid( $item->getId()->getPrefixedId() . 
'$D8494TYA-25E4-4334-AG03-A3290BCT9CQP' );
                $claims = new Claims();
                $claims->addClaim( $claim );
-               $entity->setClaims( $claims );
+               $item->setClaims( $claims );
 
-               return $entity;
+               return $item;
        }
 
        public function provideApplyInvalid() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id88e5beb8653170917443b2ed1283e748275f546
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits