[MediaWiki-commits] [Gerrit] Remove LibSerializer from ParserOutputJsConfigBuilderTest - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove LibSerializer from ParserOutputJsConfigBuilderTest
..


Remove LibSerializer from ParserOutputJsConfigBuilderTest

Change-Id: Icdcfc7352c5cf08b080afa95dbec2e6203ae9a1b
---
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
2 files changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Bene: Looks good to me, but someone else must approve
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index eafb313..8dfa7b4 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -985,6 +985,13 @@
/**
 * @return Deserializer
 */
+   public function getEntityDeserializer() {
+   return $this->getDeserializerFactory()->newEntityDeserializer();
+   }
+
+   /**
+* @return Deserializer
+*/
public function getStatementDeserializer() {
return 
$this->getDeserializerFactory()->newStatementDeserializer();
}
diff --git a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php 
b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
index 9cbb30b..c7cce37 100644
--- a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
+++ b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
@@ -13,9 +13,8 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Statement\StatementListProvider;
 use Wikibase\DataModel\Term\FingerprintProvider;
-use Wikibase\Lib\Serializers\SerializationOptions;
-use Wikibase\Lib\Serializers\LibSerializerFactory;
 use Wikibase\ParserOutputJsConfigBuilder;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @covers Wikibase\ParserOutputJsConfigBuilder
@@ -35,7 +34,7 @@
$this->addLabels( $item );
$mainSnakPropertyId = $this->addStatements( $item );
 
-   $configBuilder = new ParserOutputJsConfigBuilder( new 
SerializationOptions() );
+   $configBuilder = new ParserOutputJsConfigBuilder();
$configVars = $configBuilder->build( $item );
 
$this->assertWbEntityId( 'Q5881', $configVars );
@@ -56,7 +55,7 @@
$this->addLabels( $property );
$mainSnakPropertyId = $this->addStatements( $property );
 
-   $configBuilder = new ParserOutputJsConfigBuilder( new 
SerializationOptions() );
+   $configBuilder = new ParserOutputJsConfigBuilder();
$configVars = $configBuilder->build( $property );
 
$this->assertWbEntityId( 'P330', $configVars );
@@ -89,11 +88,8 @@
}
 
public function assertSerializationEqualsEntity( EntityDocument 
$entity, $serialization ) {
-   $serializerFactory = new LibSerializerFactory();
-   $options = new SerializationOptions();
-
-   $unserializer = $serializerFactory->newUnserializerForEntity( 
$entity->getType(), $options );
-   $unserializedEntity = $unserializer->newFromSerialization( 
$serialization );
+   $deserializer = 
WikibaseRepo::getDefaultInstance()->getEntityDeserializer();
+   $unserializedEntity = $deserializer->deserialize( 
$serialization );
 
$this->assertTrue(
$unserializedEntity->equals( $entity ),

-- 
To view, visit https://gerrit.wikimedia.org/r/227459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdcfc7352c5cf08b080afa95dbec2e6203ae9a1b
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove LibSerializer from ParserOutputJsConfigBuilderTest - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/227459

Change subject: Remove LibSerializer from ParserOutputJsConfigBuilderTest
..

Remove LibSerializer from ParserOutputJsConfigBuilderTest

This might be the last usage :O

Change-Id: Icdcfc7352c5cf08b080afa95dbec2e6203ae9a1b
---
M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
1 file changed, 3 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/59/227459/1

diff --git a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php 
b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
index 5cb79f2..5f56fa5 100644
--- a/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
+++ b/repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php
@@ -9,9 +9,8 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\Lib\Serializers\SerializationOptions;
-use Wikibase\Lib\Serializers\LibSerializerFactory;
 use Wikibase\ParserOutputJsConfigBuilder;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @covers Wikibase\ParserOutputJsConfigBuilder
@@ -42,11 +41,8 @@
}
 
public function assertSerializationEqualsEntity( Entity $entity, 
$serialization ) {
-   $serializerFactory = new LibSerializerFactory();
-   $options = new SerializationOptions();
-
-   $unserializer = $serializerFactory->newUnserializerForEntity( 
$entity->getType(), $options );
-   $unserializedEntity = $unserializer->newFromSerialization( 
$serialization );
+   $deserializer = 
WikibaseRepo::getDefaultInstance()->getEntityDeserializer();
+   $unserializedEntity = $deserializer->deserialize( 
$serialization );
 
$this->assertTrue( $unserializedEntity->equals( $entity ), 
'unserialized entity equals entity' );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/227459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdcfc7352c5cf08b080afa95dbec2e6203ae9a1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits