Skip to content

Commit 906585a

Browse files
GoeLinGoeLin
committedMar 20, 2025
8340433: Open source closed choice tests #3
Backport-of: 8c08c43a34b7a237c0281ef58594af4f263ba3ca
1 parent d9f4d87 commit 906585a

File tree

3 files changed

+341
-0
lines changed

3 files changed

+341
-0
lines changed
 

‎test/jdk/java/awt/Choice/ChoicePosTest.java

+137
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
/*
2+
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.Choice;
25+
import java.awt.Color;
26+
import java.awt.EventQueue;
27+
import java.awt.Frame;
28+
import java.awt.Insets;
29+
import java.awt.Point;
30+
import java.awt.Rectangle;
31+
import java.awt.Robot;
32+
import java.awt.image.BufferedImage;
33+
import java.io.File;
34+
import java.io.IOException;
35+
import javax.imageio.ImageIO;
36+
37+
/*
38+
* @test
39+
* @bug 4075194
40+
* @summary 4075194, Choice may not be displayed at the location requested
41+
* @key headful
42+
*/
43+
44+
public class ChoicePosTest {
45+
46+
private static Robot robot;
47+
private static Frame frame;
48+
private static final int GAP = 10;
49+
private static volatile Choice c1,c2;
50+
51+
public static void main(String[] args) throws Exception {
52+
try {
53+
EventQueue.invokeAndWait(ChoicePosTest::createAndShowGUI);
54+
55+
robot = new Robot();
56+
robot.waitForIdle();
57+
robot.delay(500);
58+
59+
captureAndTestChoices();
60+
} finally {
61+
EventQueue.invokeAndWait(frame::dispose);
62+
}
63+
64+
System.out.println("Passed");
65+
}
66+
67+
private static void createAndShowGUI() {
68+
frame = new Frame("ChoicePosTest");
69+
Insets insets = frame.getInsets();
70+
frame.setSize( insets.left + 400 + insets.right, insets.top + 400 + insets.bottom );
71+
frame.setBackground(Color.RED);
72+
frame.setLayout(null);
73+
frame.setLocationRelativeTo(null);
74+
75+
c1 = new Choice();
76+
c1.setBackground(Color.GREEN);
77+
frame.add( c1 );
78+
c1.setBounds( 20, 50, 100, 100 );
79+
80+
c2 = new Choice();
81+
c2.setBackground(Color.GREEN);
82+
frame.add(c2);
83+
c2.addItem("One");
84+
c2.addItem("Two");
85+
c2.addItem("Three");
86+
c2.setBounds( 125, 50, 100, 100 );
87+
88+
frame.validate();
89+
frame.setVisible(true);
90+
}
91+
92+
private static void captureAndTestChoices() {
93+
Point c1loc = c1.getLocationOnScreen();
94+
Point c2loc = c2.getLocationOnScreen();
95+
96+
int startX = c1loc.x - GAP;
97+
int startY = c1loc.y - GAP;
98+
int captureWidth = c2loc.x + c2.getWidth() + GAP - startX;
99+
int captureHeight = c2loc.y + c2.getHeight() + GAP - startY;
100+
101+
BufferedImage bi = robot.createScreenCapture(
102+
new Rectangle(startX, startY, captureWidth, captureHeight)
103+
);
104+
105+
int redPix = Color.RED.getRGB();
106+
107+
int lastNonRedCount = 0;
108+
109+
for (int y = 0; y < captureHeight; y++) {
110+
int nonRedCount = 0;
111+
for (int x = 0; x < captureWidth; x++) {
112+
int pix = bi.getRGB(x, y);
113+
if (pix != redPix) {
114+
nonRedCount++;
115+
}
116+
}
117+
118+
if (nonRedCount > 0 && lastNonRedCount > 0) {
119+
if (lastNonRedCount - nonRedCount > 0) {
120+
System.err.printf(
121+
"Failed at %d, nonRedCount: %d lastNonRedCount: %d\n",
122+
y, nonRedCount, lastNonRedCount
123+
);
124+
125+
try {
126+
ImageIO.write(bi, "png", new File("choices.png"));
127+
} catch (IOException ignored) {
128+
}
129+
130+
throw new RuntimeException("Choices are not aligned");
131+
}
132+
}
133+
134+
lastNonRedCount = nonRedCount;
135+
}
136+
}
137+
}

