diff options
| author | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2015-01-30 12:42:12 +0100 |
|---|---|---|
| committer | Paweł Hajdan, Jr <phajdan.jr@chromium.org> | 2015-01-30 11:43:48 +0000 |
| commit | 8201598dd59fd92ee787ad9f1d875f78b759e8af (patch) | |
| tree | d48a77f564eab7b32126f49bac0919b2a72e8b30 /base/i18n | |
| parent | 7b613d01da37186001f542ce9a9341d6cd3cd8ce (diff) | |
| download | chromium_src-8201598dd59fd92ee787ad9f1d875f78b759e8af.zip chromium_src-8201598dd59fd92ee787ad9f1d875f78b759e8af.tar.gz chromium_src-8201598dd59fd92ee787ad9f1d875f78b759e8af.tar.bz2 | |
Clean up time_formatting_unittest.cc now that chromium icu has been updated
BUG=none
R=jshin@chromium.org
Review URL: https://codereview.chromium.org/878143002
Cr-Commit-Position: refs/heads/master@{#313900}
Diffstat (limited to 'base/i18n')
| -rw-r--r-- | base/i18n/time_formatting_unittest.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc index 03a3aa3..0c2a6e6 100644 --- a/base/i18n/time_formatting_unittest.cc +++ b/base/i18n/time_formatting_unittest.cc @@ -58,12 +58,7 @@ TEST(TimeFormattingTest, TimeFormatTimeOfDayDefault24h) { Time time(Time::FromLocalExploded(kTestDateTimeExploded)); string16 clock24h(ASCIIToUTF16("15:42")); -#if U_ICU_VERSION_MAJOR_NUM >= 50 string16 clock12h_pm(ASCIIToUTF16("3:42 pm")); -#else - // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50. - string16 clock12h_pm(ASCIIToUTF16("3:42 PM")); -#endif string16 clock12h(ASCIIToUTF16("3:42")); // The default is 24h clock. @@ -132,23 +127,11 @@ TEST(TimeFormattingTest, TimeFormatDateUS) { EXPECT_EQ(ASCIIToUTF16("Apr 30, 2011"), TimeFormatShortDate(time)); EXPECT_EQ(ASCIIToUTF16("4/30/11"), TimeFormatShortDateNumeric(time)); -#if U_ICU_VERSION_MAJOR_NUM >= 50 EXPECT_EQ(ASCIIToUTF16("4/30/11, 3:42:07 PM"), TimeFormatShortDateAndTime(time)); -#else - // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50. - EXPECT_EQ(ASCIIToUTF16("4/30/11 3:42:07 PM"), - TimeFormatShortDateAndTime(time)); -#endif -#if U_ICU_VERSION_MAJOR_NUM >= 50 EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011 at 3:42:07 PM"), TimeFormatFriendlyDateAndTime(time)); -#else - // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50. - EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011 3:42:07 PM"), - TimeFormatFriendlyDateAndTime(time)); -#endif EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011"), TimeFormatFriendlyDate(time)); |