Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149232
Change subject: DM 1.0 compat: remove bad test case from ChangeOpsMergeTest
......................................................................
DM 1.0 compat: remove bad test case from ChangeOpsMergeTest
Is very tigtly bound to the internal serialization format and
uses ObjectComparer, which is package private. Needs to be
rewritten from ground up.
Change-Id: Idfef8ab95ffd626300f0eb004d07728e072e2054
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
1 file changed, 0 insertions(+), 220 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/32/149232/1
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
index cea9561..16854da 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -6,7 +6,6 @@
use Wikibase\ChangeOp\ChangeOpsMerge;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Internal\ObjectComparer;
use Wikibase\Validators\EntityConstraintProvider;
/**
@@ -129,225 +128,6 @@
$item = Item::newEmpty();
$item->setId( new Itemid( $idString ) );
return $item;
- }
-
- /**
- * @dataProvider provideData
- */
- public function testCanApply( array $fromData, array $toData,
$expectedFromData, $expectedToData, array $ignoreConflicts = array() ) {
- $from = $this->getItem( 'Q111', $fromData );
- $to = $this->getItem( 'Q222', $toData );
- $changeOps = $this->makeChangeOpsMerge(
- $from,
- $to,
- $ignoreConflicts
- );
-
- $this->assertTrue( $from->equals( new Item( $fromData ) ),
'FromItem was not filled correctly' );
- $this->assertTrue( $to->equals( new Item( $toData ) ), 'ToItem
was not filled correctly' );
-
- $changeOps->apply();
-
-
- $fromData = $from->toArray();
- $toData = $to->toArray();
-
- //Cycle through the old claims and set the guids to null (we no
longer know what they should be)
- $fromClaims = array();
- foreach( $fromData['claims'] as $claim ) {
- unset( $claim['g'] );
- $fromClaims[] = $claim;
- }
-
- $toClaims = array();
- foreach( $toData['claims'] as $claim ) {
- unset( $claim['g'] );
- $toClaims[] = $claim;
- }
-
- $fromData['claims'] = $fromClaims;
- $toData['claims'] = $toClaims;
-
- $fromData = array_intersect_key( $fromData, $expectedFromData );
- $toData = array_intersect_key( $toData, $expectedToData );
-
- $comparer = new ObjectComparer();
- $this->assertTrue( $comparer->dataEquals( $expectedFromData,
$fromData, array( 'entity' ) ) );
- $this->assertTrue( $comparer->dataEquals( $expectedToData,
$toData, array( 'entity' ) ) );
- }
-
- /**
- * @return array 1=>fromData 2=>toData 3=>expectedFromData
4=>expectedToData
- */
- public function provideData() {
- $testCases = array();
- $testCases['labelMerge'] = array(
- array( 'label' => array( 'en' => 'foo' ) ),
- array(),
- array(),
- array( 'label' => array( 'en' => 'foo' ) ),
- );
- $testCases['identicalLabelMerge'] = array(
- array( 'label' => array( 'en' => 'foo' ) ),
- array( 'label' => array( 'en' => 'foo' ) ),
- array(),
- array( 'label' => array( 'en' => 'foo' ) ),
- );
- $testCases['ignoreConflictLabelMerge'] = array(
- array( 'label' => array( 'en' => 'foo' ) ),
- array( 'label' => array( 'en' => 'bar' ) ),
- array( 'label' => array( 'en' => 'foo' ) ),
- array( 'label' => array( 'en' => 'bar' ) ),
- array( 'label' )
- );
- $testCases['descriptionMerge'] = array(
- array( 'description' => array( 'en' => 'foo' ) ),
- array(),
- array(),
- array( 'description' => array( 'en' => 'foo' ) ),
- );
- $testCases['identicalDescriptionMerge'] = array(
- array( 'description' => array( 'en' => 'foo' ) ),
- array( 'description' => array( 'en' => 'foo' ) ),
- array(),
- array( 'description' => array( 'en' => 'foo' ) ),
- );
- $testCases['ignoreConflictDescriptionMerge'] = array(
- array( 'description' => array( 'en' => 'foo' ) ),
- array( 'description' => array( 'en' => 'bar' ) ),
- array( 'description' => array( 'en' => 'foo' ) ),
- array( 'description' => array( 'en' => 'bar' ) ),
- array( 'description' )
- );
- $testCases['aliasMerge'] = array(
- array( 'aliases' => array( 'en' => array( 'foo', 'bar'
) ) ),
- array(),
- array(),
- array( 'aliases' => array( 'en' => array( 'foo', 'bar'
) ) ),
- );
- $testCases['duplicateAliasMerge'] = array(
- array( 'aliases' => array( 'en' => array( 'foo', 'bar'
) ) ),
- array( 'aliases' => array( 'en' => array( 'foo', 'bar',
'baz' ) ) ),
- array(),
- array( 'aliases' => array( 'en' => array( 'foo',
'bar', 'baz' ) ) ),
- );
- $testCases['linkMerge'] = array(
- array( 'links' => array( 'enwiki' => array( 'name' =>
'foo', 'badges' => array() ) ) ),
- array(),
- array(),
- array( 'links' => array( 'enwiki' => array( 'name' =>
'foo', 'badges' => array() ) ) ),
- );
- $testCases['ignoreConflictLinkMerge'] = array(
- array( 'links' => array( 'enwiki' => array( 'name' =>
'foo', 'badges' => array() ) ) ),
- array( 'links' => array( 'enwiki' => array( 'name' =>
'bar', 'badges' => array() ) ) ),
- array( 'links' => array( 'enwiki' => array( 'name' =>
'foo', 'badges' => array() ) ) ),
- array( 'links' => array( 'enwiki' => array( 'name' =>
'bar', 'badges' => array() ) ) ),
- array( 'sitelink' ),
- );
- $testCases['claimMerge'] = array(
- array( 'claims' => array(
- array(
- 'm' => array( 'novalue', 56 ),
- 'q' => array( ),
- 'g' =>
'Q111$D8404CDA-25E4-4334-AF13-A390BCD9C556' )
- ),
- ),
- array(),
- array(),
- array( 'claims' => array(
- array(
- 'm' => array( 'novalue', 56 ),
- 'q' => array( ) )
- ),
- ),
- );
- $testCases['claimWithQualifierMerge'] = array(
- array( 'claims' => array(
- array(
- 'm' => array( 'novalue', 56 ),
- 'q' => array( array( 'novalue', 56 )
),
- 'g' =>
'Q111$D8404CDA-25E4-4334-AF13-A3290BCD9C0F' )
- ),
- ),
- array(),
- array(),
- array( 'claims' => array(
- array(
- 'm' => array( 'novalue', 56 ),
- 'q' => array( array( 'novalue', 56 )
) )
- ),
- ),
- );
- $testCases['itemMerge'] = array(
- array(
- 'label' => array( 'en' => 'foo', 'pt' =>
'ptfoo' ),
- 'description' => array( 'en' => 'foo', 'pl' =>
'pldesc' ),
- 'aliases' => array( 'en' => array( 'foo', 'bar'
), 'de' => array( 'defoo', 'debar' ) ),
- 'links' => array( 'dewiki' => array( 'name' =>
'foo', 'badges' => array() ) ),
- 'claims' => array(
- array(
- 'm' => array( 'novalue', 88 ),
- 'q' => array( array(
'novalue', 88 ) ),
- 'g' =>
'Q111$D8404CDA-25E4-4334-AF88-A3290BCD9C0F' )
- ),
- ),
- array(),
- array(),
- array(
- 'label' => array( 'en' => 'foo', 'pt' =>
'ptfoo' ),
- 'description' => array( 'en' => 'foo', 'pl' =>
'pldesc' ),
- 'aliases' => array( 'en' => array( 'foo', 'bar'
), 'de' => array( 'defoo', 'debar' ) ),
- 'links' => array( 'dewiki' => array( 'name' =>
'foo', 'badges' => array() ) ),
- 'claims' => array(
- array(
- 'm' => array( 'novalue', 88 ),
- 'q' => array( array(
'novalue', 88 ) ) )
- ),
- ),
- );
- $testCases['ignoreConflictItemMerge'] = array(
- array(
- 'label' => array( 'en' => 'foo', 'pt' =>
'ptfoo' ),
- 'description' => array( 'en' => 'foo', 'pl' =>
'pldesc' ),
- 'aliases' => array( 'en' => array( 'foo', 'bar'
), 'de' => array( 'defoo', 'debar' ) ),
- 'links' => array(
- 'dewiki' => array( 'name' => 'foo',
'badges' => array() ),
- 'plwiki' => array( 'name' => 'bar',
'badges' => array() ),
- ),
- 'claims' => array(
- array(
- 'm' => array( 'novalue', 88 ),
- 'q' => array( array(
'novalue', 88 ) ),
- 'g' =>
'Q111$D8404CDA-25E4-4334-AF88-A3290BCD9C0F' )
- ),
- ),
- array(
- 'label' => array( 'en' => 'toLabel' ),
- 'description' => array( 'pl' => 'toLabel' ),
- 'links' => array( 'plwiki' => array( 'name' =>
'toLink', 'badges' => array() ) ),
- ),
- array(
- 'label' => array( 'en' => 'foo' ),
- 'description' => array( 'pl' => 'pldesc' ),
- 'links' => array( 'plwiki' => array( 'name' =>
'bar', 'badges' => array() ) ),
- ),
- array(
- 'label' => array( 'en' => 'toLabel', 'pt' =>
'ptfoo' ),
- 'description' => array( 'en' => 'foo', 'pl' =>
'toLabel' ),
- 'aliases' => array( 'en' => array( 'foo', 'bar'
), 'de' => array( 'defoo', 'debar' ) ),
- 'links' => array(
- 'dewiki' => array( 'name' => 'foo',
'badges' => array() ),
- 'plwiki' => array( 'name' => 'toLink',
'badges' => array() ),
- ),
- 'claims' => array(
- array(
- 'm' => array( 'novalue', 88 ),
- 'q' => array( array(
'novalue', 88 ) ) )
- ),
- ),
- array( 'label', 'description', 'sitelink' )
- );
- return $testCases;
}
public function testExceptionThrownWhenSitelinkDuplicatesDetected() {
--
To view, visit https://gerrit.wikimedia.org/r/149232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfef8ab95ffd626300f0eb004d07728e072e2054
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
