Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#3795 from mwillbanks/h…
Browse files Browse the repository at this point in the history 
…otfix/i18n-date-tests

i18n View Helper Tests Depend on intl version fix
  • Loading branch information
@DASPRiD
DASPRiD committed Feb 19, 2013
118 parents dec8ccf + e574b9b + f30ec7d + 1fa84de + 41b8543 + 9e2c9d5 + 913f51c + 39924f3 + c2a11e1 + 61b9322 + 413a38b + e51b2b8 + 20e328b + 6437ec0 + e9b8476 + 95e54a0 + 7ea3aed + df6a706 + a82fc82 + 7c2a059 + 4fefb53 + 599ee3a + ea3fc65 + f6c04c2 + 6591e3d + a4f76e3 + 33c7531 + 2d59782 + 8152327 + e56ce9b + db9b18f + b88635a + a262823 + b79aef6 + c2284e4 + 70193eb + 96acf77 + 9675426 + 5f02411 + 0dafea7 + 15dc674 + 4a2447d + e6eb7f3 + e9499c5 + 272b15f + 11c7758 + 6f0e918 + 5f4980a + ecca95a + 88b5971 + ecb8d13 + 9de1c08 + 44aad17 + 13269e9 + 654cdb6 + dc708db + 380ffba + ff67e7f + fe2e025 + 95f0efa + 68cc4b3 + bf13b96 + 8870381 + 56480f4 + 1fa90d7 + 5c7fe1f + abe9bc1 + a33cacd + cdd7d9f + 6a261b1 + 5e594c4 + 01c1241 + 30d1dd2 + d4af079 + c9aa9b4 + 10f47ca + ef20fa1 + 2187ae2 + e7f3993 + db93d37 + aa57612 + 4af81d8 + 2f90998 + 3013404 + 69d83fe + f383ca9 + 1b26f48 + 054f09d + 0c86829 + f22d81a + e7ebffe + 72a7a54 + cc09223 + ab99f58 + 2c69e37 + b6ccfbc + b92a5da + 773a133 + 9ee28ff + 5865e20 + 63c7303 + 73371d0 + b96f402 + b36e36b + 60fa081 + a1d27a6 + 43e9240 + 9e59ae6 + be1ce44 + 5a6465d + 7e455b4 + 83d837e + 28bc01e + 215be48 + efcc8e0 + 5192ae6 + 7e1ba0f + b166510 commit 910bbbf
Showing 1 changed file with 61 additions and 61 deletions.
122 changes: 61 additions & 61 deletions test/View/Helper/DateFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,131 +56,115 @@ public function tearDown()
public function dateTestsDataProvider()
{
$date = new DateTime('2012-07-02T22:44:03Z');

return array(
// FULL format varies based on OS
// array(
// 'de_DE',
// 'Europe/Berlin',
// IntlDateFormatter::FULL,
// IntlDateFormatter::FULL,
// $date,
// 'Dienstag, 3. Juli 2012 00:44:03 Deutschland',
// ),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::FULL,
IntlDateFormatter::FULL,
$date,
),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::LONG,
IntlDateFormatter::LONG,
$date,
'3. Juli 2012 00:44:03 MESZ',
),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::MEDIUM,
IntlDateFormatter::MEDIUM,
$date,
'03.07.2012 00:44:03',
),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::SHORT,
IntlDateFormatter::SHORT,
$date,
'03.07.12 00:44',
),
// FULL format varies based on OS
// array(
// 'ru_RU',
// 'Europe/Moscow',
// IntlDateFormatter::FULL,
// IntlDateFormatter::FULL,
// $date,
// '3 июля 2012 г. 2:44:03 Россия (Москва)',
// ),
// LONG format varies based on OS for ru_RU locale
// array(
// 'ru_RU',
// 'Europe/Moscow',
// IntlDateFormatter::LONG,
// IntlDateFormatter::LONG,
// $date,
// '3 июля 2012 г. 2:44:03 GMT+04:00',
// ),
array(
'ru_RU',
'Europe/Moscow',
IntlDateFormatter::FULL,
IntlDateFormatter::FULL,
$date,
),
array(
'ru_RU',
'Europe/Moscow',
IntlDateFormatter::LONG,
IntlDateFormatter::LONG,
$date,
),
array(
'ru_RU',
'Europe/Moscow',
IntlDateFormatter::MEDIUM,
IntlDateFormatter::MEDIUM,
$date,
'03.07.2012 2:44:03',
),
array(
'ru_RU',
'Europe/Moscow',
IntlDateFormatter::SHORT,
IntlDateFormatter::SHORT,
$date,
'03.07.12 2:44',
),
// FULL format varies based on OS
// array(
// 'en_US',
// 'America/New_York',
// IntlDateFormatter::FULL,
// IntlDateFormatter::FULL,
// $date,
// 'Monday, July 2, 2012 6:44:03 PM ET',
// ),
array(
'en_US',
'America/New_York',
IntlDateFormatter::FULL,
IntlDateFormatter::FULL,
$date,
),
array(
'en_US',
'America/New_York',
IntlDateFormatter::LONG,
IntlDateFormatter::LONG,
$date,
'July 2, 2012 6:44:03 PM EDT',
),
array(
'en_US',
'America/New_York',
IntlDateFormatter::MEDIUM,
IntlDateFormatter::MEDIUM,
$date,
'Jul 2, 2012 6:44:03 PM',
),
array(
'en_US',
'America/New_York',
IntlDateFormatter::SHORT,
IntlDateFormatter::SHORT,
$date,
'7/2/12 6:44 PM',
),
);
}

