Skip to content

Commit 1b6ff86

Browse files
GoeLinGoeLin
committed
8260035: Deproblemlist few problemlisted test
Reviewed-by: lucy Backport-of: 7f7166d
1 parent 4aa3196 commit 1b6ff86

File tree

4 files changed

+105
-84
lines changed

4 files changed

+105
-84
lines changed

‎test/jdk/ProblemList.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
704704
javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all
705705
javax/swing/JTabbedPane/7024235/Test7024235.java 8028281 macosx-all
706706
javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java 8160720 generic-all
707-
javax/swing/plaf/basic/Test6984643.java 8198340 windows-all
708707
javax/swing/text/CSSBorder/6796710/bug6796710.java 8196099 windows-all
709708
javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java 8194048 windows-all
710709
javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
@@ -724,7 +723,6 @@ javax/swing/DataTransfer/8059739/bug8059739.java 8199074 generic-all
724723
javax/swing/JTabbedPane/TabProb.java 8236635 linux-all
725724
javax/swing/text/GlyphPainter2/6427244/bug6427244.java 8208566 macosx-all
726725
javax/swing/JRootPane/4670486/bug4670486.java 8042381 macosx-all
727-
javax/swing/JMenuItem/6249972/bug6249972.java 8233640 macosx-all
728726
javax/swing/JButton/8151303/PressedIconTest.java 8266246 macosx-aarch64
729727
javax/swing/plaf/synth/7158712/bug7158712.java 8238720 windows-all
730728
javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation/JComboBoxPopupLocation.java 8238720 windows-all

‎test/jdk/javax/swing/JMenuItem/6249972/bug6249972.java‎

Lines changed: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
* @key headful
2727
* @bug 6249972
2828
* @summary Tests that JMenuItem(String,int) handles lower-case mnemonics properly.
29-
* @library ../../../../lib/testlibrary
30-
* @build ExtendedRobot
3129
* @author Mikhail Lapshin
3230
* @run main bug6249972
3331
*/
@@ -36,61 +34,76 @@
3634
import java.awt.event.ActionListener;
3735
import java.awt.event.ActionEvent;
3836
import java.awt.event.KeyEvent;
37+
import java.awt.event.InputEvent;
38+
import java.awt.Dimension;
39+
import java.awt.Point;
40+
import java.awt.Robot;
3941

