Skip to content

Commit

Permalink
Merge "Don’t use NewStatement to build standalone snaks"
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins-bot authored and Gerrit Code Review committed Jan 24, 2018
2 parents 4b82e81 + 7899312 commit 31b499b
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 36 deletions.
11 changes: 7 additions & 4 deletions tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -78,8 +81,8 @@ public function testMultiValueConstraint_TwoButOneDeprecated() {
}

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 );
Expand All @@ -94,8 +97,8 @@ public function testMultiValueConstraint_One_Qualifier() {
}

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 );
Expand Down
11 changes: 7 additions & 4 deletions tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -78,8 +81,8 @@ public function testSingleValueConstraint_TwoButOneDeprecated() {
}

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 );
Expand All @@ -94,8 +97,8 @@ public function testSingleValueConstraint_One_Qualifier() {
}

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 );
Expand Down
27 changes: 14 additions & 13 deletions tests/phpunit/Context/QualifierContextTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,7 +27,7 @@ class QualifierContextTest extends \PHPUnit_Framework_TestCase {
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() );
Expand All @@ -35,7 +36,7 @@ public function testGetSnak() {
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() );
Expand All @@ -44,7 +45,7 @@ public function testGetEntity() {
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() );
Expand All @@ -56,7 +57,7 @@ public function testGetSnakRank() {
$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() );
Expand All @@ -65,15 +66,15 @@ public function testGetSnakRank() {
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 ] )
Expand All @@ -100,9 +101,9 @@ public function testStoreCheckResultInArray() {
$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 );
Expand Down Expand Up @@ -200,9 +201,9 @@ public function testStoreCheckResultInArray_NullResult() {
$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 );
Expand Down
30 changes: 15 additions & 15 deletions tests/phpunit/Context/ReferenceContextTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ReferenceContextTest extends \PHPUnit_Framework_TestCase {
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 );
Expand All @@ -40,7 +40,7 @@ public function testGetSnak() {
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 );
Expand All @@ -51,7 +51,7 @@ public function testGetEntity() {
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 );
Expand All @@ -65,7 +65,7 @@ public function testGetSnakRank() {
$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 );
Expand All @@ -76,7 +76,7 @@ public function testGetSnakRank() {
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 );
Expand All @@ -85,10 +85,10 @@ public function testGetSnakStatement() {
}

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 ] );
Expand Down Expand Up @@ -124,9 +124,9 @@ public function testStoreCheckResultInArray() {
$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 ] );
Expand Down Expand Up @@ -268,9 +268,9 @@ public function testStoreCheckResultInArray_NullResult() {
$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 ] );
Expand Down

0 comments on commit 31b499b

Please sign in to comment.