/hg/icedtea6: Added patch containing three new JTreg tests TextL...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed May 15 07:49:44 PDT 2013
changeset 29eed3efba72 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=29eed3efba72
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed May 15 16:48:54 2013 +0200
Added patch containing three new JTreg tests TextLayoutAscentDescent.java,
TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that
check the behavior of text layout subsystem.
diffstat:
ChangeLog | 9 +
Makefile.am | 3 +-
patches/jtreg-TextLayoutBoundsChecks.patch | 150 +++++++++++++++++++++++++++++
3 files changed, 161 insertions(+), 1 deletions(-)
diffs (183 lines):
diff -r c23f233213f4 -r 29eed3efba72 ChangeLog
--- a/ChangeLog Tue May 07 16:09:51 2013 +0200
+++ b/ChangeLog Wed May 15 16:48:54 2013 +0200
@@ -1,3 +1,12 @@
+2013-05-15 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Added new patch.
+ * patches/jtreg-TextLayoutBoundsChecks.patch:
+ Patch containing three new JTreg tests TextLayoutAscentDescent.java,
+ TextLayoutBoundIsNotEmpty and TextLayoutGetPixelBounds that
+ check the behavior of text layout subsystem.
+
2013-05-07 Xerxes RÃ¥nby <xerxes at zafena.se>
JamVM
diff -r c23f233213f4 -r 29eed3efba72 Makefile.am
--- a/Makefile.am Tue May 07 16:09:51 2013 +0200
+++ b/Makefile.am Wed May 15 16:48:54 2013 +0200
@@ -547,7 +547,8 @@
patches/openjdk/8009530-icu_kern_table_support_broken.patch \
patches/textLayoutGetCharacterCount.patch \
patches/textLayoutLimits.patch \
- patches/componentOrientationTests.patch
+ patches/componentOrientationTests.patch \
+ patches/jtreg-TextLayoutBoundsChecks.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r c23f233213f4 -r 29eed3efba72 patches/jtreg-TextLayoutBoundsChecks.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-TextLayoutBoundsChecks.patch Wed May 15 16:48:54 2013 +0200
@@ -0,0 +1,150 @@
+--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200
++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutAscentDescent.java 2013-04-26 11:51:19.000000000 +0200
+@@ -0,0 +1,46 @@
++/*
++ * Copyright 2013 Red Hat, Inc. 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.
++ */
++
++import java.awt.Font;
++import java.awt.font.TextLayout;
++import java.awt.font.FontRenderContext;
++
++/**
++ * @test
++ * @run main TextLayoutAscentDescent
++ * @author Pavel Tisnovsky
++ *
++ * Test if TextLayout's methods getAscent() and getDescent() work properly.
++ */
++public class TextLayoutAscentDescent {
++ public static void main(String []args) {
++ Font font = new Font("Times New Roman", Font.BOLD, 10);
++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false));
++
++ float ascent = tl.getAscent();
++ float descent = tl.getDescent();
++ if (ascent <= 0) {
++ throw new RuntimeException("Ascent " + ascent + " is <=0");
++ }
++ if (descent <= 0) {
++ throw new RuntimeException("Descent " + descent + " is <=0");
++ }
++ }
++}
++
+--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200
++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBoundIsNotEmpty.java 2013-04-29 15:24:56.000000000 +0200
+@@ -0,0 +1,43 @@
++/*
++ * Copyright 2013 Red Hat, Inc. 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.
++ */
++
++import java.awt.Font;
++import java.awt.font.TextLayout;
++import java.awt.font.FontRenderContext;
++import java.awt.geom.Rectangle2D;
++
++/**
++ * @test
++ * @run main TextLayoutLimits2
++ * @author Pavel Tisnovsky
++ *
++ * Test if TextLayout's method getBounds() works properly.
++ */
++public class TextLayoutBoundIsNotEmpty {
++ public static void main(String []args) {
++ Font font = new Font("Times New Roman", Font.BOLD, 10);
++ TextLayout tl = new TextLayout("JAVA", font, new FontRenderContext(null, false, false));
++ Rectangle2D bounds = tl.getBounds();
++
++ if (bounds.isEmpty()) {
++ throw new RuntimeException("Bounds is empty: " + bounds.toString());
++ }
++ }
++}
++
+--- ./openjdk-old/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200
++++ ./openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutGetPixelBounds.java 2013-04-29 15:24:56.000000000 +0200
+@@ -0,0 +1,52 @@
++/*
++ * Copyright 2013 Red Hat, Inc. 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.
++ */
++
++import java.awt.Font;
++import java.awt.font.TextLayout;
++import java.awt.font.FontRenderContext;
++import java.awt.geom.Rectangle2D;
++
++/**
++ * @test
++ * @run main TextLayoutGetPixelBounds
++ * @author Pavel Tisnovsky
++ *
++ * Test if TextLayout's method getPixelBounds() works properly.
++ */
++public class TextLayoutGetPixelBounds {
++ public static void main(String []args) {
++ Font font = new Font("Times New Roman", Font.BOLD, 10);
++ FontRenderContext fontRenderContext = new FontRenderContext(null, false, false);
++ TextLayout tl = new TextLayout("JAVA", font, fontRenderContext);
++
++ Rectangle2D bounds = tl.getPixelBounds(fontRenderContext, 0.0f, 0.0f);
++ int width = (int) bounds.getWidth();
++ int height = (int) bounds.getHeight();
++ if (width <= 0) {
++ throw new RuntimeException("Width " + width + " is <=0");
++ }
++ if (height <= 0) {
++ throw new RuntimeException("Height " + height + " is <=0");
++ }
++ if (bounds.isEmpty()) {
++ throw new RuntimeException("Bounds is empty: " + bounds.toString());
++ }
++ }
++}
++
More information about the distro-pkg-dev
mailing list