Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67384
Change subject: Improvements to ItemTest
......................................................................
Improvements to ItemTest
Change-Id: I405b386038b8f28140366485000be66f50b6c85c
---
M DataModel/tests/phpunit/Entity/ItemTest.php
1 file changed, 28 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/84/67384/1
diff --git a/DataModel/tests/phpunit/Entity/ItemTest.php
b/DataModel/tests/phpunit/Entity/ItemTest.php
index 4e867ac..6f4d6e6 100644
--- a/DataModel/tests/phpunit/Entity/ItemTest.php
+++ b/DataModel/tests/phpunit/Entity/ItemTest.php
@@ -2,12 +2,18 @@
namespace Wikibase\Test;
+use Diff\Diff;
+use Diff\DiffOpAdd;
+use Diff\DiffOpChange;
+use Diff\DiffOpRemove;
use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\EntityId;
use Wikibase\Item;
+use Wikibase\ItemDiff;
use Wikibase\SiteLink;
/**
- * Tests for the Wikibase\Item class.
+ * @covers Wikibase\Item
* Some tests for this class are located in ItemMultilangTextsTest,
* ItemNewEmptyTest and ItemNewFromArrayTest.
*
@@ -88,11 +94,7 @@
*/
foreach ( TestItems::getItems() as $item ) {
// getId()
- $this->assertTrue( is_null( $item->getId() ) ||
$item->getId() instanceof \Wikibase\EntityId );
- // getPrefixedId()
- $this->assertTrue(
- $item->getId() === null ?
$item->getPrefixedId() === null : is_string( $item->getPrefixedId() )
- );
+ $this->assertTrue( is_null( $item->getId() ) ||
$item->getId() instanceof EntityId );
}
}
@@ -163,7 +165,7 @@
*/
$item = $item->copy();
$item->addClaim( new \Wikibase\Statement(
- new \Wikibase\PropertyNoValueSnak( new
\Wikibase\EntityId( \Wikibase\Property::ENTITY_TYPE, 42 ) )
+ new \Wikibase\PropertyNoValueSnak( new EntityId(
\Wikibase\Property::ENTITY_TYPE, 42 ) )
) );
$items[] = $item;
@@ -176,11 +178,11 @@
// Addition of a sitelink
$entity0 = $this->getNewEmpty();
$entity1 = $this->getNewEmpty();
- $entity1->addSiteLink( SiteLink::newFromText( 'enwiki',
'Berlin' ) );
+ $entity1->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Berlin' ) );
$expected = new \Wikibase\EntityDiff( array(
- 'links' => new \Diff\Diff( array(
- 'enwiki' => new \Diff\DiffOpAdd( 'Berlin' ),
+ 'links' => new Diff( array(
+ 'enwiki' => new DiffOpAdd( 'Berlin' ),
), true ),
) );
@@ -189,12 +191,12 @@
// Removal of a sitelink
$entity0 = $this->getNewEmpty();
- $entity0->addSiteLink( SiteLink::newFromText( 'enwiki',
'Berlin' ) );
+ $entity0->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Berlin' ) );
$entity1 = $this->getNewEmpty();
$expected = new \Wikibase\EntityDiff( array(
- 'links' => new \Diff\Diff( array(
- 'enwiki' => new \Diff\DiffOpRemove( 'Berlin' ),
+ 'links' => new Diff( array(
+ 'enwiki' => new DiffOpRemove( 'Berlin' ),
), true ),
) );
@@ -203,13 +205,13 @@
// Modification of a sitelink
$entity0 = $this->getNewEmpty();
- $entity0->addSiteLink( SiteLink::newFromText( 'enwiki',
'Berlin' ) );
+ $entity0->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Berlin' ) );
$entity1 = $this->getNewEmpty();
- $entity1->addSiteLink( SiteLink::newFromText( 'enwiki',
'Foobar' ) );
+ $entity1->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Foobar' ) );
$expected = new \Wikibase\EntityDiff( array(
- 'links' => new \Diff\Diff( array(
- 'enwiki' => new \Diff\DiffOpChange( 'Berlin',
'Foobar' ),
+ 'links' => new Diff( array(
+ 'enwiki' => new DiffOpChange( 'Berlin',
'Foobar' ),
), true ),
) );
@@ -223,18 +225,18 @@
// Addition of a sitelink
$source = $this->getNewEmpty();
- $patch = new \Wikibase\ItemDiff( array(
- 'links' => new \Diff\Diff( array( 'enwiki' => new
\Diff\DiffOpAdd( 'Berlin' ) ), true )
+ $patch = new ItemDiff( array(
+ 'links' => new Diff( array( 'enwiki' => new DiffOpAdd(
'Berlin' ) ), true )
) );
$expected = clone $source;
- $expected->addSiteLink( SiteLink::newFromText( 'enwiki',
'Berlin' ) );
+ $expected->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Berlin' ) );
$argLists[] = array( $source, $patch, $expected );
// Retaining of a sitelink
$source = clone $expected;
- $patch = new \Wikibase\ItemDiff();
+ $patch = new ItemDiff();
$expected = clone $source;
$argLists[] = array( $source, $patch, $expected );
@@ -242,19 +244,19 @@
// Modification of a sitelink
$source = clone $expected;
- $patch = new \Wikibase\ItemDiff( array(
- 'links' => new \Diff\Diff( array( 'enwiki' => new
\Diff\DiffOpChange( 'Berlin', 'Foobar' ) ), true )
+ $patch = new ItemDiff( array(
+ 'links' => new Diff( array( 'enwiki' => new
DiffOpChange( 'Berlin', 'Foobar' ) ), true )
) );
$expected = $this->getNewEmpty();
- $expected->addSiteLink( SiteLink::newFromText( 'enwiki',
'Foobar' ) );
+ $expected->addSimpleSiteLink( new SimpleSiteLink( 'enwiki',
'Foobar' ) );
$argLists[] = array( $source, $patch, $expected );
// Removal of a sitelink
$source = clone $expected;
- $patch = new \Wikibase\ItemDiff( array(
- 'links' => new \Diff\Diff( array( 'enwiki' => new
\Diff\DiffOpRemove( 'Foobar' ) ), true )
+ $patch = new ItemDiff( array(
+ 'links' => new Diff( array( 'enwiki' => new
DiffOpRemove( 'Foobar' ) ), true )
) );
$expected = $this->getNewEmpty();
--
To view, visit https://gerrit.wikimedia.org/r/67384
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I405b386038b8f28140366485000be66f50b6c85c
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
