Skip to content

Commit fd8a3dc

Browse files
aivanov-jdkaivanov-jdk
committedFeb 9, 2022
8280820: Clean up bug8033699 and bug8075609.java tests: regtesthelpers aren't used
Reviewed-by: prr
·
JEP-429-branchpoint
1 parent 178b962 commit fd8a3dc

File tree

2 files changed

+62
-61
lines changed

2 files changed

+62
-61
lines changed
 

‎test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java

+30-33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,9 @@
2121
* questions.
2222
*/
2323

24-
/*
24+
/*
2525
* @test
2626
* @key headful
27-
* @library ../../regtesthelpers
28-
* @build Util
2927
* @bug 8033699 8154043 8167160 8208640 8226892
3028
* @summary Incorrect radio button behavior when pressing tab key
3129
* @run main bug8033699
@@ -34,8 +32,7 @@
3432
import java.awt.Robot;
3533
import java.awt.event.ActionListener;
3634
import java.awt.event.KeyEvent;
37-
import java.util.logging.Level;
38-
import java.util.logging.Logger;
35+
3936
import javax.swing.BorderFactory;
4037
import javax.swing.BoxLayout;
4138
import javax.swing.ButtonGroup;
@@ -45,7 +42,6 @@
4542
import javax.swing.JRadioButton;
4643
import javax.swing.SwingUtilities;
4744
import javax.swing.UIManager;
48-
import javax.swing.UnsupportedLookAndFeelException;
4945

5046
public class bug8033699 {
5147

@@ -59,14 +55,15 @@ public class bug8033699 {
5955
private static JRadioButton radioBtn3;
6056
private static JRadioButton radioBtnSingle;
6157

62-
public static void main(String args[]) throws Throwable {
58+
public static void main(String[] args) throws Throwable {
6359
SwingUtilities.invokeAndWait(() -> {
6460
changeLAF();
6561
createAndShowGUI();
6662
});
6763

6864
robot = new Robot();
6965
Thread.sleep(100);
66+
robot.waitForIdle();
7067

7168
robot.setAutoDelay(100);
7269

@@ -76,7 +73,7 @@ public static void main(String args[]) throws Throwable {
7673
// tab key test non-grouped radio button
7774
runTest2();
7875

79-
// shift tab key test grouped and non grouped radio button
76+
// shift tab key test grouped and non-grouped radio button
8077
runTest3();
8178

8279
// left/up key test in grouped radio button
@@ -152,16 +149,16 @@ private static void createAndShowGUI() {
152149
mainFrame.setLayout(new BoxLayout(mainFrame.getContentPane(), BoxLayout.Y_AXIS));
153150

154151
mainFrame.setSize(300, 300);
155-
mainFrame.setLocation(200, 200);
152+
mainFrame.setLocationRelativeTo(null);
156153
mainFrame.setVisible(true);
157154
mainFrame.toFront();
158155
}
159156

160157
// Radio button Group as a single component when traversing through tab key
161158
private static void runTest1() throws Exception {
162-
hitKey(robot, KeyEvent.VK_TAB);
163-
hitKey(robot, KeyEvent.VK_TAB);
164-
hitKey(robot, KeyEvent.VK_TAB);
159+
hitKey(KeyEvent.VK_TAB);
160+
hitKey(KeyEvent.VK_TAB);
161+
hitKey(KeyEvent.VK_TAB);
165162

166163
SwingUtilities.invokeAndWait(() -> {
167164
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) {
@@ -173,7 +170,7 @@ private static void runTest1() throws Exception {
173170

174171
// Non-Grouped Radio button as a single component when traversing through tab key
175172
private static void runTest2() throws Exception {
176-
hitKey(robot, KeyEvent.VK_TAB);
173+
hitKey(KeyEvent.VK_TAB);
177174
SwingUtilities.invokeAndWait(() -> {
178175
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnEnd) {
179176
System.out.println("Non Grouped Radio Button Go To Next Component through Tab Key failed");
@@ -184,9 +181,9 @@ private static void runTest2() throws Exception {
184181

185182
// Non-Grouped Radio button and Group Radio button as a single component when traversing through shift-tab key
186183
private static void runTest3() throws Exception {
187-
hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
188-
hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
189-
hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
184+
hitKey(KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
185+
hitKey(KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
186+
hitKey(KeyEvent.VK_SHIFT, KeyEvent.VK_TAB);
190187
SwingUtilities.invokeAndWait(() -> {
191188
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) {
192189
System.out.println("Radio button Group/Non Grouped Radio Button SHIFT-Tab Key Test failed");
@@ -197,8 +194,8 @@ private static void runTest3() throws Exception {
197194

198195
// Using arrow key to move focus in radio button group
199196
private static void runTest4() throws Exception {
200-
hitKey(robot, KeyEvent.VK_DOWN);
201-
hitKey(robot, KeyEvent.VK_RIGHT);
197+
hitKey(KeyEvent.VK_DOWN);
198+
hitKey(KeyEvent.VK_RIGHT);
202199
SwingUtilities.invokeAndWait(() -> {
203200
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) {
204201
System.out.println("Radio button Group UP/LEFT Arrow Key Move Focus Failed");
@@ -208,8 +205,8 @@ private static void runTest4() throws Exception {
208205
}
209206

210207
private static void runTest5() throws Exception {
211-
hitKey(robot, KeyEvent.VK_UP);
212-
hitKey(robot, KeyEvent.VK_LEFT);
208+
hitKey(KeyEvent.VK_UP);
209+
hitKey(KeyEvent.VK_LEFT);
213210
SwingUtilities.invokeAndWait(() -> {
214211
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) {
215212
System.out.println("Radio button Group Left/Up Arrow Key Move Focus Failed");
@@ -219,8 +216,8 @@ private static void runTest5() throws Exception {
219216
}
220217

221218
private static void runTest6() throws Exception {
222-
hitKey(robot, KeyEvent.VK_UP);
223-
hitKey(robot, KeyEvent.VK_UP);
219+
hitKey(KeyEvent.VK_UP);
220+
hitKey(KeyEvent.VK_UP);
224221
SwingUtilities.invokeAndWait(() -> {
225222
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn2) {
226223
System.out.println("Radio button Group Circle Back To First Button Test");
@@ -230,7 +227,7 @@ private static void runTest6() throws Exception {
230227
}
231228

232229
private static void runTest7() throws Exception {
233-
hitKey(robot, KeyEvent.VK_TAB);
230+
hitKey(KeyEvent.VK_TAB);
234231
SwingUtilities.invokeAndWait(() -> {
235232
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnMiddle) {
236233
System.out.println("Separate Component added in button group layout");
@@ -240,7 +237,7 @@ private static void runTest7() throws Exception {
240237
}
241238

242239
private static void runTest8() throws Exception {
243-
hitKey(robot, KeyEvent.VK_TAB);
240+
hitKey(KeyEvent.VK_TAB);
244241
SwingUtilities.invokeAndWait(() -> {
245242
if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) {
246243
System.out.println("Separate Component added in button group layout");
@@ -249,9 +246,9 @@ private static void runTest8() throws Exception {
249246
});
250247
}
251248

252-
private static Boolean actRB1 = false;
253-
private static Boolean actRB2 = false;
254-
private static Boolean actRB3 = false;
249+
private static boolean actRB1 = false;
250+
private static boolean actRB2 = false;
251+
private static boolean actRB3 = false;
255252

256253
// JDK-8226892: Verify that ActionListener is called when a RadioButton is selected using arrow key.
257254
private static void runTest9() throws Exception {
@@ -268,9 +265,9 @@ private static void runTest9() throws Exception {
268265
radioBtn2.addActionListener(actLrRB2);
269266
radioBtn3.addActionListener(actLrRB3);
270267

271-
hitKey(robot, KeyEvent.VK_DOWN);
272-
hitKey(robot, KeyEvent.VK_DOWN);
273-
hitKey(robot, KeyEvent.VK_DOWN);
268+
hitKey(KeyEvent.VK_DOWN);
269+
hitKey(KeyEvent.VK_DOWN);
270+
hitKey(KeyEvent.VK_DOWN);
274271

275272
String failMessage = "ActionListener not invoked when selected using arrow key.";
276273
if (!actRB2) {
@@ -288,13 +285,13 @@ private static void runTest9() throws Exception {
288285
radioBtn3.removeActionListener(actLrRB3);
289286
}
290287

291-
private static void hitKey(Robot robot, int keycode) {
288+
private static void hitKey(int keycode) {
292289
robot.keyPress(keycode);
293290
robot.keyRelease(keycode);
294291
robot.waitForIdle();
295292
}
296293

297-
private static void hitKey(Robot robot, int mode, int keycode) {
294+
private static void hitKey(int mode, int keycode) {
298295
robot.keyPress(mode);
299296
robot.keyPress(keycode);
300297
robot.keyRelease(keycode);

‎test/jdk/javax/swing/JRadioButton/8075609/bug8075609.java

+32-28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -21,44 +21,49 @@
2121
* questions.
2222
*/
2323

