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

8327874: Convert javax/swing/JTree/4314199/bug4314199.java applet test to main

Browse Source 
Reviewed-by: prr, tr
This commit is contained in:
Abhishek Kumar 2024-03-14 09:07:32 +00:00
parent 481c866df8
commit 49ce85fae9
2 changed files with 38 additions and 62 deletions
test/jdk/javax/swing/JTree
4314199
bug4314199.html
bug4314199.java

31
test/jdk/javax/swing/JTree/4314199/bug4314199.html

@ -1,31 +0,0 @@
<!--
Copyright (c) 2012, 2013, 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.
-->
<html>
<body>
Select the last tree node (marked "Here") and click on the menu.
Look at the vertical line connecting nodes "Bug" and "Here". If
this line disappears when the menu drops down, test fails.
<applet code="bug4314199.class" width=200 height=200></applet>
</body>
</html>

69
test/jdk/javax/swing/JTree/4314199/bug4314199.java → test/jdk/javax/swing/JTree/bug4314199.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2024, 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
@ -26,42 +26,44 @@
* @test
* @bug 4314199
* @summary Tests that JTree repaints correctly in a container with a JMenu
* @author Peter Zhelezniakov
* @run applet/manual=yesno bug4314199.html
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual bug4314199
*/
import javax.swing.*;
import javax.swing.tree.*;
import java.awt.BorderLayout;
import javax.swing.Box;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JTree;
import javax.swing.UIManager;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
public class bug4314199 extends JApplet {
public class bug4314199 {
public void init() {
private static final String INSTRUCTIONS = """
Select the last tree node (marked "Here") and click on the "Menu".
Look at the vertical line connecting nodes "Bug" and "Here".
If the connecting line does not disappear when the "Menu" drops down,
press 'Pass' else 'Fail'. """;
try {
UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
createAndShowGUI();
}
});
} catch (final Exception e) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
createAndShowMessage("Test fails because of exception: "
+ e.getMessage());
}
});
}
public static void main(String[] args) throws Exception {
UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
PassFailJFrame.builder()
.title("JTree Instructions")
.instructions(INSTRUCTIONS)
.rows(6)
.splitUI(bug4314199::createAndShowGUI)
.build()
.awaitAndCheck();
}
private void createAndShowMessage(String message) {
getContentPane().add(new JLabel(message));
}
private void createAndShowGUI() {
private static JPanel createAndShowGUI() {
JMenuBar mb = new JMenuBar();
// needed to exactly align left edge of menu and angled line of tree
@ -71,7 +73,6 @@ public class bug4314199 extends JApplet {
JMenuItem mi = new JMenuItem("MenuItem");
mn.add(mi);
mb.add(mn);
setJMenuBar(mb);
DefaultMutableTreeNode n1 = new DefaultMutableTreeNode("Root");
DefaultMutableTreeNode n2 = new DefaultMutableTreeNode("Duke");
@ -87,6 +88,12 @@ public class bug4314199 extends JApplet {
JTree tree = new JTree(new DefaultTreeModel(n1));
tree.putClientProperty("JTree.lineStyle", "Angled");
tree.expandPath(new TreePath(new Object[]{n1, n2, n3}));
setContentPane(tree);
JPanel p = new JPanel();
p.setLayout(new BorderLayout());
p.setSize(200, 200);
p.add(mb, BorderLayout.NORTH);
p.add(tree);
return p;
}
}