7122173: [macosx] Several Regression tests fail on MacOS
Reviewed-by: rupashka
This commit is contained in:
parent
4ae1928609
commit
153bd2fc0d
106
jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java
Normal file
106
jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2008, 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 4917669
|
||||||
|
* @summary 1.4 REGRESSION: MenuItem accelerator doesn't work if parent menu is in JDialog
|
||||||
|
* @author Alexander Zuev
|
||||||
|
* @library ../../regtesthelpers
|
||||||
|
* @run main bug4917669
|
||||||
|
*/
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.event.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import sun.awt.SunToolkit;
|
||||||
|
|
||||||
|
public class bug4917669 {
|
||||||
|
|
||||||
|
private static volatile boolean passed = false;
|
||||||
|
private static JFrame mainFrame;
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
|
||||||
|
Robot robot = new Robot();
|
||||||
|
robot.setAutoDelay(500);
|
||||||
|
|
||||||
|
SwingUtilities.invokeAndWait(new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
createAndShowGUI();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
toolkit.realSync();
|
||||||
|
|
||||||
|
SwingUtilities.invokeAndWait(new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
createAndShowDialog();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
toolkit.realSync();
|
||||||
|
|
||||||
|
Util.hitKeys(robot, KeyEvent.VK_CONTROL, KeyEvent.VK_O);
|
||||||
|
toolkit.realSync();
|
||||||
|
|
||||||
|
if (!passed) {
|
||||||
|
throw new RuntimeException("Action did not received by menu item.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void createAndShowDialog() {
|
||||||
|
JDialog dialog = new JDialog(mainFrame, "Test Dialog", false);
|
||||||
|
JMenuBar mb = new JMenuBar();
|
||||||
|
JMenu file = new JMenu("File");
|
||||||
|
JMenuItem menuItem = new JMenuItem("Open");
|
||||||
|
menuItem.setAccelerator(KeyStroke.getKeyStroke("control O"));
|
||||||
|
menuItem.addActionListener(new ActionListener() {
|
||||||
|
|
||||||
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
passed = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
file.add(menuItem);
|
||||||
|
mb.add(file);
|
||||||
|
dialog.setJMenuBar(mb);
|
||||||
|
|
||||||
|
dialog.setSize(100, 100);
|
||||||
|
dialog.setLocation(200, 200);
|
||||||
|
dialog.setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void createAndShowGUI() {
|
||||||
|
mainFrame = new JFrame("Bug4917669");
|
||||||
|
mainFrame.setLayout(new BorderLayout());
|
||||||
|
mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||||
|
mainFrame.setSize(50, 50);
|
||||||
|
mainFrame.setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,100 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2008, 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 4251579
|
||||||
|
* @summary Tests if style sheets are working in JLabel
|
||||||
|
* @author Denis Sharypov
|
||||||
|
* @run main bug4251579
|
||||||
|
*/
|
||||||
|
import java.awt.*;
|
||||||
|
import javax.swing.*;
|
||||||
|
|
||||||
|
import sun.awt.SunToolkit;
|
||||||
|
|
||||||
|
public class bug4251579 {
|
||||||
|
|
||||||
|
private static JLabel htmlComponent;
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
|
||||||
|
final Robot robot = new Robot();
|
||||||
|
robot.setAutoDelay(50);
|
||||||
|
|
||||||
|
SwingUtilities.invokeAndWait(new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
createAndShowGUI();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
toolkit.realSync();
|
||||||
|
|
||||||
|
SwingUtilities.invokeAndWait(new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
boolean passed = false;
|
||||||
|
|
||||||
|
Point p = htmlComponent.getLocationOnScreen();
|
||||||
|
Dimension d = htmlComponent.getSize();
|
||||||
|
int x0 = p.x;
|
||||||
|
int y = p.y + d.height / 2;
|
||||||
|
|
||||||
|
for (int x = x0; x < x0 + d.width; x++) {
|
||||||
|
if (robot.getPixelColor(x, y).equals(Color.blue)) {
|
||||||
|
passed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!passed) {
|
||||||
|
throw new RuntimeException("Test failed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void createAndShowGUI() {
|
||||||
|
|
||||||
|
String htmlText =
|
||||||
|
"<html>"
|
||||||
|
+ "<head><style> .blue{ color:blue; } </style></head>"
|
||||||
|
+ "<body"
|
||||||
|
+ "<P class=\"blue\"> should be rendered with BLUE class definition</P>"
|
||||||
|
+ "</body>";
|
||||||
|
|
||||||
|
JFrame mainFrame = new JFrame("bug4251579");
|
||||||
|
mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||||
|
|
||||||
|
htmlComponent = new JLabel(htmlText);
|
||||||
|
mainFrame.getContentPane().add(htmlComponent);
|
||||||
|
|
||||||
|
mainFrame.pack();
|
||||||
|
mainFrame.setVisible(true);
|
||||||
|
}
|
||||||
|
}
|
112
jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java
Normal file
112
jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2008, 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 4530474
|
||||||
|
* @summary Tests if background-color CSS attribute in HTML font tag in class attribute
|
||||||
|
* @author Denis Sharypov
|
||||||
|
* @run main bug4530474
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import javax.swing.*;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
|
||||||
|
import sun.awt.SunToolkit;
|
||||||
|
|
||||||
|
public class bug4530474 {
|
||||||
|
|
||||||
|
private static final Color TEST_COLOR = Color.BLUE;
|
||||||
|
private static JEditorPane jep;
|
||||||
|
|
||||||
|
public static void main(String args[]) throws Exception {
|
||||||
|
|
||||||
|
SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
|
||||||
|
final Robot robot = new Robot();
|
||||||
|
robot.setAutoDelay(50);
|
||||||
|
|
||||||
|
SwingUtilities.invokeAndWait(new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
createAndShowGUI();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
toolkit.realSync();
|
||||||
|
|
||||||
|
SwingUtilities.invokeAndWait(new Runnable() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
|
||||||
|
boolean passed = false;
|
||||||
|
|
||||||
|
Point p = jep.getLocationOnScreen();
|
||||||
|
Dimension d = jep.getSize();
|
||||||
|
int x0 = p.x;
|
||||||
|
int y = p.y + d.height / 3;
|
||||||
|
|
||||||
|
StringBuilder builder = new StringBuilder("Test color: ");
|
||||||
|
builder.append(TEST_COLOR.toString());
|
||||||
|
builder.append(" resut colors: ");
|
||||||
|
|
||||||
|
for (int x = x0; x < x0 + d.width; x++) {
|
||||||
|
Color color = robot.getPixelColor(x, y);
|
||||||
|
builder.append(color);
|
||||||
|
|
||||||
|
if (TEST_COLOR.equals(color)) {
|
||||||
|
passed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!passed) {
|
||||||
|
throw new RuntimeException("Test Fail. " + builder.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void createAndShowGUI() {
|
||||||
|
|
||||||
|
JFrame mainFrame = new JFrame("bug4530474");
|
||||||
|
mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||||
|
jep = new JEditorPane();
|
||||||
|
|
||||||
|
try {
|
||||||
|
File file = new File(System.getProperty("test.src", "."), "test.html");
|
||||||
|
jep.setPage(file.toURL());
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
mainFrame.getContentPane().add(jep);
|
||||||
|
|
||||||
|
mainFrame.pack();
|
||||||
|
mainFrame.setVisible(true);
|
||||||
|
}
|
||||||
|
}
|
4
jdk/test/javax/swing/text/html/CSS/4530474/test.css
Normal file
4
jdk/test/javax/swing/text/html/CSS/4530474/test.css
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
font.blackwhite {
|
||||||
|
background-color: blue;
|
||||||
|
color: #FFFFFF;
|
||||||
|
}
|
7
jdk/test/javax/swing/text/html/CSS/4530474/test.html
Normal file
7
jdk/test/javax/swing/text/html/CSS/4530474/test.html
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<LINK REL="StyleSheet" type="text/css" HREF=test.css>
|
||||||
|
<body>
|
||||||
|
<font class="blackwhite">www</font>
|
||||||
|
</body>
|
||||||
|
</html>
|
Loading…
x
Reference in New Issue
Block a user