Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67386
Change subject: Improvements to MockRepositoryTest
......................................................................
Improvements to MockRepositoryTest
Change-Id: I81dbc02d7c8aabe82266e4c873b7141947b290ed
---
M lib/tests/phpunit/MockRepositoryTest.php
1 file changed, 28 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/67386/1
diff --git a/lib/tests/phpunit/MockRepositoryTest.php
b/lib/tests/phpunit/MockRepositoryTest.php
index ba83ea1..d984dd1 100644
--- a/lib/tests/phpunit/MockRepositoryTest.php
+++ b/lib/tests/phpunit/MockRepositoryTest.php
@@ -1,11 +1,13 @@
<?php
namespace Wikibase\Test;
-use \Wikibase\Entity;
-use \Wikibase\EntityId;
-use \Wikibase\Item;
-use \Wikibase\Property;
-use \Wikibase\SiteLink;
+
+use Wikibase\DataModel\SimpleSiteLink;
+use Wikibase\Entity;
+use Wikibase\EntityId;
+use Wikibase\Item;
+use Wikibase\Property;
+use Wikibase\SiteLink;
/**
* Tests for the MockRepository class.
@@ -89,7 +91,7 @@
public function testGetItemIdForLink() {
$item = new Item( array() );
- $item->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
+ $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' )
);
// test item lookup
$this->repo->putEntity( $item );
@@ -99,7 +101,7 @@
$this->assertEquals( false, $this->repo->getItemIdForLink(
'xywiki', 'Foo' ) );
// test lookup after item modification
- $item->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Bar' ), 'set' );
+ $item->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Bar'
), 'set' );
$this->repo->putEntity( $item );
$this->assertEquals( false, $this->repo->getItemIdForLink(
'enwiki', 'Foo' ) );
@@ -117,36 +119,36 @@
// #0: same link ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'dewiki',
'Foo' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Foo' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
- $b->addSiteLink( \Wikibase\SiteLink::newFromText( 'dewiki',
'Bar' ) );
+ $b->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $b->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
$cases[] = array( $a, $b, array( array( 'enwiki', 'Foo', 1 ) )
);
// #1: same site ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Bar' ) );
+ $b->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ) );
$cases[] = array( $a, $b, array() );
// #2: same page ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSiteLink( \Wikibase\SiteLink::newFromText( 'dewiki',
'Foo' ) );
+ $b->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Foo' ) );
$cases[] = array( $a, $b, array() );
// #3: same item ---------
$a = new Item( array( 'id' => 1 ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
$cases[] = array( $a, $a, array() );
@@ -167,12 +169,12 @@
$cases = array();
$a = new Item( array( 'id' => 1 ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Foo' ) );
- $a->addSiteLink( \Wikibase\SiteLink::newFromText( 'dewiki',
'Bar' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' ) );
+ $a->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Bar' ) );
$b = new Item( array( 'id' => 2 ) );
- $b->addSiteLink( \Wikibase\SiteLink::newFromText( 'enwiki',
'Bar' ) );
- $b->addSiteLink( \Wikibase\SiteLink::newFromText( 'dewiki',
'Xoo' ) );
+ $b->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Bar' ) );
+ $b->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Xoo' ) );
$items = array( $a, $b );
@@ -432,8 +434,8 @@
$one = new Item( array( 'id' => 1 ) );
$prop = new Property( array( 'id' => 101 ) );
- $one->addSiteLink( SiteLink::newFromText( 'dewiki', 'Xoo' ) );
- $one->addSiteLink( SiteLink::newFromText( 'enwiki', 'Foo' ) );
+ $one->addSimpleSiteLink( new SimpleSiteLink( 'dewiki', 'Xoo' )
);
+ $one->addSimpleSiteLink( new SimpleSiteLink( 'enwiki', 'Foo' )
);
$this->repo->putEntity( $one );
$this->repo->putEntity( $prop );
@@ -450,8 +452,8 @@
// check links of unknown id
$links = SiteLink::siteLinksToArray(
- $this->repo->getSiteLinksForItem(
- EntityId::newFromPrefixedId( "q123" ) ) );
+ $this->repo->getSiteLinksForItem( new EntityId( 'item',
123 ) )
+ );
$this->assertArrayEquals( array(), $links );
@@ -460,6 +462,7 @@
$this->repo->getSiteLinksForItem(
$prop->getId() ) );
- $this->assertArrayEquals( array(), $links );
+ $this->assertEmpty( $links );
}
+
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/67386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81dbc02d7c8aabe82266e4c873b7141947b290ed
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
