archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 10:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8198621: java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java fails on mac

Browse source 
Reviewed-by: serb
This commit is contained in:
Prasanta Sadhukhan 2021-04-26 07:28:46 +00:00
parent 7b609a2016
commit 6e5026a8df
2 changed files with 87 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/jdk/ProblemList.txt
View file

@ -133,7 +133,6 @@ java/awt/Focus/ChoiceFocus/ChoiceFocus.java 8169103 windows-all,macosx-all
java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java 8198618 macosx-all java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java 8198618 macosx-all
java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java 6986252 macosx-all java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java 6986252 macosx-all
java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java 8198619 macosx-all java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java 8198619 macosx-all
java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java 8198621 macosx-all
java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java 8194753 linux-all,macosx-all java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java 8194753 linux-all,macosx-all
java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java 7152980 macosx-all java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java 7152980 macosx-all
java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java 8159599 macosx-all java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java 8159599 macosx-all

163
test/jdk/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -54,88 +54,99 @@ public class KeyEventForBadFocusOwnerTest {
volatile static boolean unexpectedItemSelected = false; volatile static boolean unexpectedItemSelected = false;
static Robot robot; static Robot robot;
static JFrame frame;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(new Runnable() { try {
public void run() { SwingUtilities.invokeAndWait(new Runnable() {
JFrame frame = new JFrame("TEST"); public void run() {
JMenuBar mb = new JMenuBar(); frame = new JFrame("TEST");
JMenu one = new JMenu(ITEM_ONE_TEXT); JMenuBar mb = new JMenuBar();
JMenu two = new JMenu(ITEM_TWO_TEXT); JMenu one = new JMenu(ITEM_ONE_TEXT);
JMenu two = new JMenu(ITEM_TWO_TEXT);
mb.add(one); mb.add(one);
mb.add(two); mb.add(two);
ActionListener al = new ActionListener() { ActionListener al = new ActionListener() {
public void actionPerformed(ActionEvent ae) { public void actionPerformed(ActionEvent ae) {
String itemText = ((JMenuItem)ae.getSource()).getText(); String itemText = ((JMenuItem)ae.getSource()).getText();
System.out.println("--> " + itemText); System.out.println("--> " + itemText);
unexpectedItemSelected = true; unexpectedItemSelected = true;
}
};
one.setMnemonic(KeyEvent.VK_O);
JMenuItem item = new JMenuItem("one 1");
item.setMnemonic(KeyEvent.VK_O);
item.addActionListener(al);
one.add(item);
one.add("two");
one.add("three");
two.setMnemonic(KeyEvent.VK_T);
item = new JMenuItem("two 2");
item.setMnemonic(KeyEvent.VK_T);
item.addActionListener(al);
two.add(item);
two.add("three");
two.add("four");
PopupMenuListener popupMenuListener = new PopupMenuListener() {
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
System.out.print(e);
System.out.print(e.getSource());
String itemText = ((JPopupMenu)e.getSource()).getName();
System.out.println("Menu " + itemText + "is opened.");
switch(itemText) {
case ITEM_ONE_TEXT:
itemOneSelected = true;
break;
case ITEM_TWO_TEXT:
itemTwoSelected = true;
break;
} }
} };
one.setMnemonic(KeyEvent.VK_O);
JMenuItem item = new JMenuItem("one 1");
item.setMnemonic(KeyEvent.VK_O);
item.addActionListener(al);
one.add(item);
one.add("two");
one.add("three");
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {} two.setMnemonic(KeyEvent.VK_T);
public void popupMenuCanceled(PopupMenuEvent e) {} item = new JMenuItem("two 2");
}; item.setMnemonic(KeyEvent.VK_T);
one.getPopupMenu().setName(ITEM_ONE_TEXT); item.addActionListener(al);
two.getPopupMenu().setName(ITEM_TWO_TEXT); two.add(item);
one.getPopupMenu().addPopupMenuListener(popupMenuListener); two.add("three");
two.getPopupMenu().addPopupMenuListener(popupMenuListener); two.add("four");
frame.setJMenuBar(mb);
frame.setSize(100,100); PopupMenuListener popupMenuListener = new PopupMenuListener() {
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
frame.pack(); System.out.print(e);
frame.setVisible(true); System.out.print(e.getSource());
String itemText = ((JPopupMenu)e.getSource()).getName();
System.out.println("Menu " + itemText + "is opened.");
switch(itemText) {
case ITEM_ONE_TEXT:
itemOneSelected = true;
break;
case ITEM_TWO_TEXT:
itemTwoSelected = true;
break;
}
}
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
public void popupMenuCanceled(PopupMenuEvent e) {}
};
one.getPopupMenu().setName(ITEM_ONE_TEXT);
two.getPopupMenu().setName(ITEM_TWO_TEXT);
one.getPopupMenu().addPopupMenuListener(popupMenuListener);
two.getPopupMenu().addPopupMenuListener(popupMenuListener);
frame.setJMenuBar(mb);
frame.setSize(100,100);
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frame.setLocationRelativeTo(null);
frame.pack();
frame.setVisible(true);
}
});
robot = new Robot();
robot.setAutoDelay(100);
robot.waitForIdle();
robot.delay(1000);
Util.hitMnemonics(robot, KeyEvent.VK_O);
Util.hitMnemonics(robot, KeyEvent.VK_T);
robot.waitForIdle();
Thread.sleep(1000); // workaround for MacOS
if (unexpectedItemSelected) {
throw new Exception("Test failed. KeyEvent dispatched to old focus owner. ");
} }
}); if (!itemOneSelected || !itemTwoSelected) {
throw new Exception("Not all expected events were received");
}
robot = new Robot(); } finally {
robot.setAutoDelay(100); SwingUtilities.invokeAndWait(() -> {
robot.waitForIdle(); if (frame != null) {
frame.dispose();
Util.hitMnemonics(robot, KeyEvent.VK_O); }
Util.hitMnemonics(robot, KeyEvent.VK_T); });
robot.waitForIdle();
Thread.sleep(1000); // workaround for MacOS
if (unexpectedItemSelected) {
throw new Exception("Test failed. KeyEvent dispatched to old focus owner. ");
}
if (!itemOneSelected || !itemTwoSelected) {
throw new Exception("Not all expected events were received");
} }
} }
} }