Hoo man has submitted this change and it was merged. Change subject: Remove sillt ItemContent ref in ChangeOpReferenceRemoveTest ......................................................................
Remove sillt ItemContent ref in ChangeOpReferenceRemoveTest Change-Id: I8dd02eb0e0f8eb99a2806db78761004a09d995eb --- M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php 1 file changed, 12 insertions(+), 9 deletions(-) Approvals: Hoo man: Looks good to me, approved WikidataJenkins: Verified diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php index 34bd17e..ae3dabd 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php @@ -8,10 +8,11 @@ use Wikibase\DataModel\Claim\Claims; use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Entity; +use Wikibase\DataModel\Entity\Item; +use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Reference; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\DataModel\Snak\SnakList; -use Wikibase\ItemContent; /** * @covers Wikibase\ChangeOp\ChangeOpReferenceRemove @@ -45,7 +46,7 @@ $snak = new PropertyValueSnak( 2754236, new StringValue( 'test' ) ); $args = array(); - $item = $this->provideNewItemWithClaim( 'q345', $snak ); + $item = $this->newItemWithClaim( 'q345', $snak ); $claims = $item->getClaims(); /** @var Statement $claim */ $claim = reset( $claims ); @@ -61,7 +62,7 @@ $changeOp = new ChangeOpReferenceRemove( $claimGuid, $referenceHash ); $args[ 'Removing a single reference' ] = array ( $item, $changeOp, $referenceHash ); - $item = $this->provideNewItemWithClaim( 'q346', $snak ); + $item = $this->newItemWithClaim( 'q346', $snak ); $claims = $item->getClaims(); /** @var Statement $claim */ $claim = reset( $claims ); @@ -98,15 +99,17 @@ $this->assertFalse( $references->hasReferenceHash( $referenceHash ), "Reference still exists" ); } - 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( $itemIdString, $snak ) { + $item = Item::newEmpty(); + $item->setId( new ItemId( $itemIdString ) ); + + $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; } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/137877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8dd02eb0e0f8eb99a2806db78761004a09d995eb 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