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#1780 from Maks3w/patch-1
Browse files Browse the repository at this point in the history 
[I18n] Test optimization
  • Loading branch information
@weierophinney
weierophinney committed Jul 6, 2012
35 parents 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 + 140c5ca commit d03ce75
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions test/View/Helper/DateFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,38 +68,39 @@ public function tearDown()

public function currencyTestsDataProvider()
{
$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,
// new DateTime('2012-07-02T22:44:03Z'),
// $date,
// 'Dienstag, 3. Juli 2012 00:44:03 Deutschland',
// ),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::LONG,
IntlDateFormatter::LONG,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'3. Juli 2012 00:44:03 MESZ',
),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::MEDIUM,
IntlDateFormatter::MEDIUM,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'03.07.2012 00:44:03',
),
array(
'de_DE',
'Europe/Berlin',
IntlDateFormatter::SHORT,
IntlDateFormatter::SHORT,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'03.07.12 00:44',
),
// FULL format varies based on OS
Expand All @@ -108,7 +109,7 @@ public function currencyTestsDataProvider()
// 'Europe/Moscow',
// IntlDateFormatter::FULL,
// IntlDateFormatter::FULL,
// new DateTime('2012-07-02T22:44:03Z'),
// $date,
// '3 июля 2012 г. 2:44:03 Россия (Москва)',
// ),
// LONG format varies based on OS for ru_RU locale
Expand All @@ -117,23 +118,23 @@ public function currencyTestsDataProvider()
// 'Europe/Moscow',
// IntlDateFormatter::LONG,
// IntlDateFormatter::LONG,
// new DateTime('2012-07-02T22:44:03Z'),
// $date,
// '3 июля 2012 г. 2:44:03 GMT+04:00',
// ),
array(
'ru_RU',
'Europe/Moscow',
IntlDateFormatter::MEDIUM,
IntlDateFormatter::MEDIUM,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'03.07.2012 2:44:03',
),
array(
'ru_RU',
'Europe/Moscow',
IntlDateFormatter::SHORT,
IntlDateFormatter::SHORT,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'03.07.12 2:44',
),
// FULL format varies based on OS
Expand All @@ -142,31 +143,31 @@ public function currencyTestsDataProvider()
// 'America/New_York',
// IntlDateFormatter::FULL,
// IntlDateFormatter::FULL,
// new DateTime('2012-07-02T22:44:03Z'),
// $date,
// 'Monday, July 2, 2012 6:44:03 PM ET',
// ),
array(
'en_US',
'America/New_York',
IntlDateFormatter::LONG,
IntlDateFormatter::LONG,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'July 2, 2012 6:44:03 PM EDT',
),
array(
'en_US',
'America/New_York',
IntlDateFormatter::MEDIUM,
IntlDateFormatter::MEDIUM,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'Jul 2, 2012 6:44:03 PM',
),
array(
'en_US',
'America/New_York',
IntlDateFormatter::SHORT,
IntlDateFormatter::SHORT,
new DateTime('2012-07-02T22:44:03Z'),
$date,
'7/2/12 6:44 PM',
),
);
Expand Down

0 comments on commit d03ce75

Please sign in to comment.