jenkins-bot has submitted this change and it was merged.
Change subject: Fix 5+ year comparison in TimeValueComparer
......................................................................
Fix 5+ year comparison in TimeValueComparer
Change-Id: I4a6e8fa90fd25e76196c53a6e3b251b0e7b84d18
---
M includes/CrossCheck/Comparer/TimeValueComparer.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
2 files changed, 38 insertions(+), 6 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CrossCheck/Comparer/TimeValueComparer.php
b/includes/CrossCheck/Comparer/TimeValueComparer.php
index cba8f64..86ec7ef 100644
--- a/includes/CrossCheck/Comparer/TimeValueComparer.php
+++ b/includes/CrossCheck/Comparer/TimeValueComparer.php
@@ -42,11 +42,24 @@
$result = ComparisonResult::STATUS_MISMATCH;
+ if ( !preg_match( '/^([-+]?)(\d*)((\d{4}\b).*)/',
$value->getTime(), $localMatches )
+ || !preg_match( '/^([-+]?)(\d*)((\d{4}\b).*)/',
$comparativeValue->getTime(), $externalMatches )
+ ) {
+ return ComparisonResult::STATUS_MISMATCH;
+ }
+ list( , $localSign, $localYearHigh, $localMwTime, $localYearLow
) = $localMatches;
+ list( , $externalSign, $externalYearHigh, $externalMwTime,
$externalYearLow ) = $externalMatches;
+ if ( $localSign !== $externalSign && ( $localYearHigh .
$localYearLow !== '0000'
+ || $externalYearHigh . $externalYearLow !==
'0000' )
+ ) {
+ return ComparisonResult::STATUS_MISMATCH;
+ }
+
try {
- // FIXME: MWTimestamp does not support years with more
than 4 digits!
- $localTimestamp = new MWTimestamp( substr(
$value->getTime(), 1 ) );
- $externalTimestamp = new MWTimestamp( substr(
$comparativeValue->getTime(), 1 ) );
+ $localTimestamp = new MWTimestamp( $localMwTime );
+ $externalTimestamp = new MWTimestamp( $externalMwTime );
$diff = $localTimestamp->diff( $externalTimestamp );
+ $diff->y += abs( $localYearHigh - $externalYearHigh ) *
10000;
if ( $value->getPrecision() ===
$comparativeValue->getPrecision()
&& $this->resultOfDiffWithPrecision( $diff,
$value->getPrecision() )
diff --git a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
index 33f07e6..dc458bd 100644
--- a/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
@@ -95,10 +95,15 @@
new TimeValue( '+11980-08-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g ),
new TimeValue( '+1980-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g )
),
- 'Other gigayear' => array(
+ 'Other gigayear increasing' => array(
ComparisonResult::STATUS_MISMATCH,
new TimeValue( '+1000000000-00-00T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_YEAR1G, $g ),
new TimeValue( '+2000000000-00-00T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_YEAR1G, $g )
+ ),
+ 'Other gigayear decreasing' => array(
+ ComparisonResult::STATUS_MISMATCH,
+ new TimeValue( '+2000000000-00-00T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_YEAR1G, $g ),
+ new TimeValue( '+1000000000-00-00T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_YEAR1G, $g )
),
'Other decade with year precision' => array(
ComparisonResult::STATUS_MISMATCH,
@@ -130,12 +135,26 @@
new TimeValue( '+2001-01-01T01:01:01Z', 0, 0,
0, TimeValue::PRECISION_SECOND, $g ),
new TimeValue( '+2001-01-01T01:02:01Z', 0, 0,
0, TimeValue::PRECISION_SECOND, $g )
),
- // FIXME: This is a bug!
- 'Can not compare 5+ digit years' => array(
+ 'Other sign' => array(
ComparisonResult::STATUS_MISMATCH,
+ new TimeValue( '-2001-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g ),
+ new TimeValue( '+2001-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g )
+ ),
+ 'Plus/minus zero' => array(
+ ComparisonResult::STATUS_MATCH,
+ new TimeValue( '-0000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g ),
+ new TimeValue( '+0000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g )
+ ),
+ 'Same 5+ digit years' => array(
+ ComparisonResult::STATUS_MATCH,
new TimeValue( '+12345-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g ),
new TimeValue( '+12345-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_YEAR, $g )
),
+ 'Same gigayear' => array(
+ ComparisonResult::STATUS_MATCH,
+ new TimeValue( '+1000010000-00-00T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_YEAR1G, $g ),
+ new TimeValue( '+1000020000-00-00T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_YEAR1G, $g )
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/243627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a6e8fa90fd25e76196c53a6e3b251b0e7b84d18
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
