diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-23 00:26:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-23 00:26:13 +0000 |
| commit | f95ebb3f0030c471c4c31835a73898c279ae990d (patch) | |
| tree | 686601f4bafd4727f8e798938ece0208701c32fc /harmony-tests | |
| parent | e0f570cd22f949fc93108a8873eba438a0b514ac (diff) | |
| parent | 0048cedeee39348a30bbb12dcf723f9ba2f5ab31 (diff) | |
| download | libcore-f95ebb3f0030c471c4c31835a73898c279ae990d.zip libcore-f95ebb3f0030c471c4c31835a73898c279ae990d.tar.gz libcore-f95ebb3f0030c471c4c31835a73898c279ae990d.tar.bz2 | |
am 0048cede: am 8f16ce1e: Merge "Fix the Turkish Lira test." into lmp-dev
* commit '0048cedeee39348a30bbb12dcf723f9ba2f5ab31':
Fix the Turkish Lira test.
Diffstat (limited to 'harmony-tests')
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/text/Support_DecimalFormat.java | 12 |
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); |