jenkins-bot has submitted this change and it was merged.
Change subject: Replace our MockSiteStore with MediaWiki's HashSiteStore
......................................................................
Replace our MockSiteStore with MediaWiki's HashSiteStore
Bug: T91511
Change-Id: I7af91946408a213ef1026f16a4242c3eec031a25
---
M
client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
M client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
M client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
M client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
D lib/tests/phpunit/MockSiteStore.php
M lib/tests/phpunit/sites/SitesBuilderTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
M repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
M repo/tests/phpunit/includes/Diff/DiffViewTest.php
M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
M repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
M repo/tests/phpunit/maintenance/dumpRdfTest.php
25 files changed, 70 insertions(+), 155 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
b/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
index 69e102f..668417c 100644
---
a/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
+++
b/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
@@ -2,10 +2,11 @@
namespace Wikibase\Client\Tests\Hooks;
+use HashSiteStore;
+use TestSites;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\SettingsArray;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory
@@ -27,7 +28,7 @@
) );
$siteLinkLookup = new MockRepository();
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
$factory = new OtherProjectsSidebarGeneratorFactory(
$settings,
diff --git
a/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
b/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
index 0f94e46..b121789 100644
--- a/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
+++ b/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
@@ -2,14 +2,15 @@
namespace Wikibase\Client\Tests\Hooks;
+use HashSiteStore;
use MediaWikiSite;
use SiteStore;
use Title;
+use TestSites;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\SiteLinkLookup;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\Hooks\OtherProjectsSidebarGenerator
@@ -87,7 +88,7 @@
* @return SiteStore
*/
private function getSiteStore() {
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
$site = new MediaWikiSite();
$site->setGlobalId( 'enwikiquote' );
diff --git
a/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
b/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
index 4c7374f..b042b0c 100644
--- a/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Client\Tests\Hooks;
+use HashSiteStore;
use Language;
use MediaWikiSite;
use MediaWikiTestCase;
@@ -27,7 +28,6 @@
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\Hooks\ParserOutputUpdateHookHandlers
@@ -65,7 +65,7 @@
* @return SiteStore
*/
private function getSiteStore() {
- $siteStore = new MockSiteStore( array(
+ $siteStore = new HashSiteStore( array(
$this->newSite( 'wikidatawiki', 'wikidata', 'en' ),
$this->newSite( 'commonswiki', 'commons', 'en' ),
$this->newSite( 'enwiki', 'wikipedia', 'en' ),
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index 909e5ff..4fa922f 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -2,8 +2,10 @@
namespace Wikibase\Client\Tests;
+use HashSiteStore;
use ParserOutput;
use Site;
+use TestSites;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\DataModel\Entity\Item;
@@ -13,7 +15,6 @@
use Wikibase\NamespaceChecker;
use Wikibase\NoLangLinkHandler;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\LangLinkHandler
@@ -77,7 +78,7 @@
$this->mockRepo->putEntity( $item );
}
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
return new LangLinkHandler(
$this->getLanguageLinkBadgeDisplay(),
diff --git a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
index e042552..5cd5029 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
@@ -2,9 +2,9 @@
namespace Wikibase\Client\Tests;
+use HashSiteStore;
use Site;
use Wikibase\Client\OtherProjectsSitesGenerator;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\OtherProjectsSitesGenerator
@@ -91,7 +91,7 @@
}
/**
- * @return MockSiteStore
+ * @return HashSiteStore
*/
private function getSiteStoreMock() {
$sites = array();
@@ -148,7 +148,7 @@
$site->setLanguageCode( 'en' );
$sites[] = $site;
- return new MockSiteStore( $sites );
+ return new HashSiteStore( $sites );
}
}
diff --git a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 33f3503..ef49f1f 100644
--- a/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++ b/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -4,13 +4,14 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpChange;
+use HashSiteStore;
use Language;
+use TestSites;
use Title;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\ItemChange;
use Wikibase\SiteLinkCommentCreator;
-use Wikibase\Test\MockSiteStore;
use Wikibase\Test\TestChanges;
/**
@@ -29,7 +30,8 @@
* @dataProvider getEditCommentProvider
*/
public function testGetEditComment( Diff $siteLinkDiff, $action,
$expected ) {
- $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), MockSiteStore::newFromTestSites(), 'enwiki' );
+ $siteStore = new HashSiteStore( TestSites::getSites() );
+ $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), $siteStore, 'enwiki' );
$comment = $commentCreator->getEditComment( $siteLinkDiff,
$action, $this->getTitle( 'A fancy page' ) );
$this->assertEquals( $expected, $comment );
@@ -67,7 +69,8 @@
* @dataProvider needsTargetSpecificSummaryProvider
*/
public function testNeedsTargetSpecificSummary( $expected, Diff
$siteLinkDiff, Title $title ) {
- $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), MockSiteStore::newFromTestSites(), 'enwiki' );
+ $siteStore = new HashSiteStore( TestSites::getSites() );
+ $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), $siteStore, 'enwiki' );
$res = $commentCreator->needsTargetSpecificSummary(
$siteLinkDiff, $title );
$this->assertSame( $expected, $res );
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index 5084269..5b0bf01 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Client\Tests;
+use HashSiteStore;
use Language;
use Site;
use SiteStore;
@@ -9,7 +10,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\Lib\DataTypeDefinitions;
use Wikibase\SettingsArray;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\WikibaseClient
@@ -166,7 +166,7 @@
* @return SiteStore
*/
private function getSiteStore() {
- $siteStore = new MockSiteStore();
+ $siteStore = new HashSiteStore();
$site = new Site();
$site->setGlobalId( 'enwiki' );
@@ -299,7 +299,7 @@
*/
private function getWikibaseClient() {
$settings = new SettingsArray(
WikibaseClient::getDefaultInstance()->getSettings()->getArrayCopy() );
- $sites = new MockSiteStore( array() );
+ $sites = new HashSiteStore( array() );
$dataTypeDefinitions = new DataTypeDefinitions();
return new WikibaseClient( $settings, Language::factory( 'en'
), $dataTypeDefinitions, $sites );
}
diff --git a/lib/tests/phpunit/MockSiteStore.php
b/lib/tests/phpunit/MockSiteStore.php
deleted file mode 100644
index 83a1fe5..0000000
--- a/lib/tests/phpunit/MockSiteStore.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Wikibase\Test;
-
-use Site;
-use SiteList;
-use SiteStore;
-
-/**
- * @license GPL 2+
- * @author Daniel Kinzler
- */
-class MockSiteStore implements SiteStore {
-
- /**
- * @var Site[]
- */
- private $sites = array();
-
- /**
- * Returns a SiteStore object that contains TestSites::getSites().
- * The SiteStore is not not be backed by an actual database.
- *
- * @return SiteStore
- */
- public static function newFromTestSites() {
- $store = new MockSiteStore( \TestSites::getSites() );
- return $store;
- }
-
- /**
- * @param Site[] $sites
- */
- public function __construct( array $sites = array() ) {
- $this->saveSites( $sites );
- }
-
- /**
- * Saves the provided site.
- *
- * @since 1.21
- *
- * @param Site $site
- *
- * @return boolean Success indicator
- */
- public function saveSite( Site $site ) {
- $this->sites[$site->getGlobalId()] = $site;
-
- return true;
- }
-
- /**
- * Saves the provided sites.
- *
- * @since 1.21
- *
- * @param Site[] $sites
- *
- * @return boolean Success indicator
- */
- public function saveSites( array $sites ) {
- foreach ( $sites as $site ) {
- $this->saveSite( $site );
- }
-
- return true;
- }
-
- /**
- * Returns the site with provided global id, or null if there is no
such site.
- *
- * @since 1.21
- *
- * @param string $globalId
- * @param string $source either 'cache' or 'recache'.
- * If 'cache', the values are allowed (but not
obliged) to come from a cache.
- *
- * @return Site|null
- */
- public function getSite( $globalId, $source = 'cache' ) {
- if ( isset( $this->sites[$globalId] ) ) {
- return $this->sites[$globalId];
- } else {
- return null;
- }
- }
-
- /**
- * Returns a list of all sites. By default this site is
- * fetched from the cache, which can be changed to loading
- * the list from the database using the $useCache parameter.
- *
- * @since 1.21
- *
- * @param string $source either 'cache' or 'recache'.
- * If 'cache', the values are allowed (but not
obliged) to come from a cache.
- *
- * @return SiteList
- */
- public function getSites( $source = 'cache' ) {
- return new SiteList( $this->sites );
- }
-
- /**
- * Deletes all sites from the database. After calling clear(),
getSites() will return an empty
- * list and getSite() will return null until saveSite() or saveSites()
is called.
- */
- public function clear() {
- $this->sites = array();
- }
-
-}
diff --git a/lib/tests/phpunit/sites/SitesBuilderTest.php
b/lib/tests/phpunit/sites/SitesBuilderTest.php
index ebd7a82..e2c362a 100644
--- a/lib/tests/phpunit/sites/SitesBuilderTest.php
+++ b/lib/tests/phpunit/sites/SitesBuilderTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test;
+use HashSiteStore;
use MediaWikiSite;
use PHPUnit_Framework_TestCase;
use SiteList;
@@ -21,7 +22,7 @@
* @dataProvider buildSitesProvider
*/
public function testBuildSites( array $sites, $group, $wikiId, array
$expected ) {
- $store = new MockSiteStore();
+ $store = new HashSiteStore();
$validGroups = array( 'wikipedia', 'wikivoyage', 'wikiquote',
'wiktionary',
'wikibooks', 'wikisource', 'wikiversity', 'wikinews' );
diff --git
a/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
index 264f4ec..682827b 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
@@ -2,6 +2,8 @@
namespace Wikibase\Test;
+use HashSiteStore;
+use TestSites;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\Validators\EntityConstraintProvider;
@@ -52,7 +54,7 @@
$this->mockProvider->getMockGuidParser( $entityId ),
$this->mockProvider->getMockSnakValidator(),
$this->mockProvider->getMockTermValidatorFactory(),
- MockSiteStore::newFromTestSites()
+ new HashSiteStore( TestSites::getSites() )
);
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
index 77ff54c..2658e94 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -2,7 +2,9 @@
namespace Wikibase\Test;
+use HashSiteStore;
use MediaWikiTestCase;
+use TestSites;
use ValueValidators\Error;
use ValueValidators\Result;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
@@ -53,7 +55,7 @@
$siteLookup = null
) {
if ( $siteLookup === null ) {
- $siteLookup = MockSiteStore::newFromTestSites();
+ $siteLookup = new HashSiteStore( TestSites::getSites()
);
}
// A validator which makes sure that no site link is for page
'DUPE'
$siteLinkUniquenessValidator = $this->getMock(
'Wikibase\Repo\Validators\EntityValidator' );
@@ -412,7 +414,7 @@
$enwiki->expects( $this->exactly( 2 ) )
->method( 'normalizePageName' )
->will( $this->returnValue( 'Foo' ) );
- $mockSiteStore = MockSiteStore::newFromTestSites();
+ $mockSiteStore = new HashSiteStore( TestSites::getSites() );
$mockSiteStore->saveSite( $enwiki );
$changeOps = $this->makeChangeOpsMerge(
@@ -440,7 +442,7 @@
$from,
$to,
array(),
- new MockSiteStore()
+ new HashSiteStore()
);
$this->setExpectedException(
diff --git a/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
b/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
index 6d68911..a85be5a 100644
--- a/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
@@ -2,7 +2,9 @@
namespace Wikibase\Test;
+use HashSiteStore;
use PHPUnit_Framework_TestCase;
+use TestSites;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\Item;
@@ -32,6 +34,8 @@
->disableOriginalConstructor()
->getMock();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
+
$changeOpFactoryProvider = new ChangeOpFactoryProvider(
$constraintProvider,
$mockProvider->getMockGuidGenerator(),
@@ -39,13 +43,13 @@
$mockProvider->getMockGuidParser( $toItemId ),
$mockProvider->getMockSnakValidator(),
$mockProvider->getMockTermValidatorFactory(),
- MockSiteStore::newFromTestSites()
+ $siteStore
);
return new MergeChangeOpsFactory(
$constraintProvider,
$changeOpFactoryProvider,
- MockSiteStore::newFromTestSites()
+ $siteStore
);
}
diff --git a/repo/tests/phpunit/includes/Diff/DiffViewTest.php
b/repo/tests/phpunit/includes/Diff/DiffViewTest.php
index 0ae29ed..6edd108 100644
--- a/repo/tests/phpunit/includes/Diff/DiffViewTest.php
+++ b/repo/tests/phpunit/includes/Diff/DiffViewTest.php
@@ -6,7 +6,9 @@
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
+use HashSiteStore;
use PHPUnit_Framework_TestCase;
+use TestSites;
use Wikibase\Repo\Diff\DiffView;
/**
@@ -88,7 +90,7 @@
* @return DiffView
*/
private function getDiffView( array $path, Diff $diff ) {
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
$entityIdFormatter = $this->getMock(
'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' );
$entityIdFormatter->expects( $this->any() )
diff --git a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
index 90839b0..84d08b7 100644
--- a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
+++ b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
@@ -5,6 +5,7 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpRemove;
+use HashSiteStore;
use IContextSource;
use Language;
use MediaWikiTestCase;
@@ -124,7 +125,7 @@
$this->getMockContext(),
$this->getMockClaimDiffer(),
$this->getMockClaimDiffVisualizer(),
- new MockSiteStore( array( $enwiki ) ),
+ new HashSiteStore( array( $enwiki ) ),
$this->getMock(
'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' )
);
}
diff --git
a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index 7100365..6cb08c4 100644
--- a/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++ b/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -2,7 +2,9 @@
namespace Wikibase\Test\Interactors;
+use HashSiteStore;
use Status;
+use TestSites;
use User;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
@@ -15,7 +17,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Test\EntityModificationTestHelper;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Interactors\ItemMergeInteractor
@@ -113,7 +114,7 @@
$changeOpsFactory = new MergeChangeOpsFactory(
$wikibaseRepo->getEntityConstraintProvider(),
$wikibaseRepo->getChangeOpFactoryProvider(),
- MockSiteStore::newFromTestSites()
+ new HashSiteStore( TestSites::getSites() )
);
$interactor = new ItemMergeInteractor(
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index 90ccac3..e670702 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -6,6 +6,7 @@
use DerivativeContext;
use FauxRequest;
use FauxResponse;
+use HashSiteStore;
use HttpError;
use OutputPage;
use RequestContext;
@@ -108,7 +109,7 @@
new SiteList(),
$entityDataFormatProvider,
$serializerFactory,
- new MockSiteStore()
+ new HashSiteStore()
);
$entityDataFormatProvider->setFormatWhiteList(
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 503522f..ba7485e 100644
---
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -3,6 +3,7 @@
namespace Wikibase\Test;
use DataValues\Serializers\DataValueSerializer;
+use HashSiteStore;
use SiteList;
use Title;
use Wikibase\DataModel\Entity\EntityId;
@@ -113,7 +114,7 @@
new SiteList(),
new EntityDataFormatProvider(),
$serializerFactory,
- new MockSiteStore()
+ new HashSiteStore()
);
return $service;
diff --git a/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
b/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
index 2e09090..f76bf45 100644
--- a/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
+++ b/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
@@ -2,10 +2,10 @@
namespace Wikibase\Test\Repo\Api;
+use HashSiteStore;
use Language;
use Wikibase\Repo\Api\ApiHelperFactory;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Api\ApiHelperFactory
@@ -35,7 +35,7 @@
$exceptionLocalizer,
$dataTypeLookup,
$entityFactory,
- new MockSiteStore(),
+ new HashSiteStore(),
$summaryFormatter,
$entityRevisionLookup,
$editEntityFactory
diff --git a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
index 35f40ab..7a2761a 100644
--- a/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
+++ b/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
@@ -5,9 +5,10 @@
use ApiBase;
use DOMDocument;
use DOMXPath;
+use HashSiteStore;
+use TestSites;
use Wikibase\Repo\Api\SetSiteLink;
use Wikibase\Repo\SiteLinkTargetProvider;
-use Wikibase\Test\MockSiteStore;
/**
* @group API
@@ -161,7 +162,7 @@
/** @var SetSiteLink $module */
$module = $this->getApiModule(
'\Wikibase\Repo\Api\SetSiteLink', 'wbsetsitelink', $params, true );
- $siteTargetProvider = new SiteLinkTargetProvider(
MockSiteStore::newFromTestSites(), array() );
+ $siteTargetProvider = new SiteLinkTargetProvider( new
HashSiteStore( TestSites::getSites() ), array() );
$module->setServices( $siteTargetProvider );
$result = $this->executeApiModule( $module );
$actual = $this->removePageInfoAttributes( $result, $entityId );
diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 9f09848..f98113b 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test\Repo\Api;
+use HashSiteStore;
use Language;
use RequestContext;
use Status;
@@ -24,7 +25,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Test\EntityModificationTestHelper;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Api\MergeItems
@@ -147,7 +147,7 @@
$wikibaseRepo->getStatementGuidParser(),
$this->getSnakValidator(),
$this->getTermValidatorFactory(),
- new MockSiteStore( TestSites::getSites() )
+ new HashSiteStore( TestSites::getSites() )
);
$module->setServices(
diff --git a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 6e60a59..c694ebb 100644
--- a/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -5,6 +5,7 @@
use ApiResult;
use DataValues\Serializers\DataValueSerializer;
use DataValues\StringValue;
+use HashSiteStore;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -24,7 +25,6 @@
use Wikibase\EntityRevision;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Repo\Api\ResultBuilder;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Api\ResultBuilder
@@ -80,7 +80,7 @@
$result,
$mockEntityTitleLookup,
$serializerFactory,
- new MockSiteStore(),
+ new HashSiteStore(),
$mockPropertyDataTypeLookup,
$addMetaData
);
diff --git a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
index 2800ac7..3174cff 100644
--- a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
@@ -5,6 +5,7 @@
use DataValues\Serializers\DataValueSerializer;
use FauxRequest;
use FauxResponse;
+use HashSiteStore;
use HttpError;
use OutputPage;
use SiteList;
@@ -88,7 +89,7 @@
new SiteList(),
$entityDataFormatProvider,
$serializerFactory,
- new MockSiteStore()
+ new HashSiteStore()
);
$formats = array( 'json', 'rdfxml', 'ntriples' );
diff --git a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
index bdc601c..f15e5c6 100644
--- a/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
@@ -3,10 +3,12 @@
namespace Wikibase\Test;
use Exception;
+use HashSiteStore;
use PHPUnit_Framework_Error;
use RawMessage;
use SpecialPageTestBase;
use Status;
+use TestSites;
use User;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
@@ -106,7 +108,7 @@
$changeOpsFactory = new MergeChangeOpsFactory(
$wikibaseRepo->getEntityConstraintProvider(),
$wikibaseRepo->getChangeOpFactoryProvider(),
- MockSiteStore::newFromTestSites()
+ new HashSiteStore( TestSites::getSites() )
);
$exceptionLocalizer = $this->getMock(
'Wikibase\Repo\Localizer\ExceptionLocalizer' );
diff --git
a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
index af806b4..9defefc 100644
--- a/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
+++ b/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
@@ -3,6 +3,7 @@
namespace Wikibase\Test;
use DataValues\DataValue;
+use HashSiteStore;
use Language;
use SiteStore;
use SpecialPageTestBase;
@@ -109,7 +110,7 @@
* @return SiteStore
*/
protected function getSiteStore() {
- return new MockSiteStore( TestSites::getSites() );
+ return new HashSiteStore( TestSites::getSites() );
}
/**
diff --git a/repo/tests/phpunit/maintenance/dumpRdfTest.php
b/repo/tests/phpunit/maintenance/dumpRdfTest.php
index cd4a943..2e8b79a 100644
--- a/repo/tests/phpunit/maintenance/dumpRdfTest.php
+++ b/repo/tests/phpunit/maintenance/dumpRdfTest.php
@@ -3,7 +3,9 @@
namespace Wikibase\Test;
use DataValues\StringValue;
+use HashSiteStore;
use MediaWikiLangTestCase;
+use TestSites;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -131,7 +133,7 @@
$dumpScript->setServices(
$mockEntityPerPage,
new NullEntityPrefetcher(),
- MockSiteStore::newFromTestSites(),
+ new HashSiteStore( TestSites::getSites() ),
$this->getMockPropertyDataTypeLookup(),
$rdfBuilder,
$mockRepo,
--
To view, visit https://gerrit.wikimedia.org/r/263055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7af91946408a213ef1026f16a4242c3eec031a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
