stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8333456: CompactNumberFormat integer parsing fails when string has no suffix

Browse Source 
Reviewed-by: naoto
This commit is contained in:
Justin Lu 2024-06-06 20:34:46 +00:00
parent 2a37764e74
commit 6238bc8da2
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java.base/share/classes/java/text/CompactNumberFormat.java
View File

@ -1736,7 +1736,7 @@ public final class CompactNumberFormat extends NumberFormat {
// If parse integer only is true and the parsing is broken at // If parse integer only is true and the parsing is broken at
// decimal point, then pass/ignore all digits and move pointer // decimal point, then pass/ignore all digits and move pointer
// at the start of suffix, to process the suffix part // at the start of suffix, to process the suffix part
if (isParseIntegerOnly() if (isParseIntegerOnly() && position < text.length()
&& text.charAt(position) == symbols.getDecimalSeparator()) { && text.charAt(position) == symbols.getDecimalSeparator()) {
position++; // Pass decimal character position++; // Pass decimal character
for (; position < text.length(); ++position) { for (; position < text.length(); ++position) {

26
test/jdk/java/text/Format/NumberFormat/LenientParseTest.java
View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8327640 8331485 * @bug 8327640 8331485 8333456
* @summary Test suite for NumberFormat parsing when lenient. * @summary Test suite for NumberFormat parsing when lenient.
* @run junit/othervm -Duser.language=en -Duser.country=US LenientParseTest * @run junit/othervm -Duser.language=en -Duser.country=US LenientParseTest
* @run junit/othervm -Duser.language=ja -Duser.country=JP LenientParseTest * @run junit/othervm -Duser.language=ja -Duser.country=JP LenientParseTest
@ -209,6 +209,18 @@ public class LenientParseTest {
assertEquals(expectedValue, successParse(cmpctFmt, toParse, toParse.length())); assertEquals(expectedValue, successParse(cmpctFmt, toParse, toParse.length()));
} }
// 8333456: Parse values with no compact suffix -> which allows parsing to iterate
// position to the same value as string length which throws
// StringIndexOutOfBoundsException upon charAt invocation
@ParameterizedTest
@MethodSource("compactValidNoSuffixParseStrings")
@EnabledIfSystemProperty(named = "user.language", matches = "en")
public void compactFmtSuccessParseIntOnlyTest(String toParse, double expectedValue) {
cmpctFmt.setParseIntegerOnly(true);
assertEquals(expectedValue, successParse(cmpctFmt, toParse, toParse.length()));
cmpctFmt.setParseIntegerOnly(false);
}
// ---- Helper test methods ---- // ---- Helper test methods ----
// Method is used when a String should parse successfully. This does not indicate // Method is used when a String should parse successfully. This does not indicate
@ -407,6 +419,18 @@ public class LenientParseTest {
); );
} }
// No compact suffixes
private static Stream<Arguments> compactValidNoSuffixParseStrings() {
return Stream.of(
Arguments.of("5", 5),
Arguments.of("50", 50),
Arguments.of("50.", 50),
Arguments.of("5,000", 5000),
Arguments.of("5,000.", 5000),
Arguments.of("5,000.00", 5000)
);
}
// Replace the grouping and decimal separators with localized variants // Replace the grouping and decimal separators with localized variants
// Used during localization of data // Used during localization of data
private static String localizeText(String text) { private static String localizeText(String text) {