Lucas Werkmeister (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405897 )
Change subject: Don’t use NewStatement to build standalone snaks ...................................................................... Don’t use NewStatement to build standalone snaks Using NewStatement::…->build()->getMainSnak() just to construct a Snak is a cute trick, sure, but it’s actually longer than just constructing the PropertyId and Snak objects directly :) Bug: T168240 Change-Id: I67bcadf917073b7619bd90cdbfe0e3cb6a06ae1f --- M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php M tests/phpunit/Context/QualifierContextTest.php M tests/phpunit/Context/ReferenceContextTest.php 4 files changed, 43 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/97/405897/1 diff --git a/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php b/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php index 683b37d..0b71096 100644 --- a/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php +++ b/tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php @@ -2,7 +2,10 @@ namespace WikibaseQuality\ConstraintReport\Test\ValueCountChecker; +use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Reference; +use Wikibase\DataModel\Snak\PropertyNoValueSnak; +use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\Repo\Tests\NewItem; use Wikibase\Repo\Tests\NewStatement; use WikibaseQuality\ConstraintReport\Constraint; @@ -78,8 +81,8 @@ } public function testMultiValueConstraint_One_Qualifier() { - $qualifier1 = NewStatement::noValueFor( 'P1' )->build()->getMainSnak(); - $qualifier2 = NewStatement::noValueFor( 'P2' )->build()->getMainSnak(); + $qualifier1 = new PropertyNoValueSnak( new PropertyId( 'P1' ) ); + $qualifier2 = new PropertyNoValueSnak( new PropertyId( 'P2' ) ); $statement = NewStatement::someValueFor( 'P10' )->build(); $statement->getQualifiers()->addSnak( $qualifier1 ); $statement->getQualifiers()->addSnak( $qualifier2 ); @@ -94,8 +97,8 @@ } public function testMultiValueConstraint_Two_Reference() { - $referenceSnak1 = NewStatement::noValueFor( 'P1' )->build()->getMainSnak(); - $referenceSnak2 = NewStatement::someValueFor( 'P1' )->build()->getMainSnak(); + $referenceSnak1 = new PropertyNoValueSnak( new PropertyId( 'P1' ) ); + $referenceSnak2 = new PropertySomeValueSnak( new PropertyId( 'P1' ) ); $reference = new Reference( [ $referenceSnak1, $referenceSnak2 ] ); $statement = NewStatement::someValueFor( 'P10' )->build(); $statement->getReferences()->addReference( $reference ); diff --git a/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php b/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php index 6afd45d..4a0e53c 100644 --- a/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php +++ b/tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php @@ -2,7 +2,10 @@ namespace WikibaseQuality\ConstraintReport\Test\ValueCountChecker; +use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Reference; +use Wikibase\DataModel\Snak\PropertyNoValueSnak; +use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\Repo\Tests\NewItem; use Wikibase\Repo\Tests\NewStatement; use WikibaseQuality\ConstraintReport\Constraint; @@ -78,8 +81,8 @@ } public function testSingleValueConstraint_One_Qualifier() { - $qualifier1 = NewStatement::noValueFor( 'P1' )->build()->getMainSnak(); - $qualifier2 = NewStatement::noValueFor( 'P2' )->build()->getMainSnak(); + $qualifier1 = new PropertyNoValueSnak( new PropertyId( 'P1' ) ); + $qualifier2 = new PropertyNoValueSnak( new PropertyId( 'P2' ) ); $statement = NewStatement::someValueFor( 'P10' )->build(); $statement->getQualifiers()->addSnak( $qualifier1 ); $statement->getQualifiers()->addSnak( $qualifier2 ); @@ -94,8 +97,8 @@ } public function testSingleValueConstraint_Two_Reference() { - $referenceSnak1 = NewStatement::noValueFor( 'P1' )->build()->getMainSnak(); - $referenceSnak2 = NewStatement::someValueFor( 'P1' )->build()->getMainSnak(); + $referenceSnak1 = new PropertyNoValueSnak( new PropertyId( 'P1' ) ); + $referenceSnak2 = new PropertySomeValueSnak( new PropertyId( 'P1' ) ); $reference = new Reference( [ $referenceSnak1, $referenceSnak2 ] ); $statement = NewStatement::someValueFor( 'P10' )->build(); $statement->getReferences()->addReference( $reference ); diff --git a/tests/phpunit/Context/QualifierContextTest.php b/tests/phpunit/Context/QualifierContextTest.php index 3affb26..1a49919 100644 --- a/tests/phpunit/Context/QualifierContextTest.php +++ b/tests/phpunit/Context/QualifierContextTest.php @@ -4,6 +4,7 @@ use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyNoValueSnak; +use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\DataModel\Snak\SnakList; use Wikibase\DataModel\Statement\Statement; use Wikibase\Repo\Tests\NewItem; @@ -26,7 +27,7 @@ public function testGetSnak() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $context = new QualifierContext( $entity, $statement, $snak ); $this->assertSame( $snak, $context->getSnak() ); @@ -35,7 +36,7 @@ public function testGetEntity() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $context = new QualifierContext( $entity, $statement, $snak ); $this->assertSame( $entity, $context->getEntity() ); @@ -44,7 +45,7 @@ public function testGetType() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $context = new QualifierContext( $entity, $statement, $snak ); $this->assertSame( Context::TYPE_QUALIFIER, $context->getType() ); @@ -56,7 +57,7 @@ $statement = NewStatement::noValueFor( 'P1' ) ->withRank( $rank ) ->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $context = new QualifierContext( $entity, $statement, $snak ); $this->assertSame( null, $context->getSnakRank() ); @@ -65,15 +66,15 @@ public function testGetSnakStatement() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $context = new QualifierContext( $entity, $statement, $snak ); $this->assertSame( null, $context->getSnakStatement() ); } public function testGetSnakGroup() { - $qualifier1 = NewStatement::noValueFor( 'P10' )->build()->getMainSnak(); - $qualifier2 = NewStatement::someValueFor( 'P20' )->build()->getMainSnak(); + $qualifier1 = new PropertyNoValueSnak( new PropertyId( 'P10' ) ); + $qualifier2 = new PropertySomeValueSnak( new PropertyId( 'P20' ) ); $statement = new Statement( new PropertyNoValueSnak( new PropertyId( 'P1' ) ), new SnakList( [ $qualifier1, $qualifier2 ] ) @@ -100,9 +101,9 @@ $statement3 = NewStatement::noValueFor( 'P2' ) ->withGuid( 'P2$4638ca58-5128-4a1f-88a9-b379fe9f8ad9' ) ->build(); - $snak1 = NewStatement::noValueFor( 'P11' )->build()->getMainSnak(); - $snak2 = NewStatement::someValueFor( 'P11' )->build()->getMainSnak(); - $snak3 = NewStatement::noValueFor( 'P12' )->build()->getMainSnak(); + $snak1 = new PropertyNoValueSnak( new PropertyId( 'P11' ) ); + $snak2 = new PropertySomeValueSnak( new PropertyId( 'P11' ) ); + $snak3 = new PropertyNoValueSnak( new PropertyId( 'P12' ) ); $context1 = new QualifierContext( $entity, $statement1, $snak1 ); $context2 = new QualifierContext( $entity, $statement1, $snak2 ); $context3 = new QualifierContext( $entity, $statement1, $snak3 ); @@ -200,9 +201,9 @@ $statement3 = NewStatement::noValueFor( 'P2' ) ->withGuid( 'P2$4638ca58-5128-4a1f-88a9-b379fe9f8ad9' ) ->build(); - $snak1 = NewStatement::noValueFor( 'P11' )->build()->getMainSnak(); - $snak2 = NewStatement::someValueFor( 'P11' )->build()->getMainSnak(); - $snak3 = NewStatement::noValueFor( 'P12' )->build()->getMainSnak(); + $snak1 = new PropertyNoValueSnak( new PropertyId( 'P11' ) ); + $snak2 = new PropertySomeValueSnak( new PropertyId( 'P11' ) ); + $snak3 = new PropertyNoValueSnak( new PropertyId( 'P12' ) ); $context1 = new QualifierContext( $entity, $statement1, $snak1 ); $context2 = new QualifierContext( $entity, $statement1, $snak2 ); $context3 = new QualifierContext( $entity, $statement1, $snak3 ); diff --git a/tests/phpunit/Context/ReferenceContextTest.php b/tests/phpunit/Context/ReferenceContextTest.php index 2d25500..46efbd1 100644 --- a/tests/phpunit/Context/ReferenceContextTest.php +++ b/tests/phpunit/Context/ReferenceContextTest.php @@ -29,7 +29,7 @@ public function testGetSnak() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $reference = new Reference( [ $snak ] ); $statement->getReferences()->addReference( $reference ); $context = new ReferenceContext( $entity, $statement, $reference, $snak ); @@ -40,7 +40,7 @@ public function testGetEntity() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $reference = new Reference( [ $snak ] ); $statement->getReferences()->addReference( $reference ); $context = new ReferenceContext( $entity, $statement, $reference, $snak ); @@ -51,7 +51,7 @@ public function testGetType() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $reference = new Reference( [ $snak ] ); $statement->getReferences()->addReference( $reference ); $context = new ReferenceContext( $entity, $statement, $reference, $snak ); @@ -65,7 +65,7 @@ $statement = NewStatement::noValueFor( 'P1' ) ->withRank( $rank ) ->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $reference = new Reference( [ $snak ] ); $statement->getReferences()->addReference( $reference ); $context = new ReferenceContext( $entity, $statement, $reference, $snak ); @@ -76,7 +76,7 @@ public function testGetSnakStatement() { $entity = NewItem::withId( 'Q1' )->build(); $statement = NewStatement::noValueFor( 'P1' )->build(); - $snak = NewStatement::someValueFor( 'P2' )->build()->getMainSnak(); + $snak = new PropertySomeValueSnak( new PropertyId( 'P2' ) ); $reference = new Reference( [ $snak ] ); $statement->getReferences()->addReference( $reference ); $context = new ReferenceContext( $entity, $statement, $reference, $snak ); @@ -85,10 +85,10 @@ } public function testGetSnakGroup() { - $referenceSnak1 = NewStatement::noValueFor( 'P100' )->build()->getMainSnak(); - $referenceSnak2 = NewStatement::someValueFor( 'P200' )->build()->getMainSnak(); - $referenceSnak3 = NewStatement::noValueFor( 'P300' )->build()->getMainSnak(); - $referenceSnak4 = NewStatement::someValueFor( 'P400' )->build()->getMainSnak(); + $referenceSnak1 = new PropertyNoValueSnak( new PropertyId( 'P100' ) ); + $referenceSnak2 = new PropertySomeValueSnak( new PropertyId( 'P200' ) ); + $referenceSnak3 = new PropertyNoValueSnak( new PropertyId( 'P300' ) ); + $referenceSnak4 = new PropertySomeValueSnak( new PropertyId( 'P400' ) ); $reference1 = new Reference( [ $referenceSnak1, $referenceSnak2 ] ); $reference2 = new Reference( [ $referenceSnak3 ] ); $reference3 = new Reference( [ $referenceSnak4 ] ); @@ -124,9 +124,9 @@ $statement3 = NewStatement::noValueFor( 'P2' ) ->withGuid( 'P2$4638ca58-5128-4a1f-88a9-b379fe9f8ad9' ) ->build(); - $snak1 = NewStatement::noValueFor( 'P11' )->build()->getMainSnak(); - $snak2 = NewStatement::someValueFor( 'P11' )->build()->getMainSnak(); - $snak3 = NewStatement::noValueFor( 'P12' )->build()->getMainSnak(); + $snak1 = new PropertyNoValueSnak( new PropertyId( 'P11' ) ); + $snak2 = new PropertySomeValueSnak( new PropertyId( 'P11' ) ); + $snak3 = new PropertyNoValueSnak( new PropertyId( 'P12' ) ); $reference1 = new Reference( [ $snak1, $snak2, $snak3 ] ); $statement1->getReferences()->addReference( $reference1 ); $reference2 = new Reference( [ $snak2, $snak3 ] ); @@ -268,9 +268,9 @@ $statement3 = NewStatement::noValueFor( 'P2' ) ->withGuid( 'P2$4638ca58-5128-4a1f-88a9-b379fe9f8ad9' ) ->build(); - $snak1 = NewStatement::noValueFor( 'P11' )->build()->getMainSnak(); - $snak2 = NewStatement::someValueFor( 'P11' )->build()->getMainSnak(); - $snak3 = NewStatement::noValueFor( 'P12' )->build()->getMainSnak(); + $snak1 = new PropertyNoValueSnak( new PropertyId( 'P11' ) ); + $snak2 = new PropertySomeValueSnak( new PropertyId( 'P11' ) ); + $snak3 = new PropertyNoValueSnak( new PropertyId( 'P12' ) ); $reference1 = new Reference( [ $snak1, $snak2, $snak3 ] ); $statement1->getReferences()->addReference( $reference1 ); $reference2 = new Reference( [ $snak2, $snak3 ] ); -- To view, visit https://gerrit.wikimedia.org/r/405897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67bcadf917073b7619bd90cdbfe0e3cb6a06ae1f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Lucas Werkmeister (WMDE) <lucas.werkmeis...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits