summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 17:49:25 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 17:49:25 +0000
commit4672e7cac0ee05f86d516d7b23b75aa7c00a6879 (patch)
tree0f6aa1707725bcf8c1fa98b4cc034986b675b2ca
parenta84ffcbebc5e3d97141121d1060067820fadde60 (diff)
downloadchromium_src-4672e7cac0ee05f86d516d7b23b75aa7c00a6879.zip
chromium_src-4672e7cac0ee05f86d516d7b23b75aa7c00a6879.tar.gz
chromium_src-4672e7cac0ee05f86d516d7b23b75aa7c00a6879.tar.bz2
Fix the clang build by replacing EXPECT_EQ(false, ...) with EXPECT_FALSE(
BUG=none TEST=none TBR=hans Review URL: http://codereview.chromium.org/5812001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69014 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--app/l10n_util_unittest.cc94
1 files changed, 47 insertions, 47 deletions
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index 786f1f6..23ff698 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -339,55 +339,55 @@ TEST_F(L10nUtilTest, GetParentLocales) {
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"));
}