public function dateTestsDataProviderWithPattern()
{
$date = new DateTime('2012-07-02T22:44:03Z');

return array(
// FULL format varies based on OS
// array(
// 'de_DE',
// 'Europe/Berlin',
// IntlDateFormatter::FULL,
// IntlDateFormatter::FULL,
// $date,
// 'Dienstag, 3. Juli 2012 00:44:03 Deutschland',
// ),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::FULL,
IntlDateFormatter::FULL,
'dd-MM',
$date,
),
array(
'de_DE',
'Europe/Berlin',
null,
null,
'MMMM',
$date,
'Juli',
),
array(
'de_DE',
Expand All @@ -189,7 +173,6 @@ public function dateTestsDataProviderWithPattern()
null,
'MMMM.Y',
$date,
'Juli.2012',
),
array(
'de_DE',
Expand All @@ -198,17 +181,21 @@ public function dateTestsDataProviderWithPattern()
null,
'dd/Y',
$date,
'03/2012',
),
);
}

/**
* @dataProvider dateTestsDataProvider
*/
public function testBasic($locale, $timezone, $timeType, $dateType, $date, $expected)
public function testBasic($locale, $timezone, $timeType, $dateType, $date)
{
$this->helper->setTimezone($timezone);
$this->helper
->setTimezone($timezone);

$expected = $this->getIntlDateFormatter($locale, $dateType, $timeType, $timezone)
->format($date->getTimestamp());

$this->assertMbStringEquals($expected, $this->helper->__invoke(
$date, $dateType, $timeType, $locale, null
));
Expand All @@ -217,12 +204,15 @@ public function testBasic($locale, $timezone, $timeType, $dateType, $date, $expe
/**
* @dataProvider dateTestsDataProvider
*/
public function testSettersProvideDefaults($locale, $timezone, $timeType, $dateType, $date, $expected)
public function testSettersProvideDefaults($locale, $timezone, $timeType, $dateType, $date)
{
$this->helper
->setTimezone($timezone)
->setLocale($locale);

$expected = $this->getIntlDateFormatter($locale, $dateType, $timeType, $timezone)
->format($date->getTimestamp());

$this->assertMbStringEquals($expected, $this->helper->__invoke(
$date, $dateType, $timeType
));
Expand All @@ -231,9 +221,14 @@ public function testSettersProvideDefaults($locale, $timezone, $timeType, $dateT
/**
* @dataProvider dateTestsDataProviderWithPattern
*/
public function testUseCustomPattern($locale, $timezone, $timeType, $dateType, $pattern, $date, $expected)
public function testUseCustomPattern($locale, $timezone, $timeType, $dateType, $pattern, $date)
{
$this->helper->setTimezone($timezone);
$this->helper
->setTimezone($timezone);

$expected = $this->getIntlDateFormatter($locale, $dateType, $timeType, $timezone, $pattern)
->format($date->getTimestamp());

$this->assertMbStringEquals($expected, $this->helper->__invoke(
$date, $dateType, $timeType, $locale, $pattern
));
Expand All @@ -260,4 +255,9 @@ public function assertMbStringEquals($expected, $test, $message = '')
$test = str_replace(array("\xC2\xA0", ' '), '', $test);
$this->assertEquals($expected, $test, $message);
}

public function getIntlDateFormatter($locale, $dateType, $timeType, $timezone, $pattern=null)
{
return new IntlDateFormatter($locale, $dateType, $timeType, $timezone, null, $pattern);
}
}

0 comments on commit 910bbbf

Please sign in to comment.