24-
/*
24+
/*
2525
* @test
2626
* @key headful
27-
* @library ../../regtesthelpers
28-
* @build Util
2927
* @bug 8075609
3028
* @summary IllegalArgumentException when transferring focus from JRadioButton using tab
31-
* @author Vivi An
3229
* @run main bug8075609
3330
*/
34-
35-
import javax.swing.*;
36-
import javax.swing.event.*;
37-
import java.awt.event.*;
38-
import java.awt.*;
31+
import java.awt.BorderLayout;
32+
import java.awt.Robot;
33+
import java.awt.event.KeyEvent;
34+
35+
import javax.swing.ButtonGroup;
36+
import javax.swing.JButton;
37+
import javax.swing.JFrame;
38+
import javax.swing.JPanel;
39+
import javax.swing.JRadioButton;
40+
import javax.swing.JTextField;
41+
import javax.swing.LayoutFocusTraversalPolicy;
42+
import javax.swing.SwingUtilities;
3943

4044
public class bug8075609 {
4145
private static Robot robot;
4246
private static JTextField textField;
4347
private static JFrame mainFrame;
4448

45-
public static void main(String args[]) throws Throwable {
49+
public static void main(String[] args) throws Throwable {
4650
try {
47-
SwingUtilities.invokeAndWait(new Runnable() {
48-
public void run() {
49-
createAndShowGUI();
50-
}
51-
});
51+
SwingUtilities.invokeAndWait(bug8075609::createAndShowGUI);
5252

5353
robot = new Robot();
5454
Thread.sleep(100);
55+
robot.waitForIdle();
5556

5657
robot.setAutoDelay(100);
5758

5859
// Radio button group tab key test
5960
runTest1();
6061
} finally {
61-
if (mainFrame != null) SwingUtilities.invokeAndWait(() -> mainFrame.dispose());
62+
SwingUtilities.invokeAndWait(() -> {
63+
if (mainFrame != null) {
64+
mainFrame.dispose();
65+
}
66+
});
6267
}
6368
}
6469

@@ -91,26 +96,25 @@ private static void createAndShowGUI() {
9196

9297
mainFrame.add(rootPanel);
9398
mainFrame.pack();
99+
mainFrame.setLocationRelativeTo(null);
94100
mainFrame.setVisible(true);
95101
mainFrame.toFront();
96102
}
97103

98104
// Radio button Group as a single component when traversing through tab key
99-
private static void runTest1() throws Exception{
100-
hitKey(robot, KeyEvent.VK_TAB);
101-
102-
robot.delay(1000 );
103-
SwingUtilities.invokeAndWait(new Runnable() {
104-
public void run() {
105-
if (!textField.hasFocus()) {
106-
System.out.println("Radio Button Group Go To Next Component through Tab Key failed");
107-
throw new RuntimeException("Focus is not on textField as Expected");
108-
}
105+
private static void runTest1() throws Exception {
106+
hitKey(KeyEvent.VK_TAB);
107+
108+
robot.delay(1000);
109+
SwingUtilities.invokeAndWait(() -> {
110+
if (!textField.hasFocus()) {
111+
System.out.println("Radio Button Group Go To Next Component through Tab Key failed");
112+
throw new RuntimeException("Focus is not on textField as Expected");
109113
}
110114
});
111115
}
112116

113-
private static void hitKey(Robot robot, int keycode) {
117+
private static void hitKey(int keycode) {
114118
robot.keyPress(keycode);
115119
robot.keyRelease(keycode);
116120
robot.waitForIdle();

0 commit comments

Comments
 (0)
Please sign in to comment.