Addshore has submitted this change and it was merged.
Change subject: Adjust ReferenceSerializer tests to change in WikibaseDataModel
......................................................................
Adjust ReferenceSerializer tests to change in WikibaseDataModel
Refers to change I2ce18fb2151d7d940bb020bcb7a594d74bfea35d
Change-Id: I36f5a98a443c4a1f1ba9e5e85cc3de676f812637
---
M lib/tests/phpunit/serializers/ReferenceSerializerTest.php
M lib/tests/phpunit/serializers/SerializerBaseTest.php
2 files changed, 14 insertions(+), 1 deletion(-)
Approvals:
Addshore: Verified; Looks good to me, approved
diff --git a/lib/tests/phpunit/serializers/ReferenceSerializerTest.php
b/lib/tests/phpunit/serializers/ReferenceSerializerTest.php
index 0895b38..bb380cc 100644
--- a/lib/tests/phpunit/serializers/ReferenceSerializerTest.php
+++ b/lib/tests/phpunit/serializers/ReferenceSerializerTest.php
@@ -54,6 +54,9 @@
$snakSerializer = new SnakSerializer();
$reference = new \Wikibase\Reference( new \Wikibase\SnakList(
$snaks ) );
+ $sortedReference = new \Wikibase\Reference( new
\Wikibase\SnakList(
+ array( $snaks[0], $snaks[2], $snaks[1], $snaks[3],
$snaks[4] )
+ ) );
$validArgs[] = array(
$reference,
@@ -73,6 +76,8 @@
),
),
),
+ null,
+ $sortedReference,
);
return $validArgs;
diff --git a/lib/tests/phpunit/serializers/SerializerBaseTest.php
b/lib/tests/phpunit/serializers/SerializerBaseTest.php
index b125875..62d3ae1 100644
--- a/lib/tests/phpunit/serializers/SerializerBaseTest.php
+++ b/lib/tests/phpunit/serializers/SerializerBaseTest.php
@@ -53,7 +53,12 @@
*
* @since 0.2
*/
- public function testGetSerializedValid( $input, array $expected = null,
SerializationOptions $options = null ) {
+ public function testGetSerializedValid(
+ $input,
+ array $expected = null,
+ SerializationOptions $options = null,
+ $normalizedInput = null
+ ) {
$serializer = $this->getInstance();
if ( $options !== null ) {
@@ -69,6 +74,9 @@
if ( $serializer instanceof Unserializer ) {
$roundtrippedValue = $serializer->newFromSerialization(
$output );
+ if( !is_null( $normalizedInput ) ) {
+ $input = $normalizedInput;
+ }
$this->assertMeaningfulEquals( $input,
$roundtrippedValue, 'getSerialized, getUnserialized roundtrip should result in
input value' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/85187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36f5a98a443c4a1f1ba9e5e85cc3de676f812637
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
