Skip to content

Commit 85822a5

Browse files
author
Pankaj Bansal
committedMay 27, 2020
8233566: [TESTBUG] KeyboardFocusManager tests failing on MacoS
Reviewed-by: psadhukhan
1 parent 9b3fb5d commit 85822a5

File tree

2 files changed

+31
-7
lines changed

2 files changed

+31
-7
lines changed
 

‎test/jdk/ProblemList.txt

-2
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,6 @@ java/awt/Window/WindowOwnedByEmbeddedFrameTest/WindowOwnedByEmbeddedFrameTest.ja
535535
java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java 8233564 macosx-all
536536
java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java 8233565 macosx-all
537537
java/awt/keyboard/AllKeyCode/AllKeyCode.java 8242930 macosx-all
538-
java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java 8233566 macosx-all
539-
java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java 8233566,6447537 macosx-all,windows-all
540538
java/awt/FullScreen/8013581/bug8013581.java 8169471 macosx-all
541539
java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java 8233567 macosx-all
542540
java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java 8233568 macosx-all

‎test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/EnqueueWithDialogTest/EnqueueWithDialogTest.java

+31-5
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,26 @@
3030
* @run main EnqueueWithDialogTest
3131
*/
3232

33-
import java.awt.*;
34-
import java.lang.reflect.InvocationTargetException;
35-
import java.awt.event.*;
33+
import java.awt.AWTEvent;
34+
import java.awt.Button;
35+
import java.awt.Component;
36+
import java.awt.Container;
37+
import java.awt.Dialog;
38+
import java.awt.Dimension;
39+
import java.awt.EventQueue;
40+
import java.awt.Frame;
41+
import java.awt.KeyboardFocusManager;
42+
import java.awt.Point;
43+
import java.awt.Robot;
44+
import java.awt.Toolkit;
45+
import java.awt.event.AWTEventListener;
46+
import java.awt.event.ActionEvent;
47+
import java.awt.event.ActionListener;
48+
import java.awt.event.FocusAdapter;
49+
import java.awt.event.FocusEvent;
50+
import java.awt.event.InputEvent;
51+
import java.awt.event.KeyAdapter;
52+
import java.awt.event.KeyEvent;
3653
import java.util.concurrent.CountDownLatch;
3754
import java.util.concurrent.TimeUnit;
3855

@@ -57,8 +74,17 @@ public class EnqueueWithDialogTest
5774
static Robot robot;
5875
public static void main(String args[]) throws Exception {
5976
EnqueueWithDialogTest test = new EnqueueWithDialogTest();
60-
test.init();
61-
test.start();
77+
try {
78+
test.init();
79+
test.start();
80+
} finally {
81+
if (d != null) {
82+
d.dispose();
83+
}
84+
if (f != null) {
85+
f.dispose();
86+
}
87+
}
6288
}
6389
public void init()
6490
{

0 commit comments

Comments
 (0)
Please sign in to comment.