JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195273
Change subject: Fix tests failing because of DataModel 2.6
......................................................................
Fix tests failing because of DataModel 2.6
Technically we did a breaking change when switching from DataModel 2.5
to 2.6. But all three issues touched by this patch qualify as bugfixes
and could have been in a DataModel 2.5.1.
Bug: T91964
Change-Id: Ia5801f0664145cfccf4402a87dea56bb8786f79d
(cherry picked from commit 689378e14ffbc5225bbddbe427588980c1e14704)
---
M lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
M repo/tests/phpunit/includes/api/SetClaimTest.php
3 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/195273/1
diff --git a/lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
b/lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
index 510adfc..da69bbe 100644
--- a/lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
+++ b/lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
@@ -44,14 +44,14 @@
$options->setIndexTags( false );
$options->addToOption( EntitySerializer::OPT_PARTS,
"sitelinks/removed" );
$siteLinks = array(
- new SiteLink( "enwiki", "", array( new ItemId(
"Q42" ) ) ),
- new SiteLink( "dewiki", "", array() ),
- new SiteLink( "itwiki", "" ),
+ new SiteLink( 'enwiki', 'A', array( new ItemId(
'Q42' ) ) ),
+ new SiteLink( 'dewiki', 'A', array() ),
+ new SiteLink( 'itwiki', 'A' ),
);
$expectedSerialization = array(
- "enwiki" => array( "site" => "enwiki", "title"
=> "", "removed" => "" ),
- "dewiki" => array( "site" => "dewiki", "title"
=> "", "removed" => "" ),
- "itwiki" => array( "site" => "itwiki", "title"
=> "", "removed" => "" ),
+ 'enwiki' => array( 'site' => 'enwiki', 'title'
=> 'A', 'removed' => '' ),
+ 'dewiki' => array( 'site' => 'dewiki', 'title'
=> 'A', 'removed' => '' ),
+ 'itwiki' => array( 'site' => 'itwiki', 'title'
=> 'A', 'removed' => '' ),
);
$validArgs[] = array( $siteLinks, $options,
$expectedSerialization );
diff --git a/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
b/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
index aa0760f..0a98265 100644
--- a/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
+++ b/repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
@@ -3,12 +3,13 @@
namespace Wikibase\Test;
use Diff\Comparer\ComparableComparer;
+use Diff\Differ\OrderedListDiffer;
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
-use Diff\Differ\OrderedListDiffer;
use Wikibase\DataModel\Claim\Claim;
+use Wikibase\DataModel\Reference;
use Wikibase\DataModel\ReferenceList;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\SnakList;
@@ -61,7 +62,7 @@
)
);
- $references = new ReferenceList( array( new
PropertyNoValueSnak( 2 ) ) );
+ $references = new ReferenceList( array( new Reference( array(
new PropertyNoValueSnak( 2 ) ) ) ) );
$withReferences = clone $noValueForP42;
$withReferences->setReferences( $references );
diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php
b/repo/tests/phpunit/includes/api/SetClaimTest.php
index 79079c3..880cb1c 100644
--- a/repo/tests/phpunit/includes/api/SetClaimTest.php
+++ b/repo/tests/phpunit/includes/api/SetClaimTest.php
@@ -103,7 +103,7 @@
foreach ( $snaks as $snak ) {
$statement = unserialize( serialize( $statement ) );
- $statement->getReferences()->addReference( new
Reference( new SnakList( $snak ) ) );
+ $statement->getReferences()->addReference( new
Reference( new SnakList( array( $snak ) ) ) );
$statement->setRank( $ranks[array_rand( $ranks )] );
$statements[] = $statement;
}
--
To view, visit https://gerrit.wikimedia.org/r/195273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5801f0664145cfccf4402a87dea56bb8786f79d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf19
Gerrit-Owner: JanZerebecki <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
