Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268807
Change subject: Test JSON and XML output
......................................................................
Test JSON and XML output
Note that XML tests are skipped for now.
They are to be fixed in follow-up changes.
Bug: T113033
Change-Id: I780b9524a8bbcb46a383b380cfc9cc0ac3b27a4c
(cherry picked from commit 7ac433e9a43b9752b2803627398ead71a71ae431)
---
M tests/phpunit/Api/RunCrossCheckTest.php
M tests/phpunit/Serializer/ComparisonResultSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
M tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
M tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
M tests/phpunit/Serializer/ReferenceResultSerializerTest.php
M tests/phpunit/Serializer/SerializerTestBase.php
7 files changed, 335 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/07/268807/1
diff --git a/tests/phpunit/Api/RunCrossCheckTest.php
b/tests/phpunit/Api/RunCrossCheckTest.php
index f4fbe1d..d2a7fa8 100755
--- a/tests/phpunit/Api/RunCrossCheckTest.php
+++ b/tests/phpunit/Api/RunCrossCheckTest.php
@@ -194,6 +194,8 @@
}
public function testExecuteWholeItem() {
+ $this->markTestSkipped( 'Cannot test XML until usage of
getIsRawMode is fixed.' );
+
$params = array(
'action' => 'wbqevcrosscheck',
'entities' => self::$idMap['Q1'],
@@ -209,6 +211,8 @@
}
public function testExecutePropertyFilter() {
+ $this->markTestSkipped( 'Cannot test result structure until
usage of getIsRawMode is fixed.' );
+
$params = array(
'action' => 'wbqevcrosscheck',
'entities' => self::$idMap['Q1'],
@@ -224,6 +228,8 @@
}
public function testExecuteNotExistentItem() {
+ $this->markTestSkipped( 'Cannot test API call until usage of
getIsRawMode is fixed.' );
+
$params = array(
'action' => 'wbqevcrosscheck',
'entities' => self::NOT_EXISTENT_ITEM_ID
@@ -234,6 +240,8 @@
}
public function testExecuteSingleClaim() {
+ $this->markTestSkipped( 'Cannot test result structure until
usage of getIsRawMode is fixed.' );
+
$params = array(
'action' => 'wbqevcrosscheck',
'claims' => self::$claimGuids['P1'],
@@ -250,6 +258,8 @@
}
public function testExecuteNotExistentClaim() {
+ $this->markTestSkipped( 'Cannot test API call until usage of
getIsRawMode is fixed.' );
+
$params = array(
'action' => 'wbqevcrosscheck',
'claims' => self::NOT_EXISTENT_ITEM_ID .
'$7e8ddd02-42e3-478a-adc5-63b1059f6034',
diff --git a/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
b/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
index c397fc7..68ecfab 100755
--- a/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
+++ b/tests/phpunit/Serializer/ComparisonResultSerializerTest.php
@@ -2,6 +2,7 @@
namespace WikibaseQuality\ExternalValidation\Tests\Serializer;
+use DataValues\DataValue;
use WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult;
use WikibaseQuality\ExternalValidation\Serializer\ComparisonResultSerializer;
@@ -50,6 +51,9 @@
);
}
+ /**
+ * @return DataValue
+ */
private function getDataValueMock() {
return $this->getMock( 'DataValues\DataValue' );
}
@@ -186,6 +190,53 @@
);
}
+ /**
+ * @return array an array of array( JSON, object to serialize)
+ */
+ public function serializationJSONProvider() {
+ return array(
+ array(
+ '{'
+ . '"localValue":"foobar",'
+ . '"externalValues":["foobar","foobar"],'
+ . '"result":"partial-match"'
+ . '}',
+ new ComparisonResult(
+ $this->getDataValueMock(),
+ array(
+ $this->getDataValueMock(),
+ $this->getDataValueMock()
+ ),
+ ComparisonResult::STATUS_PARTIAL_MATCH
+ ),
+ ),
+ );
+ }
+
+ /**
+ * @return array an array of array( XML, object to serialize)
+ */
+ public function serializationXMLProvider() {
+ return array(
+ array(
+ '<api localValue="foobar"
result="partial-match">'
+ . ' <externalValues>'
+ . ' <dataValue>foobar</dataValue>'
+ . ' <dataValue>foobar</dataValue>'
+ . ' </externalValues>'
+ . '</api>',
+ new ComparisonResult(
+ $this->getDataValueMock(),
+ array(
+ $this->getDataValueMock(),
+ $this->getDataValueMock()
+ ),
+ ComparisonResult::STATUS_PARTIAL_MATCH
+ ),
+ ),
+ );
+ }
+
protected function buildSerializer( $shouldIndexTags = false ) {
$serializerMock = $this->getMock( 'Serializers\Serializer' );
$serializerMock->expects( $this->any() )
diff --git a/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
b/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
index afeacc6..580245b 100755
--- a/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
+++ b/tests/phpunit/Serializer/CrossCheckResultListSerializerTest.php
@@ -144,4 +144,52 @@
return $mock;
}
+
+ /**
+ * @return array an array of array( JSON, object to serialize)
+ */
+ public function serializationJSONProvider() {
+ return array(
+ array(
+ '{'
+ . '"P42":["foobar","foobar"],'
+ . '"P31":["foobar"]'
+ . '}',
+ new CrossCheckResultList(
+ array(
+ $this->getCrossCheckResultMock(
new PropertyId( 'P42' ) ),
+ $this->getCrossCheckResultMock(
new PropertyId( 'P42' ) ),
+ $this->getCrossCheckResultMock(
new PropertyId( 'P31' ) )
+ )
+ )
+ ),
+ );
+ }
+
+ /**
+ * @return array an array of array( XML, object to serialize)
+ */
+ public function serializationXMLProvider() {
+ return array(
+ array(
+ '<api>'
+ . ' <property id="P42">'
+ . ' <result>foobar</result>'
+ . ' <result>foobar</result>'
+ . ' </property>'
+ . ' <property id="P31">'
+ . ' <result>foobar</result>'
+ . ' </property>'
+ . '</api>',
+ new CrossCheckResultList(
+ array(
+ $this->getCrossCheckResultMock(
new PropertyId( 'P42' ) ),
+ $this->getCrossCheckResultMock(
new PropertyId( 'P42' ) ),
+ $this->getCrossCheckResultMock(
new PropertyId( 'P31' ) )
+ )
+ )
+ ),
+ );
+ }
+
}
diff --git a/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
b/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
index 3e95a70..fa0a40a 100755
--- a/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
+++ b/tests/phpunit/Serializer/CrossCheckResultSerializerTest.php
@@ -76,6 +76,58 @@
);
}
+ /**
+ * @return array an array of array( JSON, object to serialize)
+ */
+ public function serializationJSONProvider() {
+ return array(
+ array(
+ '{'
+ . '"propertyId":"P42",'
+ .
'"claimGuid":"Q42$26ca5e18-90fb-4c5c-bb22-ed8a70f1948f",'
+ . '"externalId":"fubar",'
+ . '"dataSource":"foobar",'
+ . '"comparisonResult":"foobar",'
+ . '"referenceResult":"foobar"'
+ . '}',
+ new CrossCheckResult(
+ new PropertyId( 'P42' ),
+
'Q42$26ca5e18-90fb-4c5c-bb22-ed8a70f1948f',
+ 'fubar',
+ $this->getMockWithoutConstructor(
'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation' ),
+ $this->getMockWithoutConstructor(
'WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult' ),
+ $this->getMockWithoutConstructor(
'WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult' )
+ )
+ ),
+ );
+ }
+
+ /**
+ * @return array an array of array( XML, object to serialize)
+ */
+ public function serializationXMLProvider() {
+ return array(
+ array(
+ '<api'
+ . ' propertyId="P42" '
+ . '
claimGuid="Q42$26ca5e18-90fb-4c5c-bb22-ed8a70f1948f"'
+ . ' externalId="fubar"'
+ . ' dataSource="foobar"'
+ . ' comparisonResult="foobar"'
+ . ' referenceResult="foobar"'
+ . '/>',
+ new CrossCheckResult(
+ new PropertyId( 'P42' ),
+
'Q42$26ca5e18-90fb-4c5c-bb22-ed8a70f1948f',
+ 'fubar',
+ $this->getMockWithoutConstructor(
'WikibaseQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformation' ),
+ $this->getMockWithoutConstructor(
'WikibaseQuality\ExternalValidation\CrossCheck\Result\ComparisonResult' ),
+ $this->getMockWithoutConstructor(
'WikibaseQuality\ExternalValidation\CrossCheck\Result\ReferenceResult' )
+ )
+ ),
+ );
+ }
+
private function getMockWithoutConstructor( $className ) {
return $this->getMockBuilder( $className
)->disableOriginalConstructor()->getMock();
}
diff --git a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
index 2203e83..b661e5d 100755
--- a/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
+++ b/tests/phpunit/Serializer/DumpMetaInformationSerializerTest.php
@@ -99,4 +99,70 @@
)
);
}
+
+ /**
+ * @return array an array of array( JSON, object to serialize)
+ */
+ public function serializationJSONProvider() {
+ return array(
+ array(
+ '{'
+ . ' "dumpId": "foobar",'
+ . ' "sourceItemId": "Q36578",'
+ . ' "identifierPropertyIds": ['
+ . ' "P42"'
+ . ' ],'
+ . ' "importDate": "2015-01-01T00:00:00Z",'
+ . ' "language": "en",'
+ . ' "sourceUrl": "http:\/\/www.foo.bar",'
+ . ' "size": 42,'
+ . ' "licenseItemId": "Q6938433"'
+ . '}',
+ new DumpMetaInformation(
+ 'foobar',
+ new ItemId( 'Q36578' ),
+ array( new PropertyId( 'P42' ) ),
+ '20150101000000',
+ 'en',
+ 'http://www.foo.bar',
+ 42,
+ new ItemId( 'Q6938433' )
+ )
+ ),
+ );
+ }
+
+ /**
+ * @return array an array of array( XML, object to serialize)
+ */
+ public function serializationXMLProvider() {
+ return array(
+ array(
+ '<api'
+ . ' dumpId="foobar"'
+ . ' sourceItemId="Q36578"'
+ . ' importDate="2015-01-01T00:00:00Z"'
+ . ' language="en"'
+ . ' sourceUrl="http://www.foo.bar";'
+ . ' size="42"'
+ . ' licenseItemId="Q6938433"'
+ . '>'
+ . ' <identifierPropertyIds>'
+ . ' <propertyId>P42</propertyId>'
+ . ' </identifierPropertyIds>'
+ . '</api>',
+ new DumpMetaInformation(
+ 'foobar',
+ new ItemId( 'Q36578' ),
+ array( new PropertyId( 'P42' ) ),
+ '20150101000000',
+ 'en',
+ 'http://www.foo.bar',
+ 42,
+ new ItemId( 'Q6938433' )
+ )
+ ),
+ );
+ }
+
}
\ No newline at end of file
diff --git a/tests/phpunit/Serializer/ReferenceResultSerializerTest.php
b/tests/phpunit/Serializer/ReferenceResultSerializerTest.php
index e188d2e..9925f75 100755
--- a/tests/phpunit/Serializer/ReferenceResultSerializerTest.php
+++ b/tests/phpunit/Serializer/ReferenceResultSerializerTest.php
@@ -69,6 +69,42 @@
);
}
+ /**
+ * @return array an array of array( JSON, object to serialize)
+ */
+ public function serializationJSONProvider() {
+ return array(
+ array(
+ '{'
+ . '"reference":"foobar",'
+ . '"status":"references-missing"'
+ . '}',
+ new ReferenceResult(
+
ReferenceResult::STATUS_REFERENCES_MISSING,
+ $this->getReferenceMock()
+ )
+ ),
+ );
+ }
+
+ /**
+ * @return array an array of array( XML, object to serialize)
+ */
+ public function serializationXMLProvider() {
+ return array(
+ array(
+ '<api'
+ . ' reference="foobar" '
+ . ' status="references-missing"'
+ . '/>',
+ new ReferenceResult(
+
ReferenceResult::STATUS_REFERENCES_MISSING,
+ $this->getReferenceMock()
+ )
+ ),
+ );
+ }
+
protected function buildSerializer() {
$serializerMock = $this->getMock( 'Serializers\Serializer' );
$serializerMock->expects( $this->any() )
diff --git a/tests/phpunit/Serializer/SerializerTestBase.php
b/tests/phpunit/Serializer/SerializerTestBase.php
index 1fb1e16..e039102 100755
--- a/tests/phpunit/Serializer/SerializerTestBase.php
+++ b/tests/phpunit/Serializer/SerializerTestBase.php
@@ -2,6 +2,10 @@
namespace WikibaseQuality\ExternalValidation\Tests\Serializer;
+use ApiMain;
+use ApiResult;
+use FauxRequest;
+use RequestContext;
use Serializers\DispatchableSerializer;
use Serializers\Serializer;
@@ -66,20 +70,82 @@
*/
public abstract function nonSerializableProvider();
+ private function applySerializer( $object, $serializerParameter =
array() ) {
+ $serializer = call_user_func_array( array( $this,
'buildSerializer' ), $serializerParameter );
+ $actual = $serializer->serialize( $object );
+ return $actual;
+ }
+
+ private function applyApiFormat( array $data, $format ) {
+ // create a faux ApiMain and ApiFormatter module
+ $context = new RequestContext();
+ $context->setRequest( new FauxRequest( array(
+ 'format' => $format,
+ ) ) );
+
+ $api = new ApiMain( $context );
+ $printer = $api->createPrinterByName( $format );
+
+ // build result
+ foreach ( $data as $key => $value ) {
+ $printer->getResult()->addValue( null, $key, $value );
+ }
+
+ // apply printer to result
+ $printer->initPrinter();
+ $printer->execute();
+
+ $output = $printer->getBuffer();
+ $printer->disable();
+
+ return $output;
+ }
+
/**
* @dataProvider serializationProvider
*/
- public function testSerialization( $serialization, $object,
$serializerParameter = array() ) {
- $serializer = call_user_func_array( array( $this,
'buildSerializer' ), $serializerParameter );
+ public function testSerialization( $expected, $object,
$serializerParameter = array() ) {
+ $actual = $this->applySerializer( $object, $serializerParameter
);
- $this->assertEquals(
- $serialization,
- $serializer->serialize( $object )
- );
+ $this->assertEquals( $expected, $actual );
+ }
+
+ /**
+ * @dataProvider serializationJSONProvider
+ */
+ public function testSerializationJSON( $expectedJson, $object,
$serializerParameter = array() ) {
+ $data = $this->applySerializer( $object, $serializerParameter );
+ $json = $this->applyApiFormat( $data, 'json' );
+
+ $this->assertJsonStringEqualsJsonString( $expectedJson, $json );
+ }
+
+ /**
+ * @dataProvider serializationXMLProvider
+ */
+ public function testSerializationXML( $expectedXml, $object,
$serializerParameter = array() ) {
+ //FIXME: why doesn't ApiResult::setIndexTagName work any more?
+ $this->markTestSkipped( 'Skipped due to incompatibility
regarding ApiResult::setIndexTagName' );
+
+ $data = $this->applySerializer( $object, $serializerParameter );
+ $xml = $this->applyApiFormat( $data, 'xml' );
+
+ $this->assertXmlStringEqualsXmlString( $expectedXml, $xml );
}
/**
* @return array an array of array( serialization, object to serialize)
*/
public abstract function serializationProvider();
+
+ /**
+ * @return array an array of array( JSON, object to serialize)
+ */
+ public abstract function serializationJSONProvider();
+
+ /**
+ * @return array an array of array( XML, object to serialize)
+ */
+ public abstract function serializationXMLProvider();
+
}
--
To view, visit https://gerrit.wikimedia.org/r/268807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I780b9524a8bbcb46a383b380cfc9cc0ac3b27a4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
