Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/101664
Change subject: Improve test coverage for WikibaseClient factory
......................................................................
Improve test coverage for WikibaseClient factory
Change-Id: I17a9377c460e11d13ab8a1a45fa18c70ed0fa2e6
---
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/WikibaseClientTest.php
2 files changed, 85 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/64/101664/1
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 546ec90..0dc59a7 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -62,12 +62,24 @@
*/
protected $contentLanguage;
+ /**
+ * @var DataTypeFactory
+ */
protected $dataTypeFactory = null;
- protected $entityIdParser = null;
+
+ /**
+ * @var LanguageFallbackChainFactory
+ */
protected $languageFallbackChainFactory = null;
+ /**
+ * @var boolean
+ */
protected $isInTestMode;
+ /**
+ * @var ClientStore[]
+ */
private $storeInstances = array();
/**
@@ -76,7 +88,7 @@
private $stringNormalizer;
/**
- * @var \Site
+ * @var Site
*/
private $site = null;
@@ -208,7 +220,7 @@
*
* @return SnakFormatter
*/
- public function newSnakFormatter( $format =
SnakFormatter::FORMAT_PLAIN, FormatterOptions $options = null ) {
+ public function newSnakFormatter( $format =
SnakFormatter::FORMAT_PLAIN, FormatterOptions $options ) {
return $this->getSnakFormatterFactory()->getSnakFormatter(
$format, $options );
}
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index e52b46b..c12de2b 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -5,7 +5,9 @@
use Language;
use MediaWikiSite;
use SiteStore;
+use ValueFormatters\FormatterOptions;
use Wikibase\Client\WikibaseClient;
+use Wikibase\Lib\SnakFormatter;
use Wikibase\Settings;
use Wikibase\SettingsArray;
@@ -25,23 +27,6 @@
*/
class WikibaseClientTest extends \PHPUnit_Framework_TestCase {
- /**
- * @return WikibaseClient
- */
- private function getDefaultInstance() {
- return WikibaseClient::getDefaultInstance();
- }
-
- public function testGetSettingsReturnType() {
- $returnValue = $this->getDefaultInstance()->getSettings();
- $this->assertInstanceOf( 'Wikibase\SettingsArray', $returnValue
);
- }
-
- public function testGetStoreReturnType() {
- $returnValue = $this->getDefaultInstance()->getStore();
- $this->assertInstanceOf( 'Wikibase\ClientStore', $returnValue );
- }
-
public function testGetDataTypeFactoryReturnType() {
$returnValue =
$this->getDefaultInstance()->getDataTypeFactory();
$this->assertInstanceOf( 'DataTypes\DataTypeFactory',
$returnValue );
@@ -52,25 +37,62 @@
$this->assertInstanceOf( 'Wikibase\Lib\EntityIdParser',
$returnValue );
}
+ public function testGetEntityIdFormatterReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getEntityIdFormatter();
+ $this->assertInstanceOf( 'Wikibase\Lib\EntityIdFormatter',
$returnValue );
+ }
+
public function testEntityIdLabelFormatterReturnType() {
$returnValue =
$this->getDefaultInstance()->newEntityIdLabelFormatter( 'en' );
$this->assertInstanceOf( 'Wikibase\Lib\EntityIdLabelFormatter',
$returnValue );
}
- public function testGetSnakFormatterFactory() {
- $returnValue =
$this->getDefaultInstance()->getSnakFormatterFactory();
- $this->assertInstanceOf(
'Wikibase\Lib\OutputFormatSnakFormatterFactory', $returnValue );
+ public function testGetPropertyDataTypeLookupReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getPropertyDataTypeLookup();
+ $this->assertInstanceOf( 'Wikibase\Lib\PropertyDataTypeLookup',
$returnValue );
}
- public function testGetValueFormatterFactory() {
- $returnValue =
$this->getDefaultInstance()->getValueFormatterFactory();
- $this->assertInstanceOf(
'Wikibase\Lib\OutputFormatValueFormatterFactory', $returnValue );
+ public function testNewSnakFormatterReturnType() {
+ $returnValue = $this->getDefaultInstance()->newSnakFormatter(
+ SnakFormatter::FORMAT_PLAIN,
+ new FormatterOptions()
+ );
+ $this->assertInstanceOf( 'Wikibase\Lib\SnakFormatter',
$returnValue );
}
- public function testGetDefaultInstance() {
- $this->assertSame(
- WikibaseClient::getDefaultInstance(),
- WikibaseClient::getDefaultInstance() );
+ public function testGetStringNormalizerReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getStringNormalizer();
+ $this->assertInstanceOf( 'Wikibase\StringNormalizer',
$returnValue );
+ }
+
+ public function testNewRepoLinkerReturnType() {
+ $returnValue = $this->getDefaultInstance()->newRepoLinker();
+ $this->assertInstanceOf( 'Wikibase\RepoLinker', $returnValue );
+ }
+
+ public function testGetLanguageFallbackChainFactoryReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getLanguageFallbackChainFactory();
+ $this->assertInstanceOf(
'Wikibase\LanguageFallbackChainFactory', $returnValue );
+ }
+
+ public function testGetStoreReturnType() {
+ $returnValue = $this->getDefaultInstance()->getStore();
+ $this->assertInstanceOf( 'Wikibase\ClientStore', $returnValue );
+ }
+
+ public function testGetContentLanguageReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getContentLanguage();
+ $this->assertInstanceOf( 'Language', $returnValue );
+ }
+
+ public function testGetSettingsReturnType() {
+ $returnValue = $this->getDefaultInstance()->getSettings();
+ $this->assertInstanceOf( 'Wikibase\SettingsArray', $returnValue
);
+ }
+
+ public function testGetSiteReturnType() {
+ $returnValue = $this->getDefaultInstance()->getSite();
+ $this->assertInstanceOf( 'Site', $returnValue );
}
/**
@@ -137,8 +159,26 @@
);
}
- public function testGetSite() {
- $client = $this->getDefaultInstance();
- $this->assertNotNull( $client->getSite() );
+ public function testGetSnakFormatterFactoryReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getSnakFormatterFactory();
+ $this->assertInstanceOf(
'Wikibase\Lib\OutputFormatSnakFormatterFactory', $returnValue );
+ }
+
+ public function testGetValueFormatterFactoryReturnType() {
+ $returnValue =
$this->getDefaultInstance()->getValueFormatterFactory();
+ $this->assertInstanceOf(
'Wikibase\Lib\OutputFormatValueFormatterFactory', $returnValue );
+ }
+
+ public function testGetDefaultInstance() {
+ $this->assertSame(
+ WikibaseClient::getDefaultInstance(),
+ WikibaseClient::getDefaultInstance() );
+ }
+
+ /**
+ * @return WikibaseClient
+ */
+ private function getDefaultInstance() {
+ return WikibaseClient::getDefaultInstance();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/101664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17a9377c460e11d13ab8a1a45fa18c70ed0fa2e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
