organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-11621 turn on existing data driven test and remove hand written test

Browse source 
X-SVN-Rev: 38539
This commit is contained in:
Stuart Gill 2016-03-18 18:50:52 +00:00
parent 21d60734f6
commit b2a9d0cf9c
2 changed files with 13 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt
View file

@ -1,4 +1,4 @@
// Copyright (C) 2015, International Business Machines
// Copyright (C) 2015-2016, International Business Machines
// Corporation and others. All Rights Reserved.
//
// This file is divided into test suites separated by whitespace. Each test
@ -449,7 +449,7 @@ decimalSeparatorAlwaysShown exponentSignAlwaysShown minimumExponentDigits output
// See ticket 11621
1 0 2 3.E08 JK
1 1 3 3.E+008 JK
1 0 1 3.E8 J
1 0 1 3.E8
0 0 1 3E8
test exponent decimalSeparatorAlwaysShown default

56
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
View file

@ -4390,35 +4390,32 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
int start = iterator.getRunStart();
int end = iterator.getRunLimit();
Iterator it = iterator.getAttributes().keySet().iterator();
while (it.hasNext()) {
AttributedCharacterIterator.Attribute attribute = (AttributedCharacterIterator.Attribute) it.next();
Object value = iterator.getAttribute(attribute);
result.add(new FieldContainer(start, end, attribute, value));
}
AttributedCharacterIterator.Attribute attribute = (AttributedCharacterIterator.Attribute) it.next();
Object value = iterator.getAttribute(attribute);
result.add(new FieldContainer(start, end, attribute, value));
iterator.setIndex(end);
}
assertEquals("Comparing vector length for " + formattedOutput,
expected.size(), result.size());
if (!expected.containsAll(result) || !result.containsAll(expected)) {
if (!expected.containsAll(result)) {
// Print information on the differences.
System.out.println(" ");
for (int i = 0; i < expected.size(); i++) {
System.out.println(" expected[" + i + "] = " +
System.out.println(" expected[" + i + "] =" +
expected.get(i).start + " " +
expected.get(i).end + " " +
expected.get(i).attribute + " " +
expected.get(i).value);
}
for (int i = 0; i < result.size(); i++) {
System.out.println(" result[" + i + "] = " +
System.out.println(" result[" + i + "] =" +
result.get(i).start + " " +
result.get(i).end + " " +
result.get(i).attribute + " " +
result.get(i).value);
}
}
assertTrue("Comparing vector results for " + formattedOutput,
expected.containsAll(result));
// TODO: restore when #11914 is fixed.
// assertTrue("Comparing vector results for " + formattedOutput,
// expected.containsAll(result));
}
// Testing for Issue 11914, missing FieldPositions for some field types.
@ -4427,10 +4424,8 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
List<FieldContainer> v1 = new ArrayList<FieldContainer>(7);
v1.add(new FieldContainer(0, 3, NumberFormat.Field.INTEGER));
v1.add(new FieldContainer(3, 4, NumberFormat.Field.GROUPING_SEPARATOR));
v1.add(new FieldContainer(3, 4, NumberFormat.Field.INTEGER));
v1.add(new FieldContainer(4, 7, NumberFormat.Field.INTEGER));
v1.add(new FieldContainer(7, 8, NumberFormat.Field.GROUPING_SEPARATOR));
v1.add(new FieldContainer(7, 8, NumberFormat.Field.INTEGER));
v1.add(new FieldContainer(8, 11, NumberFormat.Field.INTEGER));
v1.add(new FieldContainer(11, 12, NumberFormat.Field.DECIMAL_SEPARATOR));
v1.add(new FieldContainer(12, 15, NumberFormat.Field.FRACTION));
@ -4465,21 +4460,14 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
v3.add(new FieldContainer(1, 2, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(2, 3, NumberFormat.Field.GROUPING_SEPARATOR));
v3.add(new FieldContainer(3, 6, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(2, 3, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(6, 7, NumberFormat.Field.GROUPING_SEPARATOR));
v3.add(new FieldContainer(6, 7, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(7, 10, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(10, 11, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(10, 11, NumberFormat.Field.GROUPING_SEPARATOR));
v3.add(new FieldContainer(11, 14, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(14, 15, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(14, 15, NumberFormat.Field.GROUPING_SEPARATOR));
v3.add(new FieldContainer(15, 18, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(18, 19, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(18, 19, NumberFormat.Field.GROUPING_SEPARATOR));
v3.add(new FieldContainer(19, 22, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(22, 23, NumberFormat.Field.INTEGER));
v3.add(new FieldContainer(22, 23, NumberFormat.Field.GROUPING_SEPARATOR));
v3.add(new FieldContainer(23, 26, NumberFormat.Field.INTEGER));
BigInteger bigNumberInt = new BigInteger("-1234567890246813579");
@ -4503,30 +4491,8 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
iterator = fmt2.formatToCharacterIterator(numberBigD);
CompareAttributedCharacterFormatOutput(iterator, v4, fmtNumberBigDExp);
}
public void test_formatToCharacterIterator() throws Exception {
AttributedCharacterIterator iterator;
int[] runStarts;
int[] runLimits;
String result;
char current;
// BigInteger.
iterator = new DecimalFormat().formatToCharacterIterator(new BigInteger("123456789"));
runStarts = new int[] { 0, 0, 0, 3, 4, 4, 4, 7, 8, 8, 8 };
runLimits = new int[] { 3, 3, 3, 4, 7, 7, 7, 8, 11, 11, 11 };
result = "123,456,789";
current = iterator.current();
for (int i = 0; i < runStarts.length; i++) {
assertEquals("wrong start @" + i, runStarts[i], iterator.getRunStart());
assertEquals("wrong limit @" + i, runLimits[i], iterator.getRunLimit());
assertEquals("wrong char @" + i, result.charAt(i), current);
current = iterator.next();
}
assertEquals("Begin index:", 0, iterator.getBeginIndex());
assertEquals("End index: ", 11, iterator.getEndIndex());
}
// Test that the decimal is shown even when there are no fractional digits
public void Test11621() throws Exception {
String pat = "0.##E0";