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

8327969: Convert javax/swing/border/Test6910490.java applet test to main

Browse Source 
Reviewed-by: dnguyen, honkar
This commit is contained in:
Tejesh R 2024-03-14 15:40:22 +00:00
parent 51381bb13c
commit 759cc67591
2 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/jdk/javax/swing/border/Test6910490.html
View File

@ -1,32 +0,0 @@
<!--
Copyright (c) 2010, 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>
If the border is painted over scroll bars then test fails.
Otherwise test passes.
<applet width="600" height="300" code="Test6910490.class">
</applet>
</body>
</html>

36
test/jdk/javax/swing/border/Test6910490.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 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
@ -27,8 +27,8 @@ import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Insets;
import javax.swing.Icon;
import javax.swing.JApplet;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.border.MatteBorder;
@ -37,22 +37,40 @@ import javax.swing.border.MatteBorder;
* @test
* @bug 6910490
* @summary Tests a matte border around a component inside a scroll pane.
* @author Sergey Malenkov
* @run applet/manual=yesno Test6910490.html
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual Test6910490
*/
public class Test6910490 extends JApplet implements Icon {
public class Test6910490 implements Icon {
public static void main(String[] args) throws Exception {
String testInstructions = """
If the border is painted over scroll bars then test fails.
Otherwise test passes.""";
Test6910490 obj = new Test6910490();
PassFailJFrame.builder()
.title("Test Instructions")
.instructions(testInstructions)
.rows(3)
.columns(35)
.testUI(obj.initializeTest())
.build()
.awaitAndCheck();
}
@Override
public void init() {
public JFrame initializeTest() {
Insets insets = new Insets(10, 10, 10, 10);
Dimension size = new Dimension(getWidth() / 2, getHeight());
JFrame frame = new JFrame("Matte Border Test");
frame.setSize(600, 300);
Dimension size = new Dimension(frame.getWidth() / 2, frame.getHeight());
JSplitPane pane = new JSplitPane(
JSplitPane.HORIZONTAL_SPLIT,
create("Color", size, new MatteBorder(insets, RED)),
create("Icon", size, new MatteBorder(insets, this)));
pane.setDividerLocation(size.width - pane.getDividerSize() / 2);
add(pane);
frame.add(pane);
return frame;
}
private JScrollPane create(String name, Dimension size, MatteBorder border) {