AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-13740 Require "breaks" column to be last; allows for easier searching of the file since all IDs are guaranteed to be at the end of a line.

Browse Source 
X-SVN-Rev: 41402
This commit is contained in:
Shane Carr 2018-05-17 06:28:27 +00:00
parent 8ce0b6812b
commit 12413cde6d
3 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
icu4c/source/test/testdata/numberformattestspecification.txt vendored
View File

@ -470,12 +470,20 @@ set pattern 0
set format 123456789
set useGrouping 1
begin
output grouping breaks grouping2 minGroupingDigits
output grouping grouping2 breaks
1,2345,6789 4
1,23,45,6789 4 K 2
1,23,45,6789 4 K 2 2
123,456789 6 6 3
123456789 6 HK 6 4
1,23,45,6789 4 2 K
test grouping setters with min grouping digits
set locale en_US
set pattern 0
set format 123456789
set useGrouping 1
begin
output grouping grouping2 minGroupingDigits breaks
1,23,45,6789 4 2 2 K
123,456789 6 6 3
123456789 6 6 4 HK
test multiplier setters
set locale en_US
@ -520,10 +528,10 @@ set locale en_US
set pattern 0.00
set format 186283
begin
output breaks useScientific
output useScientific breaks
186283.00
1.86E5 K 1
186283.00 0
1.86E5 1 K
186283.00 0
test rounding mode setters
set locale en_US
@ -596,11 +604,11 @@ test exponent decimalSeparatorAlwaysShown default
set locale en_US
set pattern 0.##E0
begin
format output breaks decimalSeparatorAlwaysShown
format output decimalSeparatorAlwaysShown breaks
// decimalSeparatorAlwaysShown off by default
299792458 3E8
299000000 2.99E8
299792458 3.E8 1
299792458 3.E8 1
test pad position setters
set locale en_US

28
icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt
View File

@ -470,12 +470,20 @@ set pattern 0
set format 123456789
set useGrouping 1
begin
output grouping breaks grouping2 minGroupingDigits
output grouping grouping2 breaks
1,2345,6789 4
1,23,45,6789 4 K 2
1,23,45,6789 4 K 2 2
123,456789 6 6 3
123456789 6 HK 6 4
1,23,45,6789 4 2 K
test grouping setters with min grouping digits
set locale en_US
set pattern 0
set format 123456789
set useGrouping 1
begin
output grouping grouping2 minGroupingDigits breaks
1,23,45,6789 4 2 2 K
123,456789 6 6 3
123456789 6 6 4 HK
test multiplier setters
set locale en_US
@ -520,10 +528,10 @@ set locale en_US
set pattern 0.00
set format 186283
begin
output breaks useScientific
output useScientific breaks
186283.00
1.86E5 K 1
186283.00 0
1.86E5 1 K
186283.00 0
test rounding mode setters
set locale en_US
@ -596,11 +604,11 @@ test exponent decimalSeparatorAlwaysShown default
set locale en_US
set pattern 0.##E0
begin
format output breaks decimalSeparatorAlwaysShown
format output decimalSeparatorAlwaysShown breaks
// decimalSeparatorAlwaysShown off by default
299792458 3E8
299000000 2.99E8
299792458 3.E8 1
299792458 3.E8 1
test pad position setters
set locale en_US

5
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DataDrivenNumberFormatTestUtility.java
View File

@ -201,6 +201,11 @@ public class DataDrivenNumberFormatTestUtility extends TestFmwk {
} else if (state == 1) {
columnNames = splitBy((char) 0x09);
state = 2;
// "breaks" column must be last!
if (columnNames.contains("breaks")
&& columnNames.indexOf("breaks") != columnNames.size() - 1) {
showError("'breaks' column must be last!");
}
// run the tests
} else {
int columnNamesSize = columnNames.size();