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

8255671: Bidi.reorderVisually has misleading exception messages

Browse Source 
Reviewed-by: joehw
This commit is contained in:
Naoto Sato 2020-11-02 16:48:16 +00:00
parent 2f7d34f205
commit 6dac8d2780
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
View File

@ -4590,13 +4590,13 @@ public class BidiBase {
} }
if (0 > objectStart || objects.length <= objectStart) { if (0 > objectStart || objects.length <= objectStart) {
throw new IllegalArgumentException("Value objectStart " + throw new IllegalArgumentException("Value objectStart " +
levelStart + " is out of range 0 to " + objectStart + " is out of range 0 to " +
(objects.length-1)); (objects.length-1));
} }
if (0 > count || objects.length < (objectStart+count)) { if (0 > count || objects.length < (objectStart+count)) {
throw new IllegalArgumentException("Value count " + throw new IllegalArgumentException("Value count " +
levelStart + " is out of range 0 to " + count + " is less than zero, or objectStart + count" +
(objects.length - objectStart)); " is beyond objects length " + objects.length);
} }
byte[] reorderLevels = new byte[count]; byte[] reorderLevels = new byte[count];

32
test/jdk/java/text/Bidi/BidiConformance.java
View File

@ -1246,6 +1246,11 @@ public class BidiConformance {
"when levelStart is -1."); "when levelStart is -1.");
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
if (!e.getMessage().equals(
"Value levelStart -1 is out of range 0 to " + (llen - 1))) {
errorHandling("reorderVisually() should throw an IAE" +
" mentioning levelStart is beyond the levels range. Message: " + e.getMessage());
}
} }
catch (ArrayIndexOutOfBoundsException e) { catch (ArrayIndexOutOfBoundsException e) {
errorHandling("reorderVisually() should not throw an AIOoBE " + errorHandling("reorderVisually() should not throw an AIOoBE " +
@ -1258,6 +1263,11 @@ public class BidiConformance {
"when levelStart is 6(levels.length)."); "when levelStart is 6(levels.length).");
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
if (!e.getMessage().equals(
"Value levelStart " + llen + " is out of range 0 to " + (llen - 1))) {
errorHandling("reorderVisually() should throw an IAE" +
" mentioning levelStart is beyond the levels range. Message: " + e.getMessage());
}
} }
catch (ArrayIndexOutOfBoundsException e) { catch (ArrayIndexOutOfBoundsException e) {
errorHandling("reorderVisually() should not throw an AIOoBE " + errorHandling("reorderVisually() should not throw an AIOoBE " +
@ -1278,6 +1288,11 @@ public class BidiConformance {
" when objectStart is -1."); " when objectStart is -1.");
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
if (!e.getMessage().equals(
"Value objectStart -1 is out of range 0 to " + (olen - 1))) {
errorHandling("reorderVisually() should throw an IAE" +
" mentioning objectStart is beyond the objects range. Message: " + e.getMessage());
}
} }
catch (ArrayIndexOutOfBoundsException e) { catch (ArrayIndexOutOfBoundsException e) {
errorHandling("reorderVisually() should not throw an AIOoBE " + errorHandling("reorderVisually() should not throw an AIOoBE " +
@ -1290,6 +1305,11 @@ public class BidiConformance {
"when objectStart is 6(objects.length)."); "when objectStart is 6(objects.length).");
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
if (!e.getMessage().equals(
"Value objectStart 6 is out of range 0 to " + (olen - 1))) {
errorHandling("reorderVisually() should throw an IAE" +
" mentioning objectStart is beyond the objects range. Message: " + e.getMessage());
}
} }
try { try {
@ -1298,6 +1318,12 @@ public class BidiConformance {
"when count is -1."); "when count is -1.");
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
if (!e.getMessage().equals(
"Value count -1 is less than zero, or objectStart + count " +
"is beyond objects length " + olen)) {
errorHandling("reorderVisually() should throw an IAE" +
" mentioning objectStart/count is beyond the objects range. Message: " + e.getMessage());
}
} }
catch (NegativeArraySizeException e) { catch (NegativeArraySizeException e) {
errorHandling("reorderVisually() should not throw an NASE " + errorHandling("reorderVisually() should not throw an NASE " +
@ -1310,6 +1336,12 @@ public class BidiConformance {
"when count is 7(objects.length+1)."); "when count is 7(objects.length+1).");
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
if (!e.getMessage().equals(
"Value count " + (count + 1) + " is less than zero, or objectStart + count " +
"is beyond objects length " + olen)) {
errorHandling("reorderVisually() should throw an IAE" +
" mentioning objectStart/count is beyond the objects range. Message: " + e.getMessage());
}
} }
catch (ArrayIndexOutOfBoundsException e) { catch (ArrayIndexOutOfBoundsException e) {
errorHandling("reorderVisually() should not throw an AIOoBE " + errorHandling("reorderVisually() should not throw an AIOoBE " +