Mercurial > hg > release > icedtea7-forest-2.1 > jdk
changeset 4633:d4bd33d42819
7042148: closed/java/awt/font/TextLayout/CheckLayoutLTR.java failed
Reviewed-by: okutsu
author | peytoia |
---|---|
date | Thu, 15 Sep 2011 16:38:41 +0900 |
parents | e97325a7fe7b |
children | cc66a282bfbd |
files | src/share/classes/sun/text/bidi/BidiBase.java test/java/text/Bidi/Bug7042148.java |
diffstat | 2 files changed, 93 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/text/bidi/BidiBase.java Thu Sep 15 16:17:14 2011 +0900 +++ b/src/share/classes/sun/text/bidi/BidiBase.java Thu Sep 15 16:38:41 2011 +0900 @@ -2690,6 +2690,7 @@ public void setPara(AttributedCharacterIterator paragraph) { byte paraLvl; + char ch = paragraph.first(); Boolean runDirection = (Boolean) paragraph.getAttribute(TextAttributeConstants.RUN_DIRECTION); Object shaper = paragraph.getAttribute(TextAttributeConstants.NUMERIC_SHAPING); @@ -2705,7 +2706,6 @@ byte[] embeddingLevels = new byte[len]; char[] txt = new char[len]; int i = 0; - char ch = paragraph.first(); while (ch != AttributedCharacterIterator.DONE) { txt[i] = ch; Integer embedding =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/text/Bidi/Bug7042148.java Thu Sep 15 16:38:41 2011 +0900 @@ -0,0 +1,92 @@ +/* + * 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 7042148 + * @summary verify that Bidi.baseIsLeftToRight() returns the correct value even if an incorrect position is set in the given AttributedCharacterIterator. + */ +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); + } + } + +}