infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8366400: JCK test api/java_text/DecimalFormat/Parse.html fails after JDK-8363972

Browse Source 
Reviewed-by: naoto
This commit is contained in:
Justin Lu 2025-09-03 21:58:26 +00:00
parent 431f467246
commit becc35f287
2 changed files with 63 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.base/share/classes/java/text/DecimalFormat.java
View File

@ -3517,13 +3517,14 @@ public class DecimalFormat extends NumberFormat {
var alen = affix.length();
var tlen = text.length();
// Verify position can fit length wise before checking char by char
if (position + alen > tlen || position < 0) {
return false;
}
if (alen == 0) {
// always match with an empty affix, as affix is optional
return true;
}
if (position >= tlen) {
return false;
}
if (parseStrict) {
return text.regionMatches(position, affix, 0, alen);
}

68
test/jdk/java/text/Format/NumberFormat/PositionTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -21,12 +21,6 @@
* questions.
*/
/**
* @test
* @bug 4109023 4153060 4153061
* @summary test ParsePosition and FieldPosition
* @run junit PositionTest
*/
/*
(C) Copyright Taligent, Inc. 1996 - All Rights Reserved
(C) Copyright IBM Corp. 1996 - All Rights Reserved
@ -39,15 +33,71 @@ attribution to Taligent may not be removed.
Taligent is a registered trademark of Taligent, Inc.
*/
import java.text.*;
import java.io.*;
/*
* @test
* @bug 4109023 4153060 4153061 8366400
* @summary test ParsePosition and FieldPosition
* @run junit PositionTest
*/
import org.junit.jupiter.api.Test;
import java.text.DecimalFormat;
import java.text.FieldPosition;
import java.text.NumberFormat;
import java.text.ParsePosition;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
public class PositionTest {
// Parsing text which contains un-parseable data, but the index
// begins at the valid portion. Ensure PP is properly updated.
@Test
public void modifiedPositionTest() {
var df = new DecimalFormat("YY#");
df.setStrict(false); // Lenient by default, set for test explicitness
var pp = new ParsePosition(9);
assertEquals(123L, assertDoesNotThrow(() -> df.parse("FOOBARBAZYY123", pp)));
assertEquals(-1, pp.getErrorIndex());
assertEquals(14, pp.getIndex());
}
// Clearly invalid index value that could not work under any scenarios
// Specifically, ensuring no SIOOBE during affix matching
@Test
public void invalidPositionParseTest() {
var df = new DecimalFormat();
df.setStrict(false); // Lenient by default, set for test explicitness
assertNull(assertDoesNotThrow(() -> df.parse("1", new ParsePosition(-1))));
assertNull(assertDoesNotThrow(() -> df.parse("1", new ParsePosition(Integer.MAX_VALUE))));
}
// When prefix matching, position + affix length is greater than parsed String length
// Ensure we do not index out of bounds of the length of the parsed String
@Test
public void prefixMatchingTest() {
var df = new DecimalFormat("ZZZ#;YYY#");
df.setStrict(false); // Lenient by default, set for test explicitness
// 0 + 3 > 2 = (pos + prefix > text)
assertNull(assertDoesNotThrow(() -> df.parse("Z1", new ParsePosition(0))));
assertNull(assertDoesNotThrow(() -> df.parse("Y1", new ParsePosition(0))));
}
// When suffix matching, position + affix length is greater than parsed String length
// Ensure we do not index out of bounds of the length of the parsed String
@Test
public void suffixMatchingTest() {
var df = new DecimalFormat("#ZZ;#YY");
df.setStrict(false); // Lenient by default, set for test explicitness
// Matches prefix properly first. Then 3 + 2 > 4 = (pos + suffix > text)
assertNull(assertDoesNotThrow(() -> df.parse("123Z", new ParsePosition(0))));
assertNull(assertDoesNotThrow(() -> df.parse("123Y", new ParsePosition(0))));
}
@Test
public void TestParsePosition() {
ParsePosition pp1 = new ParsePosition(0);