Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221084
Change subject: Drop leading zeros from TimeValue constructor parameters
......................................................................
Drop leading zeros from TimeValue constructor parameters
These timestamp strings are used to construct TimeValue objects.
TimeValue always ignored leading zeros and does an enforced padding
to 4 digits now.
The puspose of this patch is to make the test cases more readable.
For example, it's very hard to distinguish 0000000000000001 and
0000000000100001 but much easier to distinguis 1 and 100001.
Change-Id: I65f7a6a087c27233fc762083ef98d9fc5e84a382
---
M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
M lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
M lib/tests/phpunit/parsers/TimeParserFactoryTest.php
M lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
M lib/tests/phpunit/parsers/YearTimeParserTest.php
M repo/tests/phpunit/includes/ValidatorBuildersTest.php
6 files changed, 140 insertions(+), 146 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/84/221084/1
diff --git
a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
index ff6c827..4e71f93 100644
--- a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
+++ b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php
@@ -369,10 +369,8 @@
$this->setExpectedException(
'ValueFormatters\FormattingException' );
$timeValue = new TimeValue(
- '+00000002013-01-01T00:00:00Z',
- 0,
- 0,
- 0,
+ '+2013-01-01T00:00:00Z',
+ 0, 0, 0,
TimeValue::PRECISION_SECOND,
'http://nyan.cat/original.php'
);
@@ -411,10 +409,8 @@
$this->setExpectedException(
'ValueFormatters\FormattingException' );
$timeValue = new TimeValue(
- '+00000002013-01-01T00:00:00Z',
- 0,
- 0,
- 0,
+ '+2013-01-01T00:00:00Z',
+ 0, 0, 0,
TimeValue::PRECISION_SECOND,
'http://nyan.cat/original.php'
);
@@ -458,10 +454,8 @@
$this->setExpectedException(
'ValueFormatters\FormattingException' );
$timeValue = new TimeValue(
- '+00000002013-01-01T00:00:00Z',
- 0,
- 0,
- 0,
+ '+2013-01-01T00:00:00Z',
+ 0, 0, 0,
TimeValue::PRECISION_SECOND,
'http://nyan.cat/original.php'
);
diff --git a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
index 75cd1ee..cddb6da 100644
--- a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
+++ b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
@@ -47,112 +47,112 @@
$valid = array(
// + dates
'13 billion years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $gregorian ),
+ array( '+13000000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ga, $gregorian ),
'130 billion years CE' =>
- array( '+0000130000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $gregorian ),
+ array( '+130000000000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_Ga, $gregorian ),
'13000 billion years CE' =>
- array( '+0013000000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $gregorian ),
+ array( '+13000000000000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_Ga, $gregorian ),
'13,000 billion years CE' =>
- array( '+0013000000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $gregorian ),
+ array( '+13000000000000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_Ga, $gregorian ),
'13,000 million years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $gregorian ),
+ array( '+13000000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ga, $gregorian ),
'13,800 million years CE' =>
- array( '+0000013800000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100Ma, $gregorian ),
+ array( '+13800000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100Ma, $gregorian ),
'100 million years CE' =>
- array( '+0000000100000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100Ma, $gregorian ),
+ array( '+100000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100Ma, $gregorian ),
'70 million years CE' =>
- array( '+0000000070000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10Ma, $gregorian ),
+ array( '+70000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10Ma, $gregorian ),
'77 million years CE' =>
- array( '+0000000077000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $gregorian ),
+ array( '+77000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $gregorian ),
'13 million years CE' =>
- array( '+0000000013000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $gregorian ),
+ array( '+13000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $gregorian ),
'1 million years CE' =>
- array( '+0000000001000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $gregorian ),
+ array( '+1000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $gregorian ),
'100000 years CE' =>
- array( '+0000000000100000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100ka, $gregorian ),
+ array( '+100000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100ka, $gregorian ),
'100,000 years CE' =>
- array( '+0000000000100000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100ka, $gregorian ),
+ array( '+100000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100ka, $gregorian ),
'10000 years CE' =>
- array( '+0000000000010000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10ka, $gregorian ),
+ array( '+10000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10ka, $gregorian ),
'99000 years CE' =>
- array( '+0000000000099000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $gregorian ),
+ array( '+99000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $gregorian ),
'99,000 years CE' =>
- array( '+0000000000099000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $gregorian ),
+ array( '+99000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $gregorian ),
'5. millennium' =>
- array( '+0000000000005000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $gregorian ),
+ array( '+5000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $gregorian ),
'55. millennium' =>
- array( '+0000000000055000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $gregorian ),
+ array( '+55000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $gregorian ),
'10. century' =>
- array( '+0000000000001000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100a, $julian ),
+ array( '+1000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100a, $julian ),
'12. century' =>
- array( '+0000000000001200-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100a, $julian ),
+ array( '+1200-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100a, $julian ),
'1980s' =>
- array( '+0000000000001980-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $gregorian ),
+ array( '+1980-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $gregorian ),
'2000s' =>
- array( '+0000000000002000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $gregorian ),
+ array( '+2000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $gregorian ),
'10s' =>
- array( '+0000000000000010-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $julian ),
+ array( '+0010-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $julian ),
'12s' =>
- array( '+0000000000000012-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $julian ),
+ array( '+0012-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $julian ),
// - dates
'13 billion years BCE' =>
- array( '-0000013000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $julian ),
+ array( '-13000000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ga, $julian ),
'130 billion years BCE' =>
- array( '-0000130000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $julian ),
+ array( '-130000000000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_Ga, $julian ),
'13000 billion years BCE' =>
- array( '-0013000000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $julian ),
+ array( '-13000000000000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_Ga, $julian ),
'13,000 billion years BCE' =>
- array( '-0013000000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $julian ),
+ array( '-13000000000000-00-00T00:00:00Z', 0, 0,
0, TimeValue::PRECISION_Ga, $julian ),
'13,000 million years BCE' =>
- array( '-0000013000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $julian ),
+ array( '-13000000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ga, $julian ),
'13,800 million years BCE' =>
- array( '-0000013800000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100Ma, $julian ),
+ array( '-13800000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100Ma, $julian ),
'100 million years BCE' =>
- array( '-0000000100000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100Ma, $julian ),
+ array( '-100000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100Ma, $julian ),
'70 million years BCE' =>
- array( '-0000000070000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10Ma, $julian ),
+ array( '-70000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10Ma, $julian ),
'77 million years BCE' =>
- array( '-0000000077000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $julian ),
+ array( '-77000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $julian ),
'13 million years BCE' =>
- array( '-0000000013000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $julian ),
+ array( '-13000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $julian ),
'1 million years BCE' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $julian ),
+ array( '-1000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $julian ),
'100000 years BCE' =>
- array( '-0000000000100000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100ka, $julian ),
+ array( '-100000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100ka, $julian ),
'100,000 years BCE' =>
- array( '-0000000000100000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100ka, $julian ),
+ array( '-100000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100ka, $julian ),
'10000 years BCE' =>
- array( '-0000000000010000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10ka, $julian ),
+ array( '-10000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10ka, $julian ),
'99000 years BCE' =>
- array( '-0000000000099000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $julian ),
+ array( '-99000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $julian ),
'99,000 years BCE' =>
- array( '-0000000000099000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $julian ),
+ array( '-99000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $julian ),
'5. millennium BCE' =>
- array( '-0000000000005000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $julian ),
+ array( '-5000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $julian ),
'55. millennium BCE' =>
- array( '-0000000000055000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $julian ),
+ array( '-55000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $julian ),
'10. century BCE' =>
- array( '-0000000000001000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100a, $julian ),
+ array( '-1000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100a, $julian ),
'12. century BCE' =>
- array( '-0000000000001200-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100a, $julian ),
+ array( '-1200-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100a, $julian ),
'10s BCE' =>
- array( '-0000000000000010-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $julian ),
+ array( '-0010-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $julian ),
'12s BCE' =>
- array( '-0000000000000012-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $julian ),
+ array( '-0012-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $julian ),
// also parse BC
'5. millennium BC' =>
- array( '-0000000000005000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $julian ),
+ array( '-5000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $julian ),
'55. millennium BC' =>
- array( '-0000000000055000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_ka, $julian ),
+ array( '-55000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_ka, $julian ),
'10. century BC' =>
- array( '-0000000000001000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100a, $julian ),
+ array( '-1000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100a, $julian ),
'12. century BC' =>
- array( '-0000000000001200-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_100a, $julian ),
+ array( '-1200-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_100a, $julian ),
'10s BC' =>
- array( '-0000000000000010-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $julian ),
+ array( '-0010-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $julian ),
'12s BC' =>
- array( '-0000000000000012-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10a, $julian ),
+ array( '-0012-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10a, $julian ),
);
foreach ( $valid as $value => $expected ) {
diff --git a/lib/tests/phpunit/parsers/TimeParserFactoryTest.php
b/lib/tests/phpunit/parsers/TimeParserFactoryTest.php
index 22f5258..a94379d 100644
--- a/lib/tests/phpunit/parsers/TimeParserFactoryTest.php
+++ b/lib/tests/phpunit/parsers/TimeParserFactoryTest.php
@@ -49,47 +49,47 @@
* @see Wikibase\Lib\Parsers\Test\YearTimeParserTest
*/
'1999' =>
- array( '+0000000000001999-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
+ array( '+1999-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
'2000' =>
- array( '+0000000000002000-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
+ array( '+2000-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
'2010' =>
- array( '+0000000000002010-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
+ array( '+2010-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
'1980 ' =>
- array( '+0000000000001980-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
+ array( '+1980-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
'1' =>
- array( '+0000000000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
+ array( '+0001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
'-1000000001' =>
- array( '-0000001000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
+ array( '-1000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
'+1000000001' =>
- array( '+0000001000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
+ array( '+1000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR ),
'1BC' =>
- array( '-0000000000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
+ array( '-0001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
'1CE' =>
- array( '+0000000000000001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
+ array( '+0001-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
'1 1999 BC' =>
- array( '-0000000000011999-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
+ array( '-11999-00-00T00:00:00Z',
TimeValue::PRECISION_YEAR, $julian ),
'1,000,000 BC' =>
- array( '-0000000001000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ma, $julian ),
+ array( '-1000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ma, $julian ),
/**
* @see Wikibase\Lib\Parsers\YearMonthTimeParser
* @see
Wikibase\Lib\Parsers\Test\YearMonthTimeParserTest
*/
'1 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z',
TimeValue::PRECISION_MONTH ),
+ array( '+1999-01-00T00:00:00Z',
TimeValue::PRECISION_MONTH ),
'March 1999' =>
- array( '+0000000000001999-03-00T00:00:00Z',
TimeValue::PRECISION_MONTH ),
+ array( '+1999-03-00T00:00:00Z',
TimeValue::PRECISION_MONTH ),
'1999 March' =>
- array( '+0000000000001999-03-00T00:00:00Z',
TimeValue::PRECISION_MONTH ),
+ array( '+1999-03-00T00:00:00Z',
TimeValue::PRECISION_MONTH ),
/**
* @see ValueParsers\IsoTimestampParser
* @see ValueParsers\Test\IsoTimestampParserTest
*/
'+0000000000000000-01-01T00:00:00Z (Gregorian)' =>
- array( '+0000000000000000-01-01T00:00:00Z' ),
+ array( '+0000-01-01T00:00:00Z' ),
'+0-00-20T00:00:00Z' =>
- array( '+0000000000000000-00-20T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '+0000-00-20T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'-10100-02-29' =>
array( '-10100-02-29T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'+2015-01-00T00:00:00Z' =>
@@ -106,40 +106,40 @@
* @see Wikibase\Lib\Parsers\Test\MWTimeIsoParserTest
*/
'13 billion years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ga ),
+ array( '+13000000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ga ),
'13,000 million years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ga ),
+ array( '+13000000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ga ),
'13,000 million years BCE' =>
- array( '-0000013000000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ga, $julian ),
+ array( '-13000000000-00-00T00:00:00Z',
TimeValue::PRECISION_Ga, $julian ),
'1980s' =>
- array( '+0000000000001980-00-00T00:00:00Z',
TimeValue::PRECISION_10a ),
+ array( '+1980-00-00T00:00:00Z',
TimeValue::PRECISION_10a ),
/**
* @see ValueParsers\PhpDateTimeParser
* @see ValueParsers\Test\PhpDateTimeParserTest
*/
'10/10/10' =>
- array( '+0000000000000010-10-10T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '+0010-10-10T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1 July 2013' =>
- array( '+0000000000002013-07-01T00:00:00Z' ),
+ array( '+2013-07-01T00:00:00Z' ),
'1 Jul 2013' =>
- array( '+0000000000002013-07-01T00:00:00Z' ),
+ array( '+2013-07-01T00:00:00Z' ),
'1 Jul 2013 BC' =>
- array( '-0000000000002013-07-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '-2013-07-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1 Jul 2013CE' =>
- array( '+0000000000002013-07-01T00:00:00Z' ),
+ array( '+2013-07-01T00:00:00Z' ),
'+1 Jul 2013' =>
- array( '+0000000000002013-07-01T00:00:00Z' ),
+ array( '+2013-07-01T00:00:00Z' ),
'-1 Jul 2013' =>
- array( '-0000000000002013-07-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '-2013-07-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'-1.11.111' =>
- array( '-0000000000000111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '-0111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1.11.111 BC' =>
- array( '-0000000000000111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '-0111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1,11,111 BC' =>
- array( '-0000000000000111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '-0111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1 11 111 BC' =>
- array( '-0000000000000111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
+ array( '-0111-11-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
);
$argLists = array();
diff --git a/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
b/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
index a060a6f..96ebfd9 100644
--- a/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
@@ -47,77 +47,77 @@
$valid = array(
// leading zeros
'00001 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'000000001 100001999' =>
- array( '+0000000100001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+100001999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
// use string month names
'Jan/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'January/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'January/1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0001-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'1999 January' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'January 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'January-1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0001-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'JanuARY-1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0001-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'JaN/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'januARY-1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0001-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'jan/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
// use different date separators
'1-1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1 / 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1,1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1.1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1. 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1999-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
// presume mm/yy unless impossible month, in which case
switch
'12/12' =>
- array( '+0000000000000012-12-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0012-12-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'12/11' =>
- array( '+0000000000000011-12-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0011-12-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'11/12' =>
- array( '+0000000000000012-11-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0012-11-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'13/12' =>
- array( '+0000000000000013-12-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0013-12-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'12/13' =>
- array( '+0000000000000013-12-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $julian ),
+ array( '+0013-12-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $julian ),
'2000 1' =>
- array( '+0000000000002000-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+2000-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
// big years
'April-1000000001' =>
- array( '+0000001000000001-04-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1000000001-04-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'April 1000000001' =>
- array( '+0000001000000001-04-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1000000001-04-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1000000001 April' =>
- array( '+0000001000000001-04-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+1000000001-04-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
'1 13000' =>
- array( '+0000000000013000-01-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_MONTH, $gregorian ),
+ array( '+13000-01-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_MONTH, $gregorian ),
// parse 0 month as if no month has been entered
'0.1999' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+1999-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
'1999 0' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+1999-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
);
foreach ( $valid as $value => $expected ) {
diff --git a/lib/tests/phpunit/parsers/YearTimeParserTest.php
b/lib/tests/phpunit/parsers/YearTimeParserTest.php
index 902dbdc..6695ca7 100644
--- a/lib/tests/phpunit/parsers/YearTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/YearTimeParserTest.php
@@ -67,32 +67,32 @@
$valid = array(
'1999' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+1999-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
'2000' =>
- array( '+0000000000002000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+2000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
'2010' =>
- array( '+0000000000002010-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+2010-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
'2000000' =>
- array( '+0000000002000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $gregorian ),
+ array( '+2000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $gregorian ),
'2000000000' =>
- array( '+0000002000000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ga, $gregorian ),
+ array( '+2000000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ga, $gregorian ),
'2000020000' =>
- array( '+0000002000020000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_10ka, $gregorian ),
+ array( '+2000020000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_10ka, $gregorian ),
'2000001' =>
- array( '+0000000002000001-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+2000001-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
'02000001' =>
- array( '+0000000002000001-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $gregorian ),
+ array( '+2000001-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $gregorian ),
'1' =>
- array( '+0000000000000001-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $julian ),
+ array( '+0001-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $julian ),
'000000001' =>
- array( '+0000000000000001-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $julian ),
+ array( '+0001-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $julian ),
'-1000000' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $julian ),
+ array( '-1000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $julian ),
'-1 000 000' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_Ma, $julian ),
+ array( '-1000000-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_Ma, $julian ),
// Digit grouping in the Indian numbering system
'-1,99,999' =>
- array( '-0000000000199999-00-00T00:00:00Z', 0,
0, 0, TimeValue::PRECISION_YEAR, $julian ),
+ array( '-199999-00-00T00:00:00Z', 0, 0, 0,
TimeValue::PRECISION_YEAR, $julian ),
);
foreach ( $valid as $value => $expected ) {
diff --git a/repo/tests/phpunit/includes/ValidatorBuildersTest.php
b/repo/tests/phpunit/includes/ValidatorBuildersTest.php
index 0de603e..ec8c30c 100644
--- a/repo/tests/phpunit/includes/ValidatorBuildersTest.php
+++ b/repo/tests/phpunit/includes/ValidatorBuildersTest.php
@@ -106,15 +106,15 @@
array( 'time', new NumberValue( 7 ), false, 'TimeValue
expected' ),
//time['calendar-model']
- array( 'time', new TimeValue(
'+0000000000002013-06-06T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_DAY, '1' ),
false, 'calendar: too short' ),
- array( 'time', new TimeValue(
'+0000000000002013-06-06T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_DAY,
'http://' . str_repeat('x', 256) ), false, 'calendar: too long' ),
- array( 'time', new TimeValue(
'+0000000000002013-06-06T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_DAY,
'http://acme.com/calendar' ), true, 'calendar: URL' ),
- array( 'time', new TimeValue(
'+0000000000002013-06-06T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_DAY, '
http://acme.com/calendar ' ), false, 'calendar: untrimmed' ),
- array( 'time', new TimeValue(
'+0000000000002013-06-06T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_DAY, '
javascript:alert(1)' ), false, 'calendar: bad URL' ),
+ array( 'time', new TimeValue( '+2013-06-06T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_DAY, '1' ), false, 'calendar: too short' ),
+ array( 'time', new TimeValue( '+2013-06-06T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_DAY, 'http://' . str_repeat('x', 256) ), false,
'calendar: too long' ),
+ array( 'time', new TimeValue( '+2013-06-06T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_DAY, 'http://acme.com/calendar' ), true,
'calendar: URL' ),
+ array( 'time', new TimeValue( '+2013-06-06T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_DAY, ' http://acme.com/calendar ' ), false,
'calendar: untrimmed' ),
+ array( 'time', new TimeValue( '+2013-06-06T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_DAY, ' javascript:alert(1)' ), false, 'calendar:
bad URL' ),
//precision to the second (currently not allowed)
- array( 'time', new TimeValue(
'+0000000000002013-06-06T11:22:33Z', 0, 0, 0, TimeValue::PRECISION_DAY,
'http://acme.com/calendar' ), false, 'time given to the second' ),
- array( 'time', new TimeValue(
'+0000000000002013-06-06T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_SECOND,
'http://acme.com/calendar' ), false, 'precision: second' ),
+ array( 'time', new TimeValue( '+2013-06-06T11:22:33Z',
0, 0, 0, TimeValue::PRECISION_DAY, 'http://acme.com/calendar' ), false, 'time
given to the second' ),
+ array( 'time', new TimeValue( '+2013-06-06T00:00:00Z',
0, 0, 0, TimeValue::PRECISION_SECOND, 'http://acme.com/calendar' ), false,
'precision: second' ),
//time['time']
//NOTE: The below will fail with a
IllegalValueExcpetion once the TimeValue constructor enforces the time format.
--
To view, visit https://gerrit.wikimedia.org/r/221084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65f7a6a087c27233fc762083ef98d9fc5e84a382
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
