undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
41
test/jdk/java/text/Bidi/BidiBug.java
Normal file
41
test/jdk/java/text/Bidi/BidiBug.java
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
/*
|
||||
* Copyright (c) 2008, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 4827312 6850113
|
||||
* @summary verify that argument validity check is not fooled by overflow
|
||||
*/
|
||||
public class BidiBug {
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
byte buff[] = new byte[3000];
|
||||
java.text.Bidi bidi = new java.text.Bidi(new char[20],10,buff,Integer.MAX_VALUE-3,4,1);
|
||||
}
|
||||
catch (IllegalArgumentException e) {
|
||||
System.out.println("Passed: " + e);
|
||||
return; // success
|
||||
}
|
||||
throw new RuntimeException("Failed: Bidi didn't throw error, though we didn't crash either");
|
||||
}
|
||||
}
|
||||
2595
test/jdk/java/text/Bidi/BidiConformance.java
Normal file
2595
test/jdk/java/text/Bidi/BidiConformance.java
Normal file
File diff suppressed because it is too large
Load diff
137
test/jdk/java/text/Bidi/BidiEmbeddingTest.java
Normal file
137
test/jdk/java/text/Bidi/BidiEmbeddingTest.java
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
/*
|
||||
* Copyright (c) 2008, 2016, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 4396492 4396496 4778510 6850113
|
||||
* @summary verify that the embedding values processed by the bidi code use negative values to
|
||||
* indicate overrides, rather than using bit 7. Also tests Bidi without loading awt classes to
|
||||
* confirm that Bidi can be used without awt. Verify that embedding level 0 is properly mapped
|
||||
* to the base embedding level.
|
||||
* @modules java.desktop
|
||||
*/
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Frame;
|
||||
import java.awt.font.TextAttribute;
|
||||
import java.text.AttributedString;
|
||||
import java.text.Bidi;
|
||||
|
||||
public class BidiEmbeddingTest {
|
||||
public static void main(String[] args) {
|
||||
// to regress embedding test against old fix, call with an arg. A window will pop
|
||||
// up causing awt lib to be loaded so the vm won't die with the unsatisfied link error.
|
||||
if (args.length > 0) {
|
||||
Frame f = new Frame();
|
||||
f.setSize(300, 300);
|
||||
f.setBackground(Color.white);
|
||||
f.show();
|
||||
}
|
||||
|
||||
test1();
|
||||
test2();
|
||||
}
|
||||
|
||||
static void test1() {
|
||||
String target = "BACK WARDS";
|
||||
String str = "If this text is >" + target + "< the test passed.";
|
||||
int start = str.indexOf(target);
|
||||
int limit = start + target.length();
|
||||
|
||||
System.out.println("start: " + start + " limit: " + limit);
|
||||
|
||||
AttributedString astr = new AttributedString(str);
|
||||
astr.addAttribute(TextAttribute.BIDI_EMBEDDING,
|
||||
new Integer(-1),
|
||||
start,
|
||||
limit);
|
||||
|
||||
Bidi bidi = new Bidi(astr.getIterator());
|
||||
|
||||
for (int i = 0; i < bidi.getRunCount(); ++i) {
|
||||
System.out.println("run " + i +
|
||||
" from " + bidi.getRunStart(i) +
|
||||
" to " + bidi.getRunLimit(i) +
|
||||
" at level " + bidi.getRunLevel(i));
|
||||
}
|
||||
|
||||
System.out.println(bidi);
|
||||
|
||||
byte[] embs = new byte[str.length() + 3];
|
||||
for (int i = start + 1; i < limit + 1; ++i) {
|
||||
embs[i] = -1;
|
||||
}
|
||||
|
||||
Bidi bidi2 = new Bidi(str.toCharArray(), 0, embs, 1, str.length(), Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
|
||||
for (int i = 0; i < bidi2.getRunCount(); ++i) {
|
||||
System.out.println("run " + i +
|
||||
" from " + bidi2.getRunStart(i) +
|
||||
" to " + bidi2.getRunLimit(i) +
|
||||
" at level " + bidi2.getRunLevel(i));
|
||||
}
|
||||
|
||||
System.out.println(bidi2 + "\n");
|
||||
|
||||
if (bidi.getRunCount() != 3 || bidi2.getRunCount() != 3) {
|
||||
throw new Error("Bidi run count incorrect");
|
||||
} else {
|
||||
System.out.println("test1() passed.\n");
|
||||
}
|
||||
}
|
||||
|
||||
// make sure BIDI_EMBEDDING values of 0 are mapped to base run direction, instead of flagging an error.
|
||||
static void test2() {
|
||||
String target = "BACK WARDS";
|
||||
String str = "If this text is >" + target + "< the test passed.";
|
||||
int length = str.length();
|
||||
int start = str.indexOf(target);
|
||||
int limit = start + target.length();
|
||||
|
||||
System.out.println("start: " + start + " limit: " + limit);
|
||||
|
||||
AttributedString astr = new AttributedString(str);
|
||||
astr.addAttribute(TextAttribute.RUN_DIRECTION, TextAttribute.RUN_DIRECTION_RTL);
|
||||
|
||||
astr.addAttribute(TextAttribute.BIDI_EMBEDDING,
|
||||
new Integer(-3),
|
||||
start,
|
||||
limit);
|
||||
|
||||
Bidi bidi = new Bidi(astr.getIterator());
|
||||
|
||||
for (int i = 0; i < bidi.getRunCount(); ++i) {
|
||||
System.out.println("run " + i +
|
||||
" from " + bidi.getRunStart(i) +
|
||||
" to " + bidi.getRunLimit(i) +
|
||||
" at level " + bidi.getRunLevel(i));
|
||||
}
|
||||
|
||||
System.out.println(bidi + "\n");
|
||||
|
||||
if (bidi.getRunCount() != 6) { // runs of spaces and angles at embedding bound,s and final period, each get level 1
|
||||
throw new Error("Bidi embedding processing failed");
|
||||
} else {
|
||||
System.out.println("test2() passed.\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
103
test/jdk/java/text/Bidi/BidiSurrogateTest.java
Normal file
103
test/jdk/java/text/Bidi/BidiSurrogateTest.java
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
/*
|
||||
* Copyright (c) 2008, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 4888843
|
||||
* @summary verify that surrogate pairs representing codepoints with R or AL directionality
|
||||
* and correctly recognized and reordered.
|
||||
*/
|
||||
|
||||
import java.text.Bidi;
|
||||
|
||||
public class BidiSurrogateTest {
|
||||
private static final String RTLS = new String(Character.toChars(0x10800)); // surrogate code point with R directionality
|
||||
private static final String LTRS = new String(Character.toChars(0x107ff)); // surrogate code point with L directionality
|
||||
private static final String LRE = "\u202a";
|
||||
private static final String RLE = "\u202b";
|
||||
private static final String PDF = "\u202c";
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
new BidiSurrogateTest().test();
|
||||
}
|
||||
|
||||
void test() {
|
||||
test0();
|
||||
test1();
|
||||
}
|
||||
|
||||
void test0() {
|
||||
// test unpaired surrogates - should have L directionality
|
||||
testRequiresBidi("\ud800", false); // unpaired lead surrogate
|
||||
testRequiresBidi("\udc00", false); // unpaired trail surrogate
|
||||
testRequiresBidi("\udc00\ud800", false); // out of order surrogates
|
||||
testRequiresBidi("a\udc00b\ud800c", false); // out of order surrogates split
|
||||
testRequiresBidi(LTRS, false); // supplementary with L
|
||||
testRequiresBidi(RTLS, true); // supplementary with R
|
||||
testRequiresBidi("a" + RTLS + "b", true); // R supplementary in LTR text
|
||||
testRequiresBidi(LTRS + RTLS, true); // R supplementary in LTR supplementary text
|
||||
testRequiresBidi(LRE, false); // LRE lone embedding
|
||||
testRequiresBidi(RLE, true); // RLE lone embedding
|
||||
testRequiresBidi(PDF, false); // PDF lone pop embedding
|
||||
}
|
||||
|
||||
void testRequiresBidi(String string, boolean requiresBidi) {
|
||||
char[] text = string.toCharArray();
|
||||
if (Bidi.requiresBidi(text, 0, text.length) != requiresBidi) {
|
||||
throw new RuntimeException("testRequiresBidi failed with '" + string + "', " + requiresBidi);
|
||||
}
|
||||
}
|
||||
|
||||
void test1() {
|
||||
// test that strings with surrogate runs process surrogate directionality ok
|
||||
testBidi("This is a string with " + LTRS + " in it.", false);
|
||||
testBidi("This is a string with \ud800 in it.", false);
|
||||
testBidi("This is a string with \u0640 in it.", 22, 1);
|
||||
testBidi(RTLS, true);
|
||||
testBidi("This is a string with " + RTLS + RTLS + RTLS + " in it.", 22, 6);
|
||||
}
|
||||
|
||||
void testBidi(String string, boolean directionIsRTL) {
|
||||
Bidi bidi = new Bidi(string, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
|
||||
if (bidi.isMixed()) {
|
||||
throw new RuntimeException("bidi is mixed");
|
||||
}
|
||||
if (bidi.isRightToLeft() != directionIsRTL) {
|
||||
throw new RuntimeException("bidi is not " + (directionIsRTL ? "rtl" : "ltr"));
|
||||
}
|
||||
}
|
||||
|
||||
void testBidi(String string, int rtlstart, int rtllength) {
|
||||
Bidi bidi = new Bidi(string, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
|
||||
for (int i = 0; i < bidi.getRunCount(); ++i) {
|
||||
if ((bidi.getRunLevel(i) & 1) != 0) {
|
||||
if (bidi.getRunStart(i) != rtlstart ||
|
||||
bidi.getRunLimit(i) != rtlstart + rtllength) {
|
||||
throw new RuntimeException("first rtl run didn't match " + rtlstart + ", " + rtllength);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
63
test/jdk/java/text/Bidi/Bug6850113.java
Normal file
63
test/jdk/java/text/Bidi/Bug6850113.java
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
/*
|
||||
* Copyright (c) 2009, 2020, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
/*
|
||||
* @test
|
||||
* @bug 6850113 8174270
|
||||
* @summary Verify the return value of digit() for some digits.
|
||||
* @modules java.base/jdk.internal.icu.lang
|
||||
* @compile -XDignore.symbol.file=true Bug6850113.java
|
||||
* @run main Bug6850113
|
||||
*/
|
||||
|
||||
import jdk.internal.icu.lang.UCharacter;
|
||||
|
||||
public class Bug6850113 {
|
||||
|
||||
public static void main(String[] args) {
|
||||
boolean err = false;
|
||||
|
||||
// Fullwidth Latin capital letters
|
||||
for (int i = 0xff21, j = 10; i <= 0xff3a; i++, j++) {
|
||||
if (UCharacter.digit(i, 36) != j) {
|
||||
err = true;
|
||||
System.out.println("Error: UCharacter.digit(0x" +
|
||||
Integer.toHexString(i) + ", 36) returned " +
|
||||
UCharacter.digit(i, 36) + ", expected=" + j);
|
||||
}
|
||||
}
|
||||
|
||||
// Fullwidth Latin small letters
|
||||
for (int i = 0xff41, j = 10; i <= 0xff5a; i++, j++) {
|
||||
if (UCharacter.digit(i, 36) != j) {
|
||||
err = true;
|
||||
System.out.println("Error: UCharacter.digit(0x" +
|
||||
Integer.toHexString(i) + ", 36) returned " +
|
||||
UCharacter.digit(i, 36) + ", expected=" + j);
|
||||
}
|
||||
}
|
||||
|
||||
if (err) {
|
||||
throw new RuntimeException("UCharacter.digit(): Wrong return value");
|
||||
}
|
||||
}
|
||||
}
|
||||
70
test/jdk/java/text/Bidi/Bug7002398.java
Normal file
70
test/jdk/java/text/Bidi/Bug7002398.java
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
/*
|
||||
* Copyright (c) 2010, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 7002398
|
||||
* @summary Verify that Corrigendum #8 for Unicode 6.0.0 has been applied.
|
||||
*/
|
||||
import java.text.*;
|
||||
|
||||
public class Bug7002398 {
|
||||
|
||||
private static final int[] directions = {
|
||||
Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT,
|
||||
Bidi.DIRECTION_DEFAULT_RIGHT_TO_LEFT,
|
||||
Bidi.DIRECTION_LEFT_TO_RIGHT,
|
||||
Bidi.DIRECTION_RIGHT_TO_LEFT
|
||||
};
|
||||
|
||||
/*
|
||||
* Old Bidi class: AL AN AL AN AL
|
||||
* New Bidi class: AL
|
||||
*/
|
||||
private static final String str = "\u0627\u0660\u0710\u070F\u070D";
|
||||
private static final int[] expectedLevels = {1, 2, 1, 1, 1};
|
||||
|
||||
public static void main(String[] args) {
|
||||
boolean err = false;
|
||||
|
||||
for (int dir = 0; dir < directions.length; dir ++) {
|
||||
Bidi bidi = new Bidi(str, directions[dir]);
|
||||
for (int index = 0; index < str.length(); index ++) {
|
||||
int gotLevel = bidi.getLevelAt(index);
|
||||
if (gotLevel != expectedLevels[index]) {
|
||||
err = true;
|
||||
System.err.println("Unexpected level for the character 0x" +
|
||||
Integer.toHexString(str.charAt(index)).toUpperCase() +
|
||||
": Expected level = " + expectedLevels[index] +
|
||||
", actual level = " + bidi.getLevelAt(index) +
|
||||
" in direction = " + directions[dir] + ".");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (err) {
|
||||
throw new RuntimeException("Failed.");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
48
test/jdk/java/text/Bidi/Bug7041232.java
Normal file
48
test/jdk/java/text/Bidi/Bug7041232.java
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
* Copyright (c) 2011, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 7041232
|
||||
* @summary verify that an unexpected exception isn't thrown for unnatural data to keep backward compatibility with JDK 6.
|
||||
*/
|
||||
import java.text.*;
|
||||
|
||||
public class Bug7041232 {
|
||||
|
||||
public static void main(String[] args) {
|
||||
String UnicodeChars;
|
||||
StringBuffer sb = new StringBuffer();
|
||||
|
||||
// Generates String which includes U+2028(line separator) and
|
||||
// U+2029(paragraph separator)
|
||||
for (int i = 0x2000; i < 0x2100; i++) {
|
||||
sb.append((char)i);
|
||||
}
|
||||
UnicodeChars = sb.toString();
|
||||
|
||||
Bidi bidi = new Bidi(UnicodeChars, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
|
||||
bidi.createLineBidi(0, UnicodeChars.length());
|
||||
}
|
||||
|
||||
}
|
||||
93
test/jdk/java/text/Bidi/Bug7042148.java
Normal file
93
test/jdk/java/text/Bidi/Bug7042148.java
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
/*
|
||||
* Copyright (c) 2011, 2016, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 7042148
|
||||
* @summary verify that Bidi.baseIsLeftToRight() returns the correct value even if an incorrect position is set in the given AttributedCharacterIterator.
|
||||
* @modules java.desktop
|
||||
*/
|
||||
import java.awt.font.*;
|
||||
import java.text.*;
|
||||
import java.util.*;
|
||||
|
||||
public class Bug7042148 {
|
||||
|
||||
private static boolean err = false;
|
||||
|
||||
public static void main(String[] args) {
|
||||
testDirection();
|
||||
|
||||
if (err) {
|
||||
throw new RuntimeException("Failed");
|
||||
} else {
|
||||
System.out.println("Passed.");
|
||||
}
|
||||
}
|
||||
|
||||
private static void testDirection() {
|
||||
Map attrLTR = new HashMap();
|
||||
attrLTR.put(TextAttribute.RUN_DIRECTION,
|
||||
TextAttribute.RUN_DIRECTION_LTR);
|
||||
Map attrRTL = new HashMap();
|
||||
attrRTL.put(TextAttribute.RUN_DIRECTION,
|
||||
TextAttribute.RUN_DIRECTION_RTL);
|
||||
|
||||
String str1 = "A\u05e0";
|
||||
String str2 = "\u05e0B";
|
||||
|
||||
test(str1, attrLTR, Bidi.DIRECTION_LEFT_TO_RIGHT);
|
||||
test(str1, attrRTL, Bidi.DIRECTION_RIGHT_TO_LEFT);
|
||||
test(str2, attrLTR, Bidi.DIRECTION_LEFT_TO_RIGHT);
|
||||
test(str2, attrRTL, Bidi.DIRECTION_RIGHT_TO_LEFT);
|
||||
}
|
||||
|
||||
private static void test(String text, Map attr, int dirFlag) {
|
||||
boolean expected = (dirFlag == Bidi.DIRECTION_LEFT_TO_RIGHT);
|
||||
|
||||
Bidi bidi = new Bidi(text, dirFlag);
|
||||
boolean got = bidi.baseIsLeftToRight();
|
||||
if (got != expected) {
|
||||
err = true;
|
||||
System.err.println("wrong Bidi(String, int).baseIsLeftToRight() value: " +
|
||||
"\n\ttext=" + text +
|
||||
"\n\tExpected=" + expected +
|
||||
"\n\tGot=" + got);
|
||||
}
|
||||
|
||||
AttributedString as = new AttributedString(text, attr);
|
||||
AttributedCharacterIterator itr = as.getIterator();
|
||||
itr.last();
|
||||
itr.next();
|
||||
bidi = new Bidi(itr);
|
||||
got = bidi.baseIsLeftToRight();
|
||||
if (got != expected) {
|
||||
err = true;
|
||||
System.err.println("Wrong Bidi(AttributedCharacterIterator).baseIsLeftToRight() value: " +
|
||||
"\n\ttext=" + text +
|
||||
"\n\tExpected=" + expected +
|
||||
"\n\tGot=" + got);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
88
test/jdk/java/text/Bidi/Bug7051769.java
Normal file
88
test/jdk/java/text/Bidi/Bug7051769.java
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
/*
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 7051769 8038092 8174270
|
||||
* @summary verify that Bidi.toString() returns the corect result.
|
||||
* The second run is intended to test lazy SharedSectets init for 8038092
|
||||
* @modules java.desktop
|
||||
* @run main Bug7051769
|
||||
* @run main/othervm -DpreloadBidi=true Bug7051769
|
||||
*/
|
||||
import java.awt.font.*;
|
||||
import java.text.*;
|
||||
import java.util.*;
|
||||
|
||||
public class Bug7051769 {
|
||||
|
||||
static {
|
||||
if (System.getProperty("preloadBidi", "").equals("true")) {
|
||||
// Make sure the SharedSecret is lazily initialized correctly
|
||||
try {
|
||||
Class.forName("jdk.internal.icu.text.BidiBase");
|
||||
System.out.println("BidiBase class has been pre-loaded.");
|
||||
} catch (ClassNotFoundException e) {
|
||||
System.out.println("BidiBase class could not be pre-loaded.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean err = false;
|
||||
|
||||
public static void main(String[] args) {
|
||||
testNumericShaping();
|
||||
|
||||
if (err) {
|
||||
throw new RuntimeException("Failed");
|
||||
} else {
|
||||
System.out.println("Passed.");
|
||||
}
|
||||
}
|
||||
|
||||
private static void testNumericShaping() {
|
||||
Map attrNS = new HashMap();
|
||||
attrNS.put(TextAttribute.NUMERIC_SHAPING,
|
||||
NumericShaper.getContextualShaper(NumericShaper.ARABIC));
|
||||
attrNS.put(TextAttribute.RUN_DIRECTION,
|
||||
TextAttribute.RUN_DIRECTION_RTL);
|
||||
|
||||
String text = "\u0623\u0643\u062a\u0648\u0628\u0631 10";
|
||||
String expected = "jdk.internal.icu.text.BidiBase[dir: 2 baselevel: 1 length: 9 runs: [1 1 1 1 1 1 1 2 2] text: [0x623 0x643 0x62a 0x648 0x628 0x631 0x20 0x661 0x660]]";
|
||||
|
||||
AttributedString as = new AttributedString(text, attrNS);
|
||||
AttributedCharacterIterator itr = as.getIterator();
|
||||
itr.last();
|
||||
itr.next();
|
||||
Bidi bidi = new Bidi(itr);
|
||||
String got = bidi.toString();
|
||||
|
||||
if (!got.equals(expected)) {
|
||||
err = true;
|
||||
System.err.println("Wrong toString() output: " +
|
||||
"\n\tExpected=" + expected +
|
||||
"\n\tGot=" + got);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
67
test/jdk/java/text/Bidi/Bug8005277.java
Normal file
67
test/jdk/java/text/Bidi/Bug8005277.java
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
/*
|
||||
* Copyright (c) 2012, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8005277
|
||||
* @summary verify that Bidi.getRunLevel() returns a corect level.
|
||||
*/
|
||||
import java.text.Bidi;
|
||||
|
||||
public class Bug8005277 {
|
||||
|
||||
public static void main(String[] args) {
|
||||
boolean err = false;
|
||||
String string = "\u05D0\u05D1\u05D2";
|
||||
Bidi bidi = new Bidi(string, Bidi.DIRECTION_LEFT_TO_RIGHT);
|
||||
|
||||
int result = bidi.getRunCount();
|
||||
if (result != 1) {
|
||||
System.err.println("Incorrect run count: " + result);
|
||||
err = true;
|
||||
}
|
||||
|
||||
result = bidi.getRunStart(0);
|
||||
if (result != 0) {
|
||||
System.err.println("Incorrect run start: " + result);
|
||||
err = true;
|
||||
}
|
||||
|
||||
result = bidi.getRunLimit(0);
|
||||
if (result != 3) {
|
||||
System.err.println("Incorrect run limit: " + result);
|
||||
err = true;
|
||||
}
|
||||
|
||||
result = bidi.getRunLevel(0);
|
||||
if (result != 1) {
|
||||
System.err.println("Incorrect run level: " + result);
|
||||
err = true;
|
||||
}
|
||||
|
||||
if (err) {
|
||||
throw new RuntimeException("Failed.");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue