Hoo man has submitted this change and it was merged. Change subject: Remove silly ItemContent ref from ChangeOpStatementRankTest ......................................................................
Remove silly ItemContent ref from ChangeOpStatementRankTest Change-Id: I7670c51e361ce64f1dee7b0dce58a41079fec924 --- M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php 1 file changed, 15 insertions(+), 9 deletions(-) Approvals: Hoo man: Looks good to me, approved WikidataJenkins: Verified diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php index aa26e68..33cd84d 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php @@ -7,8 +7,9 @@ use Wikibase\ChangeOp\ChangeOpStatementRank; use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Entity\Entity; +use Wikibase\DataModel\Entity\Item; +use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Snak\PropertyValueSnak; -use Wikibase\ItemContent; use Wikibase\Lib\ClaimGuidGenerator; /** @@ -24,7 +25,9 @@ class ChangeOpStatementRankTest extends \PHPUnit_Framework_TestCase { public function invalidArgumentProvider() { - $item = ItemContent::newFromArray( array( 'entity' => 'q42' ) )->getEntity(); + $item = Item::newEmpty(); + $item->setId( 42 ); + $guidGenerator = new ClaimGuidGenerator(); $validClaimGuid = $guidGenerator->newGuid( $item->getId() ); $validRank = 1; @@ -49,7 +52,7 @@ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test' ) ); $args = array(); - $item = $this->provideNewItemWithClaim( 'q123', $snak ); + $item = $this->newItemWithClaim( 'q123', $snak ); $claims = $item->getClaims(); $claim = reset( $claims ); $claimGuid = $claim->getGuid(); @@ -77,14 +80,17 @@ $this->assertEquals( $rank, $expectedRank, "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() . '$D8499CDA-25E4-4334-AG03-A3290BCD9CQP' ); + private function newItemWithClaim( $itemIdString, $snak ) { + $item = Item::newEmpty(); + $item->setId( new ItemId( $itemIdString ) ); + + $claim = $item->newClaim( $snak ); + $claim->setGuid( $itemIdString . '$D8499CDA-25E4-4334-AG03-A3290BCD9CQP' ); $claims = new Claims(); $claims->addClaim( $claim ); - $entity->setClaims( $claims ); + $item->setClaims( $claims ); - return $entity; + return $item; } + } -- To view, visit https://gerrit.wikimedia.org/r/137873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7670c51e361ce64f1dee7b0dce58a41079fec924 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