summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-22 15:42:49 -0700
committerElliott Hughes <enh@google.com>2014-08-22 15:42:49 -0700
commitc56ec7b571ba6cc02ae9c1b5a790b7141b4de394 (patch)
treef8691c147ae23ddabfdc0704e1e4c578cfc6ca40
parent014531bf3d38103d860f942f5bec45bdf31c75fa (diff)
downloadlibcore-c56ec7b571ba6cc02ae9c1b5a790b7141b4de394.zip
libcore-c56ec7b571ba6cc02ae9c1b5a790b7141b4de394.tar.gz
libcore-c56ec7b571ba6cc02ae9c1b5a790b7141b4de394.tar.bz2
Fix the Turkish Lira test.
Turkey switched from "123,45 TL" to "₺123,45" in 2012. It's taken a while for our font to catch up, but now it has. Bug: 16727554 Change-Id: I3c80f95d5f620c905247c9f227171717180106b4
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/text/Support_DecimalFormat.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/Support_DecimalFormat.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/Support_DecimalFormat.java
index 9a55bc3..b8d7519 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/Support_DecimalFormat.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/Support_DecimalFormat.java
@@ -76,11 +76,13 @@ public class Support_DecimalFormat extends Support_Format {
// test currency instance with TR Locale
number = new Double(350.76);
format = (DecimalFormat) NumberFormat.getCurrencyInstance(new Locale("tr", "TR"));
- text = "350,76" + "\u00a0" + "TL";
- t_FormatWithField(22, format, number, text, NumberFormat.Field.INTEGER, 0, 3);
- t_FormatWithField(22, format, number, text, NumberFormat.Field.DECIMAL_SEPARATOR, 3, 4);
- t_FormatWithField(22, format, number, text, NumberFormat.Field.FRACTION, 4, 6);
- t_FormatWithField(23, format, number, text, NumberFormat.Field.CURRENCY, 7, 9);
+ // Turkey either uses "123,45 TL" or "₺123,45"; google3 uses the former because most
+ // platforms' fonts don't include U+20BA TURKISH LIRA SIGN. http://b/16727554.
+ text = "₺350,76";
+ t_FormatWithField(23, format, number, text, NumberFormat.Field.CURRENCY, 0, 1);
+ t_FormatWithField(22, format, number, text, NumberFormat.Field.INTEGER, 1, 4);
+ t_FormatWithField(22, format, number, text, NumberFormat.Field.DECIMAL_SEPARATOR, 4, 5);
+ t_FormatWithField(22, format, number, text, NumberFormat.Field.FRACTION, 5, 7);
// test fields that are not included in the formatted text
t_FormatWithField(25, format, number, text, NumberFormat.Field.GROUPING_SEPARATOR, 0, 0);