4042
public class bug6249972 implements ActionListener {
4143

42-
43-
private JFrame frame;
44+
private static JFrame frame;
45+
private static Robot robot;
4446
private JMenu menu;
4547
private volatile boolean testPassed = false;
48+
private volatile Point p = null;
49+
private volatile Dimension size = null;
4650

4751
public static void main(String[] args) throws Exception {
48-
bug6249972 bugTest = new bug6249972();
49-
bugTest.test();
52+
try {
53+
robot = new Robot();
54+
robot.setAutoDelay(100);
55+
bug6249972 bugTest = new bug6249972();
56+
robot.waitForIdle();
57+
robot.delay(1000);
58+
bugTest.test();
59+
} finally {
60+
if (frame != null) {
61+
SwingUtilities.invokeAndWait(() -> frame.dispose());
62+
}
63+
}
5064
}
5165

5266
public bug6249972() throws Exception {
53-
SwingUtilities.invokeAndWait(
54-
new Runnable() {
55-
public void run() {
56-
frame = new JFrame("bug6249972");
57-
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
58-
59-
JMenuBar bar = new JMenuBar();
60-
frame.setJMenuBar(bar);
61-
62-
menu = new JMenu("Problem");
63-
bar.add(menu);
64-
65-
JMenuItem item = new JMenuItem("JMenuItem(String,'z')", 'z');
66-
item.addActionListener(bug6249972.this);
67-
menu.add(item);
68-
69-
frame.setLocationRelativeTo(null);
70-
frame.pack();
71-
frame.setVisible(true);
72-
}
73-
}
74-
);
67+
SwingUtilities.invokeAndWait(() -> {
68+
frame = new JFrame("bug6249972");
69+
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
70+
71+
JMenuBar bar = new JMenuBar();
72+
frame.setJMenuBar(bar);
73+
74+
menu = new JMenu("Problem");
75+
bar.add(menu);
76+
77+
JMenuItem item = new JMenuItem("JMenuItem(String,'z')", 'z');
78+
item.addActionListener(bug6249972.this);
79+
menu.add(item);
80+
81+
frame.setLocationRelativeTo(null);
82+
frame.pack();
83+
frame.setVisible(true);
84+
});
7585
}
7686

7787

7888
private void test() throws Exception {
79-
ExtendedRobot robot = new ExtendedRobot();
80-
robot.waitForIdle();
81-
java.awt.Point p = menu.getLocationOnScreen();
82-
java.awt.Dimension size = menu.getSize();
89+
SwingUtilities.invokeAndWait(() -> {
90+
p = menu.getLocationOnScreen();
91+
size = menu.getSize();
92+
});
8393
p.x += size.width / 2;
8494
p.y += size.height / 2;
8595
robot.mouseMove(p.x, p.y);
86-
robot.click();
87-
robot.delay(100);
96+
robot.waitForIdle();
97+
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
98+
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
8899

89100
robot.waitForIdle();
90-
robot.type(KeyEvent.VK_Z);
101+
robot.delay(100);
102+
robot.keyPress(KeyEvent.VK_Z);
103+
robot.keyRelease(KeyEvent.VK_Z);
91104

92105
robot.waitForIdle();
93-
frame.dispose(); // Try to stop the event dispatch thread
106+
robot.delay(1000);
94107

95108
if (!testPassed) {
96109
throw new RuntimeException("JMenuItem(String,int) does not handle " +

‎test/jdk/javax/swing/JTree/6263446/bug6263446.java‎

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -43,83 +43,92 @@ public class bug6263446 {
4343
private static final String ALL = FIRST + " " + SECOND;
4444
private static JTree tree;
4545
private static Robot robot;
46+
private static JFrame frame;
4647

4748
public static void main(String[] args) throws Exception {
4849
robot = new Robot();
49-
robot.setAutoDelay(50);
50+
robot.setAutoDelay(100);
5051

5152
SwingUtilities.invokeAndWait(new Runnable() {
52-
53+
@Override
5354
public void run() {
5455
createAndShowGUI();
5556
}
5657
});
5758

5859
robot.waitForIdle();
60+
robot.delay(1000);
5961

60-
Point point = getClickPoint();
61-
robot.mouseMove(point.x, point.y);
62+
try {
63+
Point point = getClickPoint();
64+
robot.mouseMove(point.x, point.y);
6265

63-
// click count 3
64-
click(1);
65-
assertNotEditing();
66+
// click count 3
67+
click(1);
68+
assertNotEditing();
6669

67-
click(2);
68-
assertNotEditing();
70+
click(2);
71+
assertNotEditing();
6972

70-
click(3);
71-
assertEditing();
72-
cancelCellEditing();
73-
assertNotEditing();
73+
click(3);
74+
assertEditing();
75+
cancelCellEditing();
76+
assertNotEditing();
7477

75-
click(4);
76-
checkSelectedText(FIRST);
78+
click(4);
79+
checkSelectedText(FIRST);
7780

78-
click(5);
79-
checkSelectedText(ALL);
81+
click(5);
82+
checkSelectedText(ALL);
8083

81-
// click count 4
82-
setClickCountToStart(4);
84+
// click count 4
85+
setClickCountToStart(4);
8386

84-
click(1);
85-
assertNotEditing();
87+
click(1);
88+
assertNotEditing();
8689

87-
click(2);
88-
assertNotEditing();
90+
click(2);
91+
assertNotEditing();
8992

90-
click(3);
91-
assertNotEditing();
93+
click(3);
94+
assertNotEditing();
9295

93-
click(4);
94-
assertEditing();
95-
cancelCellEditing();
96-
assertNotEditing();
96+
click(4);
97+
assertEditing();
98+
cancelCellEditing();
99+
assertNotEditing();
97100

98-
click(5);
99-
checkSelectedText(FIRST);
101+
click(5);
102+
checkSelectedText(FIRST);
100103

101-
click(6);
102-
checkSelectedText(ALL);
104+
click(6);
105+
checkSelectedText(ALL);
103106

104-
// start path editing
105-
startPathEditing();
106-
assertEditing();
107+
// start path editing
108+
startPathEditing();
109+
assertEditing();
107110

108-
click(1);
109-
checkSelection(null);
111+
click(1);
112+
checkSelection(null);
110113

111-
click(2);
112-
checkSelection(FIRST);
114+
click(2);
115+
checkSelection(FIRST);
113116

114-
click(3);
115-
checkSelection(ALL);
117+
click(3);
118+
checkSelection(ALL);
119+
} finally {
120+
if (frame != null) {
121+
SwingUtilities.invokeAndWait(() -> frame.dispose());
122+
}
123+
}
116124
}
117125

118126
private static void click(int times) {
119127
robot.delay(500);
120128
for (int i = 0; i < times; i++) {
121-
robot.mousePress(InputEvent.BUTTON1_MASK);
122-
robot.mouseRelease(InputEvent.BUTTON1_MASK);
129+
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
130+
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
131+
robot.waitForIdle();
123132
}
124133
}
125134

@@ -148,7 +157,7 @@ private static TreeModel createTreeModel() {
148157

149158
private static void createAndShowGUI() {
150159

151-
JFrame frame = new JFrame();
160+
frame = new JFrame();
152161
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
153162

154163
tree = new JTree(createTreeModel());
@@ -158,6 +167,7 @@ private static void createAndShowGUI() {
158167

159168
frame.getContentPane().add(tree);
160169
frame.pack();
170+
frame.setLocationRelativeTo(null);
161171
frame.setVisible(true);
162172
}
163173

‎test/jdk/javax/swing/plaf/basic/Test6984643.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean isSupportedLookAndFeel() {
5555
}
5656
});
5757

58-
SwingUtilities.invokeLater(new Runnable() {
58+
SwingUtilities.invokeAndWait(new Runnable() {
5959
public void run() {
6060
new JFileChooser();
6161
}

0 commit comments

Comments
 (0)