Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(437)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/payments/currency_formatter_unittest.cc

Issue 2629883004: [Payment Request] Update the CurrencyStringFormatter to call the native impl. (Closed)
Patch Set: CurrencyStringFormatter -> CurrencyFormatter Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/payments/currency_formatter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/payments/currency_formatter_unittest.cc
diff --git a/components/payments/currency_formatter_unittest.cc b/components/payments/currency_formatter_unittest.cc
index 02e6cfb7f8ad8f43d438305c382fcd43ddecf052..ad679c6246006a1b6a7eebe5b065c9a7f73a4066 100644
--- a/components/payments/currency_formatter_unittest.cc
+++ b/components/payments/currency_formatter_unittest.cc
@@ -17,11 +17,13 @@ struct TestCase {
const char* currency_code,
const char* locale_name,
const std::string& expected_amount,
+ const char* expected_currency_code,
const char* currency_system = kIso4217CurrencySystem)
: amount(amount),
currency_code(currency_code),
locale_name(locale_name),
expected_amount(expected_amount),
+ expected_currency_code(expected_currency_code),
currency_system(currency_system) {}
~TestCase() {}
@@ -29,6 +31,7 @@ struct TestCase {
const char* const currency_code;
const char* const locale_name;
const std::string expected_amount;
+ const char* const expected_currency_code;
const base::Optional<std::string> currency_system;
};
@@ -51,82 +54,125 @@ TEST_P(PaymentsCurrencyFormatterTest, IsValidCurrencyFormat) {
EXPECT_EQ(converted, output_amount)
<< "Failed to convert " << GetParam().amount << " ("
<< GetParam().currency_code << ") in " << GetParam().locale_name;
+ EXPECT_EQ(GetParam().expected_currency_code,
+ formatter.formatted_currency_code());
}
INSTANTIATE_TEST_CASE_P(
CurrencyAmounts,
PaymentsCurrencyFormatterTest,
testing::Values(
- TestCase("55.00", "USD", "en_US", "$55.00"),
- TestCase("55.00", "USD", "en_CA", "$55.00"),
- TestCase("55.00", "USD", "fr_CA", "55,00 $"),
- TestCase("55.00", "USD", "fr_FR", "55,00 $"),
- TestCase("1234", "USD", "fr_FR", "1 234,00 $"),
-
- TestCase("55.5", "USD", "en_US", "$55.50"),
- TestCase("55", "USD", "en_US", "$55.00"),
- TestCase("123", "USD", "en_US", "$123.00"),
- TestCase("1234", "USD", "en_US", "$1,234.00"),
- TestCase("0.1234", "USD", "en_US", "$0.1234"),
-
- TestCase("55.00", "EUR", "en_US", "€55.00"),
- TestCase("55.00", "EUR", "fr_CA", "55,00 €"),
- TestCase("55.00", "EUR", "fr_FR", "55,00 €"),
-
- TestCase("55.00", "CAD", "en_US", "$55.00"),
- TestCase("55.00", "CAD", "en_CA", "$55.00"),
- TestCase("55.00", "CAD", "fr_CA", "55,00 $"),
- TestCase("55.00", "CAD", "fr_FR", "55,00 $"),
-
- TestCase("55.00", "BRL", "en_US", "R$55.00"),
- TestCase("55.00", "BRL", "fr_CA", "55,00 R$"),
- TestCase("55.00", "BRL", "pt_BR", "R$55,00"),
-
- TestCase("55.00", "RUB", "en_US", "55.00"),
- TestCase("55.00", "RUB", "fr_CA", "55,00"),
- TestCase("55.00", "RUB", "ru_RU", "55,00 ₽"),
-
- TestCase("55", "JPY", "ja_JP", "￥55"),
- TestCase("55.0", "JPY", "ja_JP", "￥55"),
- TestCase("55.00", "JPY", "ja_JP", "￥55"),
- TestCase("55.12", "JPY", "ja_JP", "￥55.12"),
- TestCase("55.49", "JPY", "ja_JP", "￥55.49"),
- TestCase("55.50", "JPY", "ja_JP", "￥55.5"),
- TestCase("55.9999", "JPY", "ja_JP", "￥55.9999"),
+ TestCase("55.00", "USD", "en_US", "$55.00", "USD"),
+ TestCase("55.00", "USD", "en_CA", "$55.00", "USD"),
+ TestCase("55.00", "USD", "fr_CA", "55,00 $", "USD"),
+ TestCase("55.00", "USD", "fr_FR", "55,00 $", "USD"),
+ TestCase("1234", "USD", "fr_FR", "1 234,00 $", "USD"),
+
+ TestCase("55.5", "USD", "en_US", "$55.50", "USD"),
+ TestCase("55", "USD", "en_US", "$55.00", "USD"),
+ TestCase("123", "USD", "en_US", "$123.00", "USD"),
+ TestCase("1234", "USD", "en_US", "$1,234.00", "USD"),
+ TestCase("0.1234", "USD", "en_US", "$0.1234", "USD"),
+
+ TestCase("55.00", "EUR", "en_US", "€55.00", "EUR"),
+ TestCase("55.00", "EUR", "fr_CA", "55,00 €", "EUR"),
+ TestCase("55.00", "EUR", "fr_FR", "55,00 €", "EUR"),
+
+ TestCase("55.00", "CAD", "en_US", "$55.00", "CAD"),
+ TestCase("55.00", "CAD", "en_CA", "$55.00", "CAD"),
+ TestCase("55.00", "CAD", "fr_CA", "55,00 $", "CAD"),
+ TestCase("55.00", "CAD", "fr_FR", "55,00 $", "CAD"),
+
+ TestCase("55.00", "BRL", "en_US", "R$55.00", "BRL"),
+ TestCase("55.00", "BRL", "fr_CA", "55,00 R$", "BRL"),
+ TestCase("55.00", "BRL", "pt_BR", "R$55,00", "BRL"),
+
+ TestCase("55.00", "RUB", "en_US", "55.00", "RUB"),
+ TestCase("55.00", "RUB", "fr_CA", "55,00", "RUB"),
+ TestCase("55.00", "RUB", "ru_RU", "55,00 ₽", "RUB"),
+
+ TestCase("55", "JPY", "ja_JP", "￥55", "JPY"),
+ TestCase("55.0", "JPY", "ja_JP", "￥55", "JPY"),
+ TestCase("55.00", "JPY", "ja_JP", "￥55", "JPY"),
+ TestCase("55.12", "JPY", "ja_JP", "￥55.12", "JPY"),
+ TestCase("55.49", "JPY", "ja_JP", "￥55.49", "JPY"),
+ TestCase("55.50", "JPY", "ja_JP", "￥55.5", "JPY"),
+ TestCase("55.9999", "JPY", "ja_JP", "￥55.9999", "JPY"),
// Unofficial ISO 4217 currency code.
- TestCase("55.00", "BTC", "en_US", "55.00"),
- TestCase("-0.0000000001", "BTC", "en_US", "-0.0000000001"),
- TestCase("-55.00", "BTC", "fr_FR", "-55,00"),
+ TestCase("55.00", "BTC", "en_US", "55.00", "BTC"),
+ TestCase("-0.0000000001", "BTC", "en_US", "-0.0000000001", "BTC"),
+ TestCase("-55.00", "BTC", "fr_FR", "-55,00", "BTC"),
// Any string of at most 2048 characters can be a valid currency code.
- TestCase("55.00", "", "en_US", "55.00"),
- TestCase("55,00", "", "fr_CA", "55,00"),
- TestCase("55,00", "", "fr-CA", "55,00"),
- TestCase("55.00", "ABCDEF", "en_US", "55.00"),
+ TestCase("55.00", "", "en_US", "55.00", ""),
+ TestCase("55,00", "", "fr_CA", "55,00", ""),
+ TestCase("55,00", "", "fr-CA", "55,00", ""),
+ TestCase("55.00", "ABCDEF", "en_US", "55.00", "ABCDE\xE2\x80\xA6"),
// Edge cases.
- TestCase("", "", "", ""),
- TestCase("-1", "", "", "- 1.00"),
- TestCase("-1.1255", "", "", "- 1.1255"),
+ TestCase("", "", "", "", ""),
+ TestCase("-1", "", "", "- 1.00", ""),
+ TestCase("-1.1255", "", "", "- 1.1255", ""),
// Handles big numbers.
TestCase(
"123456789012345678901234567890.123456789012345678901234567890",
"USD",
"fr_FR",
- "123 456 789 012 345 678 901 234 567 890,123456789 $"),
+ "123 456 789 012 345 678 901 234 567 890,123456789 $",
+ "USD"),
// When the currency system is not ISO4217, only the amount is formatted
// using the locale (there is no other indication of currency).
- TestCase("55.00", "USD", "en_CA", "55.00", "http://currsystem.com"),
- TestCase("55.00", "USD", "fr_CA", "55,00", "http://currsystem.com"),
- TestCase("55.00", "USD", "fr_FR", "55,00", "http://currsystem.com"),
- TestCase("1234", "USD", "fr_FR", "1 234,00", "http://currsystem.com"),
- TestCase("55.5", "USD", "en_US", "55.50", "http://currsystem.com"),
- TestCase("55", "CAD", "en_US", "55.00", "http://currsystem.com"),
- TestCase("123", "BTC", "en_US", "123.00", "http://currsystem.com"),
- TestCase("1234", "JPY", "en_US", "1,234.00", "http://currsystem.com"),
- TestCase("0.1234", "USD", "en_US", "0.1234", "http://currsystem.com")));
+ TestCase("55.00",
+ "USD",
+ "en_CA",
+ "55.00",
+ "USD",
+ "http://currsystem.com"),
+ TestCase("55.00",
+ "USD",
+ "fr_CA",
+ "55,00",
+ "USD",
+ "http://currsystem.com"),
+ TestCase("55.00",
+ "USD",
+ "fr_FR",
+ "55,00",
+ "USD",
+ "http://currsystem.com"),
+ TestCase("1234",
+ "USD",
+ "fr_FR",
+ "1 234,00",
+ "USD",
+ "http://currsystem.com"),
+ TestCase("55.5",
+ "USD",
+ "en_US",
+ "55.50",
+ "USD",
+ "http://currsystem.com"),
+ TestCase("55", "CAD", "en_US", "55.00", "CAD", "http://currsystem.com"),
+ TestCase("123",
+ "BTC",
+ "en_US",
+ "123.00",
+ "BTC",
+ "http://currsystem.com"),
+ TestCase("1234",
+ "JPY",
+ "en_US",
+ "1,234.00",
+ "JPY",
+ "http://currsystem.com"),
+ TestCase("0.1234",
+ "USD",
+ "en_US",
+ "0.1234",
+ "USD",
+ "http://currsystem.com")));
} // namespace payments
« no previous file with comments | « components/payments/currency_formatter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698