Merge pull request #13 from filbertkm/entity-importer-factory

Don't access (now) private WikibaseRepo::getDataValueDeserializer method

Author: filbertkm

src/EntityImporterFactory.php

@@ -117,10 +117,7 @@ private function getImportedEntityMappingStore() {
 	private function newEntityDeserializer() {
 		$wikibaseRepo = WikibaseRepo::getDefaultInstance();
 
-		$deserializerFactory = new DeserializerFactory(
-			$wikibaseRepo->getDataValueDeserializer(),
-			$wikibaseRepo->getEntityIdParser()
-		);
+		$deserializerFactory = $wikibaseRepo->getExternalFormatDeserializerFactory();
 
 		return $deserializerFactory->newEntityDeserializer();
 	}

tests/integration/EntityImporterFactoryTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Wikibase\Import\Tests;
+
+use Monolog\Logger;
+use Monolog\Handler\NullHandler;
+use Wikibase\Import\EntityImporter;
+use Wikibase\Import\EntityImporterFactory;
+use Wikibase\Repo\WikibaseRepo;
+
+/**
+ * @group WikibaseImport
+ */
+class EntityImporterFactoryTest extends \PHPUnit_Framework_TestCase {
+
+	public function testNewEntityImporter() {
+		$entityImporterFactory = $this->newEntityImporterFactory();
+
+		$entityImporter = $entityImporterFactory->newEntityImporter();
+
+		$this->assertInstanceOf( 'Wikibase\Import\EntityImporter', $entityImporter );
+	}
+
+	public function testGetApiEntityLookup() {
+		$entityImporterFactory = $this->newEntityImporterFactory();
+
+		$apiEntityLookup = $entityImporterFactory->getApiEntityLookup();
+
+		$this->assertInstanceOf( 'Wikibase\Import\ApiEntityLookup', $apiEntityLookup );
+	}
+
+	private function newEntityImporterFactory() {
+		return new EntityImporterFactory(
+			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
+			wfGetLB(),
+			$this->newLogger(),
+			'https://www.wikidata.org/w/api.php'
+		);
+	}
+
+	private function newLogger() {
+		$logger = new Logger( 'wikibase-import' );
+		$logger->pushHandler( new NullHandler() );
+
+		return $logger;
+	}
+}