Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (132782 => 132783)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-29 10:52:29 UTC (rev 132782)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-29 10:53:06 UTC (rev 132783)
@@ -1,5 +1,24 @@
2012-10-29 Kent Tamura <[email protected]>
+ [Chromium] Merge LocalizedNumberICUTest into LocaleICUTest
+ https://bugs.webkit.org/show_bug.cgi?id=100648
+
+ Reviewed by Kentaro Hara.
+
+ LocalizedNumberICU was removed some months ago, and its features were
+ merged to LocaleICU. We merge the test too.
+
+ * WebKit.gypi: Remove LocalizedNumberICUTest.cpp
+ * tests/LocaleICUTest.cpp:
+ Move a #if because some headers are used unconditionally.
+ (testDecimalSeparator): Moved from LocalizedNumberICUTest.cpp.
+ (TEST_F): Ditto.
+ (testNumberIsReversible): Ditto.
+ (testNumbers): Ditto.
+ * tests/LocalizedNumberICUTest.cpp: Removed.
+
+2012-10-29 Kent Tamura <[email protected]>
+
[Chromium] Rename LocalizedDateICUTest.cpp to LocaleICUTest.cpp
https://bugs.webkit.org/show_bug.cgi?id=100643
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (132782 => 132783)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-10-29 10:52:29 UTC (rev 132782)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-10-29 10:53:06 UTC (rev 132783)
@@ -147,7 +147,6 @@
['os_posix==1 and OS!="mac"', {
'webkit_unittest_files': [
'tests/LocaleICUTest.cpp',
- 'tests/LocalizedNumberICUTest.cpp',
],
}],
['toolkit_uses_gtk == 1', {
Modified: trunk/Source/WebKit/chromium/tests/LocaleICUTest.cpp (132782 => 132783)
--- trunk/Source/WebKit/chromium/tests/LocaleICUTest.cpp 2012-10-29 10:52:29 UTC (rev 132782)
+++ trunk/Source/WebKit/chromium/tests/LocaleICUTest.cpp 2012-10-29 10:53:06 UTC (rev 132783)
@@ -29,7 +29,6 @@
*/
#include "config.h"
-#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
#include "LocaleICU.h"
#include <gtest/gtest.h>
@@ -87,6 +86,7 @@
return Labels(labels);
}
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
String monthFormat(const char* localeString)
{
OwnPtr<LocaleICU> locale = LocaleICU::create(localeString);
@@ -134,6 +134,7 @@
OwnPtr<LocaleICU> locale = LocaleICU::create(localeString);
return locale->isRTL();
}
+#endif
};
std::ostream& operator<<(std::ostream& os, const LocaleICUTest::Labels& labels)
@@ -141,6 +142,7 @@
return os << labels.toString().utf8().data();
}
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
TEST_F(LocaleICUTest, isRTL)
{
EXPECT_TRUE(isRTL("ar-EG"));
@@ -222,4 +224,59 @@
EXPECT_EQ(labels(String(jaAM), String(jaPM)), timeAMPMLabels("ja"));
}
+static String testDecimalSeparator(const AtomicString& localeIdentifier)
+{
+ OwnPtr<Locale> locale = Locale::create(localeIdentifier);
+ return locale->localizedDecimalSeparator();
+}
+
+TEST_F(LocaleICUTest, localizedDecimalSeparator)
+{
+ EXPECT_EQ(String("."), testDecimalSeparator("en_US"));
+ EXPECT_EQ(String(","), testDecimalSeparator("fr"));
+}
#endif
+
+void testNumberIsReversible(const AtomicString& localeIdentifier, const char* original, const char* shouldHave = 0)
+{
+ OwnPtr<Locale> locale = Locale::create(localeIdentifier);
+ String localized = locale->convertToLocalizedNumber(original);
+ if (shouldHave)
+ EXPECT_TRUE(localized.contains(shouldHave));
+ String converted = locale->convertFromLocalizedNumber(localized);
+ EXPECT_EQ(original, converted);
+}
+
+void testNumbers(const char* localeString)
+{
+ testNumberIsReversible(localeString, "123456789012345678901234567890");
+ testNumberIsReversible(localeString, "-123.456");
+ testNumberIsReversible(localeString, ".456");
+ testNumberIsReversible(localeString, "-0.456");
+}
+
+TEST_F(LocaleICUTest, reversible)
+{
+ testNumberIsReversible("en_US", "123456789012345678901234567890");
+ testNumberIsReversible("en_US", "-123.456", ".");
+ testNumberIsReversible("en_US", ".456", ".");
+ testNumberIsReversible("en_US", "-0.456", ".");
+
+ testNumberIsReversible("fr", "123456789012345678901234567890");
+ testNumberIsReversible("fr", "-123.456", ",");
+ testNumberIsReversible("fr", ".456", ",");
+ testNumberIsReversible("fr", "-0.456", ",");
+
+ // Persian locale has a negative prefix and a negative suffix.
+ testNumbers("fa");
+
+ // Test some of major locales.
+ testNumbers("ar");
+ testNumbers("de_DE");
+ testNumbers("es_ES");
+ testNumbers("ja_JP");
+ testNumbers("ko_KR");
+ testNumbers("zh_CN");
+ testNumbers("zh_HK");
+ testNumbers("zh_TW");
+}
Deleted: trunk/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp (132782 => 132783)
--- trunk/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp 2012-10-29 10:52:29 UTC (rev 132782)
+++ trunk/Source/WebKit/chromium/tests/LocalizedNumberICUTest.cpp 2012-10-29 10:53:06 UTC (rev 132783)
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "LocaleICU.h"
-#include <gtest/gtest.h>
-#include <wtf/PassOwnPtr.h>
-
-using namespace WebCore;
-
-void testNumberIsReversible(const AtomicString& localeIdentifier, const char* original, const char* shouldHave = 0)
-{
- OwnPtr<Locale> locale = Locale::create(localeIdentifier);
- String localized = locale->convertToLocalizedNumber(original);
- if (shouldHave)
- EXPECT_TRUE(localized.contains(shouldHave));
- String converted = locale->convertFromLocalizedNumber(localized);
- EXPECT_EQ(original, converted);
-}
-
-void testNumbers(const char* localeString)
-{
- testNumberIsReversible(localeString, "123456789012345678901234567890");
- testNumberIsReversible(localeString, "-123.456");
- testNumberIsReversible(localeString, ".456");
- testNumberIsReversible(localeString, "-0.456");
-}
-
-TEST(LocalizedNumberICUTest, Reversible)
-{
- testNumberIsReversible("en_US", "123456789012345678901234567890");
- testNumberIsReversible("en_US", "-123.456", ".");
- testNumberIsReversible("en_US", ".456", ".");
- testNumberIsReversible("en_US", "-0.456", ".");
-
- testNumberIsReversible("fr", "123456789012345678901234567890");
- testNumberIsReversible("fr", "-123.456", ",");
- testNumberIsReversible("fr", ".456", ",");
- testNumberIsReversible("fr", "-0.456", ",");
-
- // Persian locale has a negative prefix and a negative suffix.
- testNumbers("fa");
-
- // Test some of major locales.
- testNumbers("ar");
- testNumbers("de_DE");
- testNumbers("es_ES");
- testNumbers("ja_JP");
- testNumbers("ko_KR");
- testNumbers("zh_CN");
- testNumbers("zh_HK");
- testNumbers("zh_TW");
-}
-
-#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
-
-static String testDecimalSeparator(const AtomicString& localeIdentifier)
-{
- OwnPtr<Locale> locale = Locale::create(localeIdentifier);
- return locale->localizedDecimalSeparator();
-}
-
-TEST(LocalizedNumberICUTest, localizedDecimalSeparator)
-{
- EXPECT_EQ(String("."), testDecimalSeparator("en_US"));
- EXPECT_EQ(String(","), testDecimalSeparator("fr"));
-}
-
-#endif
