Lucas Werkmeister (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/369925 )
Change subject: Remove Snak instantiations with integer argument
......................................................................
Remove Snak instantiations with integer argument
Instantiating a Snak with an integer argument is bad style, so use the
NewStatement builder instead.
Change-Id: Ic140cff507de093bf9da5c7bcdf430bac3f142c7
---
M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
M tests/phpunit/Result/CheckResultTest.php
9 files changed, 10 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/25/369925/1
diff --git
a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
index 238cfb3..2c41cf5 100644
--- a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
+++ b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
@@ -3,7 +3,6 @@
namespace WikibaseQuality\ConstraintReport\Test\CommonsLinkChecker;
use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use DataValues\StringValue;
@@ -171,7 +170,7 @@
}
public function testCommonsLinkConstraintNoValueSnak() {
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$result = $this->commonsLinkChecker->checkConstraint(
$statement,
diff --git a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
index 449640b..20657cf 100644
--- a/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
+++ b/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
@@ -2,7 +2,6 @@
namespace WikibaseQuality\ConstraintReport\Test\ConnectionChecker;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use DataValues\StringValue;
@@ -145,7 +144,7 @@
public function testInverseConstraintNoValueSnak() {
$entity = $this->lookup->getEntity( new ItemId( 'Q1' ) );
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$constraintParameters = [
'property' => 'P1'
diff --git a/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
b/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
index a9d8012..75eb4c7 100644
--- a/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
+++ b/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
@@ -3,7 +3,6 @@
namespace WikibaseQuality\ConstraintReport\Test\ConnectionChecker;
use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use DataValues\StringValue;
@@ -104,7 +103,7 @@
}
public function testSymmetricConstraintNoValueSnak() {
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$checkResult = $this->checker->checkConstraint( $statement,
$this->getConstraintMock(), $this->getEntity() );
$this->assertCompliance( $checkResult );
diff --git
a/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
b/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
index 2b1815e..dc20ebd 100644
--- a/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
+++ b/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
@@ -3,7 +3,6 @@
namespace WikibaseQuality\ConstraintReport\Test\ConnectionChecker;
use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\Statement;
use DataValues\StringValue;
@@ -132,7 +131,7 @@
}
public function testTargetRequiredClaimConstraintNoValueSnak() {
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$constraintParameters = [
'property' => 'P2'
diff --git a/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
b/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
index e001cdc..d729b5a 100644
--- a/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
+++ b/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
@@ -4,7 +4,6 @@
use HashConfig;
use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use DataValues\StringValue;
@@ -282,7 +281,7 @@
public function testFormatConstraintNoValueSnak() {
$pattern = ".";
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$result = $this->formatChecker->checkConstraint(
$statement,
diff --git a/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
b/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
index 07c7840..e407351 100644
--- a/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
+++ b/tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
@@ -3,7 +3,6 @@
namespace WikibaseQuality\ConstraintReport\Test\RangeChecker;
use DataValues\TimeValue;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Repo\Tests\NewItem;
use Wikibase\Repo\Tests\NewStatement;
@@ -226,7 +225,7 @@
public function testDiffWithinRangeConstraintNoValueSnak() {
$entity = self::$i1970->build();
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$constraint = $this->getConstraintMock(
$this->dob0to150Parameters );
$checkResult = $this->checker->checkConstraint( $statement,
$constraint, $entity );
diff --git a/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
b/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
index bf2b3f8..737f607 100644
--- a/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
+++ b/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
@@ -4,7 +4,6 @@
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Services\Lookup\EntityRetrievingDataTypeLookup;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use DataValues\DecimalValue;
@@ -171,7 +170,7 @@
}
public function testRangeConstraintNoValueSnak() {
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$constraintParameters = [];
$checkResult = $this->checker->checkConstraint( $statement,
$this->getConstraintMock( $constraintParameters ), $this->getEntity() );
$this->assertCompliance( $checkResult );
diff --git a/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
b/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
index 8cbacd9..68b4e14 100644
--- a/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
+++ b/tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
@@ -9,7 +9,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use DataValues\StringValue;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\ValueTypeChecker;
@@ -252,7 +251,7 @@
}
public function testValueTypeConstraintNoValueSnak() {
- $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+ $statement = NewStatement::noValueFor( 'P1' )->build();
$constraintParameters = [
'relation' => 'instance',
'class' => 'Q100,Q101'
diff --git a/tests/phpunit/Result/CheckResultTest.php
b/tests/phpunit/Result/CheckResultTest.php
index 003b6e8..e2c1745 100644
--- a/tests/phpunit/Result/CheckResultTest.php
+++ b/tests/phpunit/Result/CheckResultTest.php
@@ -5,12 +5,12 @@
use LogicException;
use PHPUnit_Framework_TestCase;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use DataValues\StringValue;
+use Wikibase\Repo\Tests\NewStatement;
use WikibaseQuality\ConstraintReport\Constraint;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult;
@@ -88,7 +88,7 @@
public function testWithWrongSnakType() {
$checkResult = new CheckResult(
- $this->entityId, new Statement( new
PropertyNoValueSnak( 1 ) ), $this->constraint,
+ $this->entityId, NewStatement::noValueFor( 'P1'
)->build(), $this->constraint,
$this->parameters, $this->status, $this->message
);
$this->setExpectedException( LogicException::class );
--
To view, visit https://gerrit.wikimedia.org/r/369925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic140cff507de093bf9da5c7bcdf430bac3f142c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
