Skip to content

Commit cec6c06

Browse files
committedSep 4, 2021
8272232: javax/swing/JTable/4275046/bug4275046.java failed with "Expected value in the cell: 'rededited' but found 'redEDITED'."
8257540: javax/swing/JFileChooser/8041694/bug8041694.java failed with "RuntimeException: The selected directory name is not the expected 'd ' but 'D '." Reviewed-by: serb
1 parent 14a3ac0 commit cec6c06

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed
 

‎test/jdk/java/awt/List/ActionEventTest/ActionEventTest.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public ActionEventTest() {
5656
add(list);
5757
setSize(400,400);
5858
setLayout(new FlowLayout());
59+
setLocationRelativeTo(null);
5960
pack();
6061
setVisible(true);
6162
}
@@ -70,9 +71,9 @@ public void actionPerformed(ActionEvent ae) {
7071

7172
if ((md & expectedMask) != expectedMask) {
7273

73-
robot.keyRelease(KeyEvent.VK_ALT);
74-
robot.keyRelease(KeyEvent.VK_SHIFT);
7574
robot.keyRelease(KeyEvent.VK_CONTROL);
75+
robot.keyRelease(KeyEvent.VK_SHIFT);
76+
robot.keyRelease(KeyEvent.VK_ALT);
7677
dispose();
7778
throw new RuntimeException("Action Event modifiers are not"
7879
+ " set correctly.");
@@ -87,9 +88,9 @@ public void actionPerformed(ActionEvent ae) {
8788
// Press Enter on list item, to generate action event.
8889
robot.keyPress(KeyEvent.VK_ENTER);
8990
robot.keyRelease(KeyEvent.VK_ENTER);
90-
robot.keyRelease(KeyEvent.VK_ALT);
91-
robot.keyRelease(KeyEvent.VK_SHIFT);
9291
robot.keyRelease(KeyEvent.VK_CONTROL);
92+
robot.keyRelease(KeyEvent.VK_SHIFT);
93+
robot.keyRelease(KeyEvent.VK_ALT);
9394
}
9495

9596
public static void main(String args[]) {

‎test/jdk/java/awt/dnd/RecognizedActionTest/RecognizedActionTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public void init() {
9090
dragGestureListener);
9191

9292
frame.getToolkit().addAWTEventListener(this, AWTEvent.MOUSE_EVENT_MASK);
93+
frame.setLocationRelativeTo(null);
9394
frame.setVisible(true);
9495
Thread.sleep(100);
9596

@@ -165,10 +166,10 @@ public void init() {
165166
break;
166167

167168
case InputEvent.SHIFT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK:
168-
robot.keyRelease(KeyEvent.VK_CONTROL);
169-
robot.waitForIdle();
170169
robot.keyRelease(KeyEvent.VK_SHIFT);
171170
robot.waitForIdle();
171+
robot.keyRelease(KeyEvent.VK_CONTROL);
172+
robot.waitForIdle();
172173
break;
173174

174175
default:

‎test/jdk/javax/swing/JFileChooser/8041694/bug8041694.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ public void run() {
102102
}
103103
System.out.println(String.format(
104104
"The selected directory is '%s'.", selectedDir.getAbsolutePath()));
105-
if (selectedDir.getName().equals("d")) {
105+
if (selectedDir.getName().toLowerCase().equals("d")) {
106106
throw new RuntimeException(
107107
"JFileChooser removed trailing spaces in the selected directory name. " +
108108
"Expected 'd ' got '" + selectedDir.getName() + "'.");
109-
} else if (!selectedDir.getName().equals("d ")) {
109+
} else if (!selectedDir.getName().toLowerCase().equals("d ")) {
110110
throw new RuntimeException("The selected directory name is not "
111111
+ "the expected 'd ' but '" + selectedDir.getName() + "'.");
112112
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,8 @@ private static void hitKey(Robot robot, int keycode) {
297297
private static void hitKey(Robot robot, int mode, int keycode) {
298298
robot.keyPress(mode);
299299
robot.keyPress(keycode);
300-
robot.keyRelease(mode);
301300
robot.keyRelease(keycode);
301+
robot.keyRelease(mode);
302302
robot.waitForIdle();
303303
}
304304
}

‎test/jdk/javax/swing/JTable/4275046/bug4275046.java

+3
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private void createGUI() {
8787
table.getColumnModel().getColumn(1).setCellEditor(comboEditor);
8888

8989
frame.add(table);
90+
frame.setLocationRelativeTo(null);
9091
frame.pack();
9192
frame.setSize(550, 400);
9293
frame.setVisible(true);
@@ -117,6 +118,7 @@ public void run() {
117118

118119
private void runTest() throws Exception {
119120
robot.waitForIdle();
121+
robot.delay(1000);
120122

121123
// Click the first cell in the "color" column
122124
SwingUtilities.invokeAndWait(new Runnable() {
@@ -175,6 +177,7 @@ private void checkResult() throws Exception {
175177
public void run() {
176178
// Read the edited value of from the cell
177179
editedValue = table.getModel().getValueAt(0, 1);
180+
editedValue = ((String)editedValue).toLowerCase();
178181
System.out.println("The edited value is = " + editedValue);
179182
testResult = editedValue.equals(EXPECTED_VALUE);
180183
if (testResult) {

0 commit comments

Comments
 (0)
Please sign in to comment.