jenkins-bot has submitted this change and it was merged.
Change subject: Stop using LibSerializerFactory in SetReferenceTest
......................................................................
Stop using LibSerializerFactory in SetReferenceTest
This also removes the resulting unused methods
from the LibSerializerFactory
Change-Id: I2579eeb3ee3980a806be9890ba16e863275fd88c
---
M lib/includes/serializers/LibSerializerFactory.php
M lib/tests/phpunit/serializers/LibSerializerFactoryTest.php
M repo/tests/phpunit/includes/api/SetReferenceTest.php
3 files changed, 28 insertions(+), 38 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/serializers/LibSerializerFactory.php
b/lib/includes/serializers/LibSerializerFactory.php
index 62ce80f..4e5dbaa 100644
--- a/lib/includes/serializers/LibSerializerFactory.php
+++ b/lib/includes/serializers/LibSerializerFactory.php
@@ -3,15 +3,10 @@
namespace Wikibase\Lib\Serializers;
use InvalidArgumentException;
-use OutOfBoundsException;
use SiteStore;
-use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Claim\Claims;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
-use Wikibase\DataModel\Reference;
-use Wikibase\DataModel\Snak\Snak;
use Wikibase\EntityFactory;
/**
@@ -118,15 +113,6 @@
*
* @return Serializer
*/
- public function newReferenceSerializer( SerializationOptions $options )
{
- return new ReferenceSerializer( $this->newSnakSerializer(
$options ), $options );
- }
-
- /**
- * @param SerializationOptions $options
- *
- * @return Serializer
- */
public function newClaimSerializer( SerializationOptions $options ) {
return new ClaimSerializer( $this->newSnakSerializer( $options
), $options );
}
@@ -165,15 +151,6 @@
*/
public function newAliasSerializer( SerializationOptions $options ) {
return new AliasSerializer( $this->makeOptions( $options ) );
- }
-
- /**
- * @param SerializationOptions $options
- *
- * @return Unserializer
- */
- public function newReferenceUnserializer( SerializationOptions $options
) {
- return $this->newReferenceSerializer( $this->makeOptions(
$options ) );
}
/**
diff --git a/lib/tests/phpunit/serializers/LibSerializerFactoryTest.php
b/lib/tests/phpunit/serializers/LibSerializerFactoryTest.php
index 1c61562..64755a2 100644
--- a/lib/tests/phpunit/serializers/LibSerializerFactoryTest.php
+++ b/lib/tests/phpunit/serializers/LibSerializerFactoryTest.php
@@ -74,7 +74,6 @@
public function newUnserializerProvider() {
$names = array(
- 'ReferenceUnserializer',
'ClaimUnserializer',
'PropertyUnserializer',
'ItemUnserializer',
@@ -101,7 +100,6 @@
public function newSerializerProvider() {
$names = array(
'SnakSerializer',
- 'ReferenceSerializer',
'ClaimSerializer',
'ClaimsSerializer',
'PropertySerializer',
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: merged
Gerrit-Change-Id: I2579eeb3ee3980a806be9890ba16e863275fd88c
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
