[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Don’t use NewStatement to build standalone snaks
jenkins-bot has submitted this change and it was merged. ( 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(-) Approvals: jenkins-bot: Verified Thiemo Kreuz (WMDE): Looks good to me, approved 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();
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Don’t use NewStatement to build standalone snaks
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'