Lucas Werkmeister (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374841 )
Change subject: Remove SnakSerializer use from OneOfCheckerTest
......................................................................
Remove SnakSerializer use from OneOfCheckerTest
The itemsParameter helper function gains the ability to accept snaks in
addition to item IDs, and OneOfCheckerTest uses that function instead of
serializing snaks itself.
Bug: T168240
Change-Id: I3ef49125428b7403932d521595b111f16e0a0aaa
---
M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M tests/phpunit/ConstraintParameters.php
2 files changed, 8 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/41/374841/1
diff --git a/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
b/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
index 1870a4c..83401eb 100644
--- a/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
+++ b/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
@@ -93,19 +93,12 @@
$somevalueSnak = new PropertySomeValueSnak( new PropertyId(
'P123' ) );
$novalueSnak = new PropertyNoValueSnak( new PropertyId( 'P123'
) );
- $snakSerializer =
WikibaseRepo::getDefaultInstance()->getBaseDataModelSerializerFactory()->newSnakSerializer();
- $qualifierId = $this->getDefaultConfig()->get(
'WBQualityConstraintsQualifierOfPropertyConstraintId' );
-
foreach ( [ $somevalueSnak, $novalueSnak ] as $allowed ) {
foreach ( [ $somevalueSnak, $novalueSnak ] as $present
) {
- $constraintParameters = [
- $qualifierId => [
$snakSerializer->serialize( $allowed ) ]
- ];
-
$result = $this->oneOfChecker->checkConstraint(
new FakeSnakContext( $present ),
- $this->getConstraintMock(
$constraintParameters )
+ $this->getConstraintMock(
$this->itemsParameter( [ $allowed ] ) )
);
if ( $allowed === $present ) {
$this->assertCompliance( $result );
diff --git a/tests/phpunit/ConstraintParameters.php
b/tests/phpunit/ConstraintParameters.php
index a6bbf16..b434b5e 100644
--- a/tests/phpunit/ConstraintParameters.php
+++ b/tests/phpunit/ConstraintParameters.php
@@ -167,7 +167,7 @@
}
/**
- * @param string[] $items item ID serializations
+ * @param (string|Snak)[] $items item ID serializations or snaks
* @return array
*/
public function itemsParameter( array $items ) {
@@ -175,8 +175,12 @@
return [
$qualifierParameterId => array_map(
function( $item ) use ( $qualifierParameterId )
{
- $value = new EntityIdValue( new ItemId(
$item ) );
- $snak = new PropertyValueSnak( new
PropertyId( $qualifierParameterId ), $value );
+ if ( $item instanceof Snak ) {
+ $snak = $item;
+ } else {
+ $value = new EntityIdValue( new
ItemId( $item ) );
+ $snak = new PropertyValueSnak(
new PropertyId( $qualifierParameterId ), $value );
+ }
return
$this->getSnakSerializer()->serialize( $snak );
},
$items
--
To view, visit https://gerrit.wikimedia.org/r/374841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ef49125428b7403932d521595b111f16e0a0aaa
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
