[MediaWiki-commits] [Gerrit] Stop using LibSerializerFactory in SetReferenceTest - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Stop using LibSerializerFactory in SetReferenceTest
......................................................................

Stop using LibSerializerFactory in SetReferenceTest

Change-Id: I2579eeb3ee3980a806be9890ba16e863275fd88c
---
M repo/tests/phpunit/includes/api/SetReferenceTest.php
1 file changed, 28 insertions(+), 13 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/api/SetReferenceTest.php 
b/repo/tests/phpunit/includes/api/SetReferenceTest.php
index 732da3f..fd68266 100644
--- a/repo/tests/phpunit/includes/api/SetReferenceTest.php
+++ b/repo/tests/phpunit/includes/api/SetReferenceTest.php
@@ -2,21 +2,22 @@
 
 namespace Wikibase\Test\Repo\Api;
 
+use DataValues\Serializers\DataValueSerializer;
 use DataValues\StringValue;
 use UsageException;
 use Wikibase\DataModel\Claim\Claim;
+use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Reference;
+use Wikibase\DataModel\SerializerFactory;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 use Wikibase\DataModel\Snak\PropertySomeValueSnak;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\SnakList;
 use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Lib\Serializers\LibSerializerFactory;
-use Wikibase\Lib\Serializers\SerializationOptions;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
@@ -45,6 +46,16 @@
         */
        private static $propertyIds;
 
+       /**
+        * @var SerializerFactory
+        */
+       private $serializerFactory;
+
+       /**
+        * @var DeserializerFactory
+        */
+       private $deserializerFactory;
+
        protected function setUp() {
                parent::setUp();
 
@@ -62,6 +73,15 @@
 
                        $this->initTestEntities( array( 'StringProp', 'Berlin' 
) );
                }
+
+               $this->serializerFactory = new SerializerFactory(
+                       new DataValueSerializer(),
+                       
SerializerFactory::OPTION_SERIALIZE_REFERENCE_SNAKS_WITHOUT_HASH
+               );
+               $this->deserializerFactory = new DeserializerFactory(
+                       
WikibaseRepo::getDefaultInstance()->getDataValueDeserializer(),
+                       WikibaseRepo::getDefaultInstance()->getEntityIdParser()
+               );
        }
 
        /**
@@ -237,9 +257,9 @@
         */
        protected function serializeReference( $reference ) {
                if ( $reference instanceof Reference ) {
-                       $reference = $this->newLibSerializerFactory()
-                               ->newReferenceSerializer( new 
SerializationOptions() )
-                               ->getSerialized( $reference );
+                       $reference = $this->serializerFactory
+                               ->newReferenceSerializer()
+                               ->serialize( $reference );
                }
                return $reference;
        }
@@ -252,16 +272,11 @@
         */
        protected function unserializeReference( $reference ) {
                if ( is_array( $reference ) ) {
-                       unset( $reference['hash'] );
-                       $reference = $this->newLibSerializerFactory()
-                               ->newReferenceUnserializer( new 
SerializationOptions() )
-                               ->newFromSerialization( $reference );
+                       $reference = $this->deserializerFactory
+                               ->newReferenceDeserializer()
+                               ->deserialize( $reference );
                }
                return $reference;
-       }
-
-       private function newLibSerializerFactory() {
-               return new LibSerializerFactory();
        }
 
        /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2579eeb3ee3980a806be9890ba16e863275fd88c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>

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