Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399633 )
Change subject: Use trivial implementations instead of mocks, if possible
......................................................................
Use trivial implementations instead of mocks, if possible
Mocking everything can easily become an anti-pattern. In the cases
touched in this patch we do have very trivial (in-memory) implementations
that work just fine. This makes the test setup easier to read.
Change-Id: I7321e3f0a24c66fbc72721c70bdeb89cc2c0b2b7
---
M
client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
M
client/tests/phpunit/includes/DataAccess/ParserFunctions/StatementGroupRendererFactoryTest.php
M client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
M data-access/tests/phpunit/PerRepositoryServiceContainerTest.php
M data-access/tests/phpunit/PerRepositoryServiceWiringTest.php
M lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
M lib/tests/phpunit/Formatters/OutputFormatSnakFormatterFactoryTest.php
M lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php
M
lib/tests/phpunit/Serialization/RepositorySpecificDataValueDeserializerFactoryTest.php
M repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
M repo/tests/phpunit/includes/Api/MergeItemsTest.php
M repo/tests/phpunit/includes/Api/SearchEntitiesIntegrationTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M
repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
M repo/tests/phpunit/includes/Store/Sql/SqlEntitiesWithoutTermFinderTest.php
M repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerFactoryTest.php
M repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
17 files changed, 53 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/33/399633/1
diff --git
a/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
b/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
index 440855e..05d6090 100644
---
a/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
+++
b/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
@@ -8,9 +8,9 @@
use ValueFormatters\FormatterOptions;
use Wikibase\Client\DataAccess\DataAccessSnakFormatterFactory;
use Wikibase\Client\Usage\UsageAccumulator;
-use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\LanguageFallbackChainFactory;
@@ -49,8 +49,8 @@
return new DataAccessSnakFormatterFactory(
$this->getLanguageFallbackChainFactory(),
$this->getOutputFormatSnakFormatterFactory(
$expectedFormat ),
- $this->getMock( PropertyDataTypeLookup::class ),
- $this->getMock( EntityIdParser::class ),
+ new InMemoryDataTypeLookup(),
+ new ItemIdParser(),
$languageFallbackLabelDescriptionLookupFactory,
false
);
diff --git
a/client/tests/phpunit/includes/DataAccess/ParserFunctions/StatementGroupRendererFactoryTest.php
b/client/tests/phpunit/includes/DataAccess/ParserFunctions/StatementGroupRendererFactoryTest.php
index 59c82ff..fbbeaee 100644
---
a/client/tests/phpunit/includes/DataAccess/ParserFunctions/StatementGroupRendererFactoryTest.php
+++
b/client/tests/phpunit/includes/DataAccess/ParserFunctions/StatementGroupRendererFactoryTest.php
@@ -16,13 +16,13 @@
use Wikibase\Client\DataAccess\SnaksFinder;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\StatementListProvider;
@@ -203,8 +203,8 @@
new DataAccessSnakFormatterFactory(
$this->getLanguageFallbackChainFactory(),
$formatterFactory,
- $this->getMock( PropertyDataTypeLookup::class ),
- $this->getMock( EntityIdParser::class ),
+ new InMemoryDataTypeLookup(),
+ new ItemIdParser(),
$this->getLanguageFallbackLabelDescriptionLookupFactory()
),
$allowDataAccessInUserLanguage
@@ -231,8 +231,8 @@
new DataAccessSnakFormatterFactory(
$this->getLanguageFallbackChainFactory(),
$this->getSnakFormatterFactory(),
- $this->getMock( PropertyDataTypeLookup::class ),
- $this->getMock( EntityIdParser::class ),
+ new InMemoryDataTypeLookup(),
+ new ItemIdParser(),
$this->getLanguageFallbackLabelDescriptionLookupFactory()
),
$allowDataAccessInUserLanguage
diff --git
a/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
b/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
index 19edb02..dc8ba04 100644
--- a/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
+++ b/client/tests/phpunit/includes/Usage/UsageTrackingSnakFormatterTest.php
@@ -11,6 +11,7 @@
use Wikibase\DataModel\Entity\EntityIdValue;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
@@ -76,7 +77,7 @@
$formatter = new UsageTrackingSnakFormatter(
$mockFormatter,
$acc,
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
$this->getUsageTrackingLabelDescriptionLookup( $q1 )
);
@@ -138,7 +139,7 @@
$formatter = new UsageTrackingSnakFormatter(
$mockFormatter,
$acc,
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
$this->getUsageTrackingLabelDescriptionLookup()
);
@@ -155,7 +156,7 @@
$formatter = new UsageTrackingSnakFormatter(
$mockFormatter,
$acc,
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
$this->getUsageTrackingLabelDescriptionLookup()
);
@@ -171,7 +172,7 @@
$formatter = new UsageTrackingSnakFormatter(
$mockFormatter,
$acc,
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
$this->getUsageTrackingLabelDescriptionLookup()
);
diff --git a/data-access/tests/phpunit/PerRepositoryServiceContainerTest.php
b/data-access/tests/phpunit/PerRepositoryServiceContainerTest.php
index 1c3312f..c5cbc49 100644
--- a/data-access/tests/phpunit/PerRepositoryServiceContainerTest.php
+++ b/data-access/tests/phpunit/PerRepositoryServiceContainerTest.php
@@ -7,10 +7,10 @@
use Wikibase\DataAccess\DataAccessSettings;
use Wikibase\DataAccess\GenericServices;
use Wikibase\DataAccess\PerRepositoryServiceContainer;
-use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityRedirect;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Services\EntityId\PrefixMappingEntityIdParser;
use Wikibase\Lib\Store\EntityRevision;
use Wikibase\Lib\EntityIdComposer;
@@ -31,13 +31,10 @@
* @return PerRepositoryServiceContainer
*/
private function newRepositoryServiceContainer() {
- /** @var EntityIdParser $idParser */
- $idParser = $this->getMock( EntityIdParser::class );
-
return new PerRepositoryServiceContainer(
'foowiki',
'foo',
- new PrefixMappingEntityIdParser( [ '' => 'foo' ],
$idParser ),
+ new PrefixMappingEntityIdParser( [ '' => 'foo' ], new
ItemIdParser() ),
new EntityIdComposer( [] ),
new DataValueDeserializer( [] ),
new GenericServices( new EntityTypeDefinitions( [] ),
[] ),
diff --git a/data-access/tests/phpunit/PerRepositoryServiceWiringTest.php
b/data-access/tests/phpunit/PerRepositoryServiceWiringTest.php
index 0656eba..2523c0b 100644
--- a/data-access/tests/phpunit/PerRepositoryServiceWiringTest.php
+++ b/data-access/tests/phpunit/PerRepositoryServiceWiringTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataAccess\DataAccessSettings;
use Wikibase\DataAccess\GenericServices;
use Wikibase\DataAccess\PerRepositoryServiceContainer;
-use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\EntityId\PrefixMappingEntityIdParser;
use Wikibase\DataModel\Services\Term\TermBuffer;
@@ -35,7 +35,7 @@
$container = new PerRepositoryServiceContainer(
false,
'',
- new PrefixMappingEntityIdParser( [ '' => '' ],
$this->getMock( EntityIdParser::class ) ),
+ new PrefixMappingEntityIdParser( [ '' => '' ], new
ItemIdParser() ),
new EntityIdComposer( [] ),
new DataValueDeserializer( [] ),
new GenericServices( new EntityTypeDefinitions( [] ),
[] ),
diff --git
a/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
b/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
index 6307ef0..2deb407 100644
--- a/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/BinaryOptionDispatchingSnakFormatterTest.php
@@ -5,6 +5,7 @@
use PHPUnit_Framework_TestCase;
use DataValues\StringValue;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
@@ -79,7 +80,7 @@
public function testGetFormat() {
$formatter = new BinaryOptionDispatchingSnakFormatter(
'text/whatever',
- $this->getMock( PropertyDataTypeLookup::class ),
+ new InMemoryDataTypeLookup(),
$this->getMock( SnakFormatter::class ),
$this->getMock( SnakFormatter::class ),
[]
diff --git
a/lib/tests/phpunit/Formatters/OutputFormatSnakFormatterFactoryTest.php
b/lib/tests/phpunit/Formatters/OutputFormatSnakFormatterFactoryTest.php
index 464defe..e4dd217 100644
--- a/lib/tests/phpunit/Formatters/OutputFormatSnakFormatterFactoryTest.php
+++ b/lib/tests/phpunit/Formatters/OutputFormatSnakFormatterFactoryTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Lib\Tests\Formatters;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\Lib\DataTypeFactory;
use DataValues\DataValue;
use DataValues\StringValue;
@@ -200,7 +201,7 @@
$factory = new OutputFormatSnakFormatterFactory(
[],
$valueFormatterFactory,
- $this->getMock( PropertyDataTypeLookup::class ),
+ new InMemoryDataTypeLookup(),
new DataTypeFactory( [] )
);
$factory->getSnakFormatter( SnakFormatter::FORMAT_PLAIN, new
FormatterOptions() );
diff --git a/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php
b/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php
index 005d3d5..94cb966 100644
--- a/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/PropertyValueSnakFormatterTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Lib\Tests\Formatters;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\Lib\DataType;
use Wikibase\Lib\DataTypeFactory;
use DataValues\StringValue;
@@ -13,7 +14,6 @@
use ValueFormatters\FormattingException;
use ValueFormatters\StringFormatter;
use ValueFormatters\ValueFormatter;
-use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException;
use Wikibase\DataModel\Snak\PropertyValueSnak;
@@ -55,27 +55,6 @@
/**
* @param string $dataType
- *
- * @return PropertyDataTypeLookup
- */
- private function getMockDataTypeLookup( $dataType ) {
- if ( $dataType !== '' ) {
- $getDataTypeIdForPropertyResult = $this->returnValue(
$dataType );
- } else {
- $getDataTypeIdForPropertyResult = $this->throwException(
- new PropertyDataTypeLookupException( new
PropertyId( 'P666' ) ) );
- }
-
- $typeLookup = $this->getMock( PropertyDataTypeLookup::class );
- $typeLookup->expects( $this->atLeastOnce() )
- ->method( 'getDataTypeIdForProperty' )
- ->will( $getDataTypeIdForPropertyResult );
-
- return $typeLookup;
- }
-
- /**
- * @param string $dataType
* @param string $valueType
*
* @return DataTypeFactory
@@ -103,21 +82,23 @@
* @dataProvider formatSnakProvider
*/
public function testFormatSnak(
- $snak, $dataType, $valueType, $targetFormat, ValueFormatter
$formatter,
- $expected, $expectedException = null
+ $snak,
+ $dataType,
+ $valueType,
+ $targetFormat,
+ ValueFormatter $formatter,
+ $expected,
+ $expectedException = null
) {
if ( $expectedException !== null ) {
$this->setExpectedException( $expectedException );
}
- $typeLookup = $this->getMockDataTypeLookup( $dataType );
- $typeFactory = $this->getMockDataTypeFactory( $dataType,
$valueType );
-
$formatter = new PropertyValueSnakFormatter(
$targetFormat,
$formatter,
- $typeLookup,
- $typeFactory
+ new InMemoryDataTypeLookup(),
+ $this->getMockDataTypeFactory( $dataType, $valueType )
);
$actual = $formatter->formatSnak( $snak );
diff --git
a/lib/tests/phpunit/Serialization/RepositorySpecificDataValueDeserializerFactoryTest.php
b/lib/tests/phpunit/Serialization/RepositorySpecificDataValueDeserializerFactoryTest.php
index e6bb796..91635d0 100644
---
a/lib/tests/phpunit/Serialization/RepositorySpecificDataValueDeserializerFactoryTest.php
+++
b/lib/tests/phpunit/Serialization/RepositorySpecificDataValueDeserializerFactoryTest.php
@@ -4,7 +4,6 @@
use DataValues\Deserializers\DataValueDeserializer;
use Deserializers\Exceptions\DeserializationException;
-use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Services\EntityId\PrefixMappingEntityIdParserFactory;
@@ -20,10 +19,7 @@
class RepositorySpecificDataValueDeserializerFactoryTest extends
\PHPUnit_Framework_TestCase {
private function getDummyIdParserFactory() {
- return new PrefixMappingEntityIdParserFactory(
- $this->getMock( EntityIdParser::class ),
- []
- );
+ return new PrefixMappingEntityIdParserFactory( new
ItemIdParser(), [] );
}
public function
testGetDeserializerReturnsInstanceOfDataValueDeserializer() {
diff --git a/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
b/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
index 5dd2a2e..69f6399 100644
--- a/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
+++ b/repo/tests/phpunit/includes/Api/ApiHelperFactoryTest.php
@@ -9,7 +9,7 @@
use Serializers\Serializer;
use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\SerializerFactory;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\EditEntityFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
@@ -48,7 +48,7 @@
return new ApiHelperFactory(
$this->getMock( EntityTitleLookup::class ),
$this->getMock( ExceptionLocalizer::class ),
- $this->getMock( PropertyDataTypeLookup::class ),
+ new InMemoryDataTypeLookup(),
new HashSiteStore(),
$summaryFormatter,
$this->getMock( EntityRevisionLookup::class ),
diff --git a/repo/tests/phpunit/includes/Api/MergeItemsTest.php
b/repo/tests/phpunit/includes/Api/MergeItemsTest.php
index 9ba024d..84cc1e7 100644
--- a/repo/tests/phpunit/includes/Api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/Api/MergeItemsTest.php
@@ -19,7 +19,7 @@
use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Serializers\ItemSerializer;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\DataModel\Services\Statement\GuidGenerator;
use Wikibase\LabelDescriptionDuplicateDetector;
use Wikibase\Repo\Store\EntityTitleStoreLookup;
@@ -181,7 +181,7 @@
->getMock(),
$this->getMockBuilder( ItemSerializer::class
)->disableOriginalConstructor()->getMock(),
$this->getMock( SiteLookup::class ),
- $this->getMock( PropertyDataTypeLookup::class )
+ new InMemoryDataTypeLookup()
);
$errorReporter = new ApiErrorReporter(
$main,
diff --git a/repo/tests/phpunit/includes/Api/SearchEntitiesIntegrationTest.php
b/repo/tests/phpunit/includes/Api/SearchEntitiesIntegrationTest.php
index 018cacc..53be38e 100644
--- a/repo/tests/phpunit/includes/Api/SearchEntitiesIntegrationTest.php
+++ b/repo/tests/phpunit/includes/Api/SearchEntitiesIntegrationTest.php
@@ -13,14 +13,14 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Term\Term;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\Interactors\ConfigurableTermSearchInteractor;
use Wikibase\Lib\Interactors\TermSearchResult;
+use Wikibase\Lib\StaticContentLanguages;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Repo\Api\EntitySearchHelper;
use Wikibase\Repo\Api\EntitySearchTermIndex;
@@ -212,8 +212,8 @@
'',
$entitySearchTermIndex,
$this->newEntityTitleLookup(),
- $this->getMock( PropertyDataTypeLookup::class ),
- $this->getMock( ContentLanguages::class ),
+ new InMemoryDataTypeLookup(),
+ new StaticContentLanguages( [] ),
[ 'item', 'property' ],
[ '' => 'conceptBaseUri:' ]
);
diff --git
a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index 8ba6ce8..fa95fca 100644
--- a/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -15,6 +15,7 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SerializerFactory;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Rdf\RdfVocabulary;
@@ -102,7 +103,7 @@
$service = new EntityDataSerializationService(
$mockRepository,
$titleLookup,
- $this->getMock( PropertyDataTypeLookup::class ),
+ new InMemoryDataTypeLookup(),
$rdfBuilder,
$wikibaseRepo->getEntityRdfBuilderFactory(),
new SiteList(),
diff --git
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
index e312c69..cb1fb06 100644
---
a/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
+++
b/repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
@@ -4,7 +4,7 @@
use Serializers\Serializer;
use Wikibase\DataModel\Entity\ItemIdParser;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityTitleLookup;
@@ -45,7 +45,7 @@
$this->getMockBuilder( TemplateFactory::class )
->disableOriginalConstructor()->getMock(),
$this->getMock( EntityDataFormatProvider::class ),
- $this->getMock( PropertyDataTypeLookup::class ),
+ new InMemoryDataTypeLookup(),
new ItemIdParser(),
$this->getMock( Serializer::class )
);
diff --git
a/repo/tests/phpunit/includes/Store/Sql/SqlEntitiesWithoutTermFinderTest.php
b/repo/tests/phpunit/includes/Store/Sql/SqlEntitiesWithoutTermFinderTest.php
index 83c6bce..573a747 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlEntitiesWithoutTermFinderTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlEntitiesWithoutTermFinderTest.php
@@ -4,9 +4,9 @@
use InvalidArgumentException;
use MediaWikiTestCase;
-use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\Lib\Store\EntityNamespaceLookup;
@@ -226,7 +226,7 @@
$this->setExpectedException( InvalidArgumentException::class );
$finder = new SqlEntitiesWithoutTermFinder(
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
new EntityNamespaceLookup( [] ),
[
Item::ENTITY_TYPE => 'Q',
@@ -244,7 +244,7 @@
$this->setExpectedException( InvalidArgumentException::class );
$finder = new SqlEntitiesWithoutTermFinder(
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
new EntityNamespaceLookup( [] ),
[
Item::ENTITY_TYPE => 'Q',
diff --git
a/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerFactoryTest.php
b/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerFactoryTest.php
index d9eb91b..b0352e4 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerFactoryTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlEntityIdPagerFactoryTest.php
@@ -3,7 +3,7 @@
namespace Wikibase\Repo\Tests\Store\Sql;
use PHPUnit_Framework_TestCase;
-use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\Lib\Store\EntityNamespaceLookup;
use Wikibase\Repo\Store\Sql\SqlEntityIdPager;
use Wikibase\Repo\Store\Sql\SqlEntityIdPagerFactory;
@@ -22,7 +22,7 @@
public function testNewSqlEntityIdPager() {
$factory = new SqlEntityIdPagerFactory(
new EntityNamespaceLookup( [] ),
- $this->getMock( EntityIdParser::class )
+ new ItemIdParser()
);
$pager = $factory->newSqlEntityIdPager();
diff --git a/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
b/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
index 858ef2d..0e41890 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
@@ -4,7 +4,7 @@
use MediaWikiTestCase;
use Wikibase\DataAccess\WikibaseServices;
-use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\ItemIdParser;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\DataModel\Services\Lookup\EntityRedirectLookup;
use Wikibase\IdGenerator;
@@ -68,7 +68,7 @@
return new SqlStore(
$changeFactory,
- $this->getMock( EntityIdParser::class ),
+ new ItemIdParser(),
$entityIdComposer,
$this->getMock( EntityIdLookup::class ),
$this->getMock( EntityTitleStoreLookup::class ),
--
To view, visit https://gerrit.wikimedia.org/r/399633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7321e3f0a24c66fbc72721c70bdeb89cc2c0b2b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