‎test/jdk/java/awt/Choice/DeadlockTest.java

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
/*
2+
* Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.BorderLayout;
25+
import java.awt.Choice;
26+
import java.awt.Frame;
27+
import jdk.test.lib.Platform;
28+
29+
/*
30+
* @test
31+
* @bug 4134619
32+
* @summary Tests that the EventDispatchThread doesn't deadlock with
33+
* user threads which are modifying a Choice component.
34+
* @library /java/awt/regtesthelpers /test/lib
35+
* @build PassFailJFrame jdk.test.lib.Platform
36+
* @run main/manual DeadlockTest
37+
*/
38+
39+
public class DeadlockTest extends Thread {
40+
41+
static volatile Choice choice1;
42+
static volatile Choice choice2;
43+
static volatile Choice choice3;
44+
static volatile Frame frame;
45+
static int itemCount = 0;
46+
47+
private static final boolean isWindows = Platform.isWindows();
48+
49+
private static final String INSTRUCTIONS = """
50+
Click on the top Choice component and hold the mouse still briefly.
51+
Then, without releasing the mouse button, move the cursor to a menu
52+
item and then again hold the mouse still briefly.
53+
%s
54+
Release the button and repeat this process.
55+
56+
Verify that this does not cause a deadlock
57+
or crash within a reasonable amount of time.
58+
""".formatted(
59+
isWindows
60+
? "(menu can automatically collapse sometimes, this is ok)\n"
61+
: ""
62+
63+
) ;
64+
65+
public static void main(String[] args) throws Exception {
66+
DeadlockTest deadlockTest = new DeadlockTest();
67+
PassFailJFrame passFailJFrame = PassFailJFrame.builder()
68+
.title("DeadlockTest Instructions")
69+
.instructions(INSTRUCTIONS)
70+
.columns(45)
71+
.testUI(deadlockTest::createAndShowUI)
72+
.build();
73+
74+
deadlockTest.start();
75+
76+
passFailJFrame.awaitAndCheck();
77+
}
78+
79+
public Frame createAndShowUI() {
80+
frame = new Frame("Check Choice");
81+
frame.setLayout(new BorderLayout());
82+
choice1 = new Choice();
83+
choice2 = new Choice();
84+
choice3 = new Choice();
85+
frame.add(choice1, BorderLayout.NORTH);
86+
frame.add(choice3, BorderLayout.CENTER);
87+
frame.add(choice2, BorderLayout.SOUTH);
88+
frame.pack();
89+
return frame;
90+
}
91+
92+
public void run() {
93+
while (true) {
94+
if (choice1 != null && itemCount < 40) {
95+
choice1.add("I am Choice, yes I am : " + itemCount * itemCount);
96+
choice2.add("I am the same, yes I am : " + itemCount * itemCount);
97+
choice3.add("I am the same, yes I am : " + itemCount * itemCount);
98+
itemCount++;
99+
}
100+
if (itemCount >= 20 && choice1 != null &&
101+
choice1.getItemCount() > 0) {
102+
choice1.removeAll();
103+
choice2.removeAll();
104+
choice3.removeAll();
105+
itemCount = 0;
106+
}
107+
frame.validate();
108+
try {
109+
Thread.sleep(1000);
110+
} catch (Exception ignored) {}
111+
}
112+
}
113+
}

‎test/jdk/java/awt/Choice/SetFontTest.java

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*
2+
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.awt.BorderLayout;
25+
import java.awt.Choice;
26+
import java.awt.Font;
27+
import java.awt.Frame;
28+
import java.awt.Panel;
29+
30+
/*
31+
* @test
32+
* @bug 4293346
33+
* @summary Checks that Choice does update its dimensions on font change
34+
* @requires (os.family == "windows")
35+
* @library /java/awt/regtesthelpers
36+
* @build PassFailJFrame
37+
* @run main/manual SetFontTest
38+
*/
39+
40+
public class SetFontTest {
41+
42+
private static final String INSTRUCTIONS = """
43+
Choice component used to not update its dimension on font change.
44+
Select one of fonts on the choice pull down list.
45+
Pull down the list after the font change; if items in the list are
46+
shown correctly the test is passed, otherwise it failed.
47+
""";
48+
49+
public static void main(String[] args) throws Exception {
50+
PassFailJFrame.builder()
51+
.title("SetFontTest Instructions")
52+
.instructions(INSTRUCTIONS)
53+
.columns(45)
54+
.testUI(SetFontTest::createAndShowUI)
55+
.build()
56+
.awaitAndCheck();
57+
}
58+
59+
private static Frame createAndShowUI() {
60+
Frame frame = new Frame("SetFontTest");
61+
Choice choice = new Choice();
62+
frame.setBounds(100, 400, 400, 100);
63+
choice.addItem("dummy");
64+
choice.addItem("Set LARGE Font");
65+
choice.addItem("Set small Font");
66+
choice.addItem("addNewItem");
67+
choice.addItem("deleteItem");
68+
69+
choice.addItemListener(e -> {
70+
if (e.getItem().toString().equals("addNewItem")) {
71+
choice.addItem("very very very very long item");
72+
frame.validate();
73+
} else if (e.getItem().toString().equals("deleteItem")) {
74+
if (choice.getItemCount() > 4) {
75+
choice.remove(4);
76+
frame.validate();
77+
}
78+
} else if (e.getItem().toString().equals("Set LARGE Font")) {
79+
choice.setFont(new Font("Dialog", Font.PLAIN, 24));
80+
frame.validate();
81+
} else if (e.getItem().toString().equals("Set small Font")) {
82+
choice.setFont(new Font("Dialog", Font.PLAIN, 10));
83+
frame.validate();
84+
}
85+
});
86+
Panel panel = new Panel();
87+
panel.add(choice);
88+
frame.add(panel, BorderLayout.CENTER);
89+
return frame;
90+
}
91+
}

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Mar 20, 2025

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Mar 20, 2025

Review

Issues

Please sign in to comment.