| Index: app/l10n_util_unittest.cc
|
| ===================================================================
|
| --- app/l10n_util_unittest.cc (revision 69004)
|
| +++ app/l10n_util_unittest.cc (working copy)
|
| @@ -339,55 +339,55 @@
|
|
|
| TEST_F(L10nUtilTest, IsValidLocaleSyntax) {
|
| // Test valid locales.
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("fr"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("de"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("pt"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zh"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("fil"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("haw"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en-US"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en_US"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en_GB"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("pt-BR"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zh_CN"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zh_Hans"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zh_Hans_CN"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zh_Hant"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zh_Hant_TW"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("fr_CA"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("i-klingon"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("es-419"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en_IE_PREEURO"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en_IE_u_cu_IEP"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("en_IE@currency=IEP"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("fr@x=y"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax("zn_CN@foo=bar"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax(
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("fr"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("de"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("pt"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zh"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("fil"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("haw"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en-US"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en_US"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en_GB"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("pt-BR"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zh_CN"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zh_Hans"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zh_Hans_CN"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zh_Hant"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zh_Hant_TW"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("fr_CA"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("i-klingon"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("es-419"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en_IE_PREEURO"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en_IE_u_cu_IEP"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("en_IE@currency=IEP"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("fr@x=y"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax("zn_CN@foo=bar"));
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax(
|
| "fr@collation=phonebook;calendar=islamic-civil"));
|
| - EXPECT_EQ(true, l10n_util::IsValidLocaleSyntax(
|
| + EXPECT_TRUE(l10n_util::IsValidLocaleSyntax(
|
| "sr_Latn_RS_REVISED@currency=USD"));
|
|
|
| // Test invalid locales.
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax(""));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("x"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("12"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("456"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("a1"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("enUS"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("zhcn"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en.US"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en#US"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("-en-US"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en-US-"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("123-en-US"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("Latin"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("German"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("pt--BR"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("sl-macedonia"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("@"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en-US@"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en-US@x"));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en-US@x="));
|
| - EXPECT_EQ(false, l10n_util::IsValidLocaleSyntax("en-US@=y"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax(""));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("x"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("12"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("456"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("a1"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("enUS"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("zhcn"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en.US"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en#US"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("-en-US"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US-"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("123-en-US"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("Latin"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("German"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("pt--BR"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("sl-macedonia"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("@"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x"));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x="));
|
| + EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@=y"));
|
| }
|
|
|