From 5ea819f80c6840c492386bfafbffb059c7e2091f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 23 Oct 2012 10:25:11 +0200 Subject: Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit.org/repository/webkit/trunk@132191) New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal --- .../WebKit/chromium/tests/LocalizedDateICUTest.cpp | 28 ++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp') diff --git a/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp b/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp index 88946e84d..03d0e1340 100644 --- a/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp +++ b/Source/WebKit/chromium/tests/LocalizedDateICUTest.cpp @@ -118,6 +118,12 @@ protected: return locale->shortStandAloneMonthLabels()[index]; } + String standAloneMonthLabel(const char* localeString, unsigned index) + { + OwnPtr locale = LocaleICU::create(localeString); + return locale->standAloneMonthLabels()[index]; + } + Labels timeAMPMLabels(const char* localeString) { OwnPtr locale = LocaleICU::create(localeString); @@ -146,8 +152,8 @@ TEST_F(LocalizedDateICUTest, isRTL) TEST_F(LocalizedDateICUTest, monthFormat) { - EXPECT_STREQ("MMM yyyy", monthFormat("en_US").utf8().data()); - EXPECT_STREQ("MMM yyyy", monthFormat("fr").utf8().data()); + EXPECT_STREQ("MMMM yyyy", monthFormat("en_US").utf8().data()); + EXPECT_STREQ("MMMM yyyy", monthFormat("fr").utf8().data()); EXPECT_STREQ("yyyy\xE5\xB9\xB4M\xE6\x9C\x88", monthFormat("ja").utf8().data()); } @@ -166,6 +172,24 @@ TEST_F(LocalizedDateICUTest, localizedShortDateFormatText) EXPECT_STREQ("H:mm", localizedShortDateFormatText("ja").utf8().data()); } +TEST_F(LocalizedDateICUTest, standAloneMonthLabels) +{ + EXPECT_STREQ("January", standAloneMonthLabel("en_US", 0).utf8().data()); + EXPECT_STREQ("June", standAloneMonthLabel("en_US", 5).utf8().data()); + EXPECT_STREQ("December", standAloneMonthLabel("en_US", 11).utf8().data()); + + EXPECT_STREQ("janvier", standAloneMonthLabel("fr_FR", 0).utf8().data()); + EXPECT_STREQ("juin", standAloneMonthLabel("fr_FR", 5).utf8().data()); + EXPECT_STREQ("d\xC3\xA9" "cembre", standAloneMonthLabel("fr_FR", 11).utf8().data()); + + EXPECT_STREQ("1\xE6\x9C\x88", standAloneMonthLabel("ja_JP", 0).utf8().data()); + EXPECT_STREQ("6\xE6\x9C\x88", standAloneMonthLabel("ja_JP", 5).utf8().data()); + EXPECT_STREQ("12\xE6\x9C\x88", standAloneMonthLabel("ja_JP", 11).utf8().data()); + + EXPECT_STREQ("\xD0\x9C\xD0\xB0\xD1\x80\xD1\x82", standAloneMonthLabel("ru_RU", 2).utf8().data()); + EXPECT_STREQ("\xD0\x9C\xD0\xB0\xD0\xB9", standAloneMonthLabel("ru_RU", 4).utf8().data()); +} + TEST_F(LocalizedDateICUTest, shortMonthLabels) { EXPECT_STREQ("Jan", shortMonthLabel("en_US", 0).utf8().data()); -- cgit v1.2.1