[MediaWiki-commits] [Gerrit] Add status for partial compliance. CompareResult has now a s... - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Add status for partial compliance. CompareResult has now a
status (returned by comparer) instead of a mismatch boolean.
..
Add status for partial compliance. CompareResult has now a status (returned by
comparer) instead of a mismatch boolean.
Change-Id: I29aada30641e6539a1306f7062537a2e3c75c812
---
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/Comparer/TimeValueComparer.php
M includes/CrossCheck/Result/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/Serializer/CompareResultSerializer.php
M tests/phpunit/CheckForCrossCheckViolationsJobTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/CrossCheck/Result/CompareResultTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
26 files changed, 202 insertions(+), 135 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index fdff06a..0f5eda7 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -46,6 +46,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -58,10 +59,10 @@
$terms = $this->getTerms( $entityId, $language );
if ( !empty( $terms ) ) {
-$match = $this->stringComparer->compareArrays( $terms,
$externalValues );
+$status = $this->stringComparer->compareArrays( $terms,
$externalValues );
$externalValues = $this->parseExternalValues( $externalValues,
$dumpMetaInformation );
-return new CompareResult( $localValue, $externalValues, !$match );
+return new CompareResult( $localValue, $externalValues, $status );
}
}
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
old mode 100644
new mode 100755
index 952316a..d973fea
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -26,6 +26,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -38,16 +39,16 @@
$externalValues = $this->parseExternalValues( $externalValues,
$dumpMetaInformation );
-$dataMismatch = true;
+$status = CompareResult::STATUS_MISMATCH;
foreach ( $externalValues as $externalValue ) {
$formattedExternalValue = $globeFormatter->format( $externalValue
);
if ( $formattedLocalValue === $formattedExternalValue ) {
-$dataMismatch = false;
+$status = CompareResult::STATUS_COMPLIANCE;
break;
}
}
-return new CompareResult( $localValue, $externalValues, $dataMismatch
);
+return new CompareResult( $localValue, $externalValues, $status );
}
/**
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index b01990f..c39f0db 100755
--- a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
+++ b/include
[MediaWiki-commits] [Gerrit] Add status for partial compliance. CompareResult has now a s... - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208948
Change subject: Add status for partial compliance. CompareResult has now a
status (returned by comparer) instead of a mismatch boolean.
..
Add status for partial compliance. CompareResult has now a status (returned by
comparer) instead of a mismatch boolean.
Change-Id: I29aada30641e6539a1306f7062537a2e3c75c812
---
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/Comparer/TimeValueComparer.php
M includes/CrossCheck/Result/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/Serializer/CompareResultSerializer.php
M tests/phpunit/CheckForCrossCheckViolationsJobTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/CrossCheck/Result/CompareResultTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
26 files changed, 202 insertions(+), 135 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/48/208948/1
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index fdff06a..0f5eda7 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -46,6 +46,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -58,10 +59,10 @@
$terms = $this->getTerms( $entityId, $language );
if ( !empty( $terms ) ) {
-$match = $this->stringComparer->compareArrays( $terms,
$externalValues );
+$status = $this->stringComparer->compareArrays( $terms,
$externalValues );
$externalValues = $this->parseExternalValues( $externalValues,
$dumpMetaInformation );
-return new CompareResult( $localValue, $externalValues, !$match );
+return new CompareResult( $localValue, $externalValues, $status );
}
}
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
old mode 100644
new mode 100755
index 952316a..d973fea
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -26,6 +26,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -38,16 +39,16 @@
$externalValues = $this->parseExternalValues( $externalValues,
$dumpMetaInformation );
-$dataMismatch = true;
+$status = CompareResult::STATUS_MISMATCH;
foreach ( $externalValues as $externalValue ) {
$formattedExternalValue = $globeFormatter->format( $externalValue
);
if ( $formattedLocalValue === $formattedExternalValue ) {
-$dataMismatch = false;
+$status = CompareResult::STATUS_COMPLIANCE;
break;
}
}
-return new CompareResult( $localValue, $externalValues, $dataMismatch
);
+return new CompareResult( $localValue, $externalValues, $status );
}
/**
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index b01990f..c
[MediaWiki-commits] [Gerrit] Add status for partial compliance. CompareResult has now a s... - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208943
Change subject: Add status for partial compliance. CompareResult has now a
status (returned by comparer) instead of a mismatch boolean.
..
Add status for partial compliance. CompareResult has now a status (returned by
comparer) instead of a mismatch boolean.
Change-Id: I29aada30641e6539a1306f7062537a2e3c75c812
---
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/Comparer/TimeValueComparer.php
M includes/CrossCheck/Result/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/Serializer/CompareResultSerializer.php
M tests/phpunit/CheckForCrossCheckViolationsJobTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/CrossCheck/Result/CompareResultTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
26 files changed, 180 insertions(+), 135 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/43/208943/1
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index fdff06a..0f5eda7 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -46,6 +46,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -58,10 +59,10 @@
$terms = $this->getTerms( $entityId, $language );
if ( !empty( $terms ) ) {
-$match = $this->stringComparer->compareArrays( $terms,
$externalValues );
+$status = $this->stringComparer->compareArrays( $terms,
$externalValues );
$externalValues = $this->parseExternalValues( $externalValues,
$dumpMetaInformation );
-return new CompareResult( $localValue, $externalValues, !$match );
+return new CompareResult( $localValue, $externalValues, $status );
}
}
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
old mode 100644
new mode 100755
index 952316a..d973fea
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -26,6 +26,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -38,16 +39,16 @@
$externalValues = $this->parseExternalValues( $externalValues,
$dumpMetaInformation );
-$dataMismatch = true;
+$status = CompareResult::STATUS_MISMATCH;
foreach ( $externalValues as $externalValue ) {
$formattedExternalValue = $globeFormatter->format( $externalValue
);
if ( $formattedLocalValue === $formattedExternalValue ) {
-$dataMismatch = false;
+$status = CompareResult::STATUS_COMPLIANCE;
break;
}
}
-return new CompareResult( $localValue, $externalValues, $dataMismatch
);
+return new CompareResult( $localValue, $externalValues, $status );
}
/**
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index b01990f..c
