Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8282046: Create a regression test for JDK-8000326
Reviewed-by: aivanov
  • Loading branch information
Srinivas Mandalika authored and aivanov-jdk committed Mar 30, 2022
1 parent ae57258 commit 97c7298
Showing 1 changed file with 105 additions and 0 deletions.
105 changes: 105 additions & 0 deletions test/jdk/java/awt/Focus/8000326/SetFocusTraversalKeysEnabledTest.java
@@ -0,0 +1,105 @@
/*
* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

/*
* @test
* @bug 8000326
* @key headful
* @summary Focus unable to traverse within the menubar
* @run main SetFocusTraversalKeysEnabledTest
*/
import java.awt.AWTException;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.ContainerOrderFocusTraversalPolicy;
import java.awt.Robot;
import java.awt.event.KeyEvent;
import java.lang.reflect.InvocationTargetException;

import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;

public class SetFocusTraversalKeysEnabledTest {

private static volatile JFrame jFrame;
private static volatile Component currentFocusOwner;

private static void doTest()
throws InvocationTargetException, InterruptedException, AWTException {
try {
SwingUtilities.invokeAndWait(() -> createGUI());
Robot robot = new Robot();
robot.setAutoDelay(500);
Component lastFocusOwner = null;
do {
robot.waitForIdle();
SwingUtilities.invokeAndWait(() -> currentFocusOwner = jFrame.getFocusOwner());

System.out.println("Focus owner is : " + currentFocusOwner.getClass().getName());
if (currentFocusOwner == lastFocusOwner) {
throw new RuntimeException(
"Problem moving focus from " + currentFocusOwner.getClass().getName());
}
lastFocusOwner = currentFocusOwner;
robot.keyPress(KeyEvent.VK_TAB);
robot.keyRelease(KeyEvent.VK_TAB);
} while (currentFocusOwner != jFrame);
} finally {
SwingUtilities.invokeAndWait(() -> jFrame.dispose());
}
}

private static void createGUI() {
jFrame = new JFrame("Focus Traversal Test");
jFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);

JMenuBar jMenuBar = new JMenuBar();
jMenuBar.setFocusTraversalKeysEnabled(true);
jMenuBar.add(new JMenu("First Menu").add(new JMenuItem("First MenuItem")));

JButton northButton = new JButton("North Button");
JButton southButton = new JButton("South Button");

JPanel jPanel = new JPanel(new BorderLayout());
jPanel.add(northButton);
jPanel.add(jMenuBar, BorderLayout.NORTH);
jPanel.add(southButton, BorderLayout.SOUTH);

jFrame.getContentPane().add(jPanel);
jFrame.setFocusTraversalPolicy(new ContainerOrderFocusTraversalPolicy());
jFrame.pack();
northButton.requestFocusInWindow();
jFrame.setLocationRelativeTo(null);
jFrame.setVisible(true);
}

public static void main(String[] args) throws Exception {
doTest();
}
}

5 comments on commit 97c7298

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 97c7298 Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 97c7298 Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-97c7298a in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 97c7298a from the openjdk/jdk repository.

The commit being backported was authored by Srinivas Mandalika on 30 Mar 2022 and was reviewed by Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-97c7298a:GoeLin-backport-97c7298a
$ git checkout GoeLin-backport-97c7298a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-97c7298a

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 97c7298 Oct 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 97c7298 Oct 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-97c7298a in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 97c7298a from the openjdk/jdk repository.

The commit being backported was authored by Srinivas Mandalika on 30 Mar 2022 and was reviewed by Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-97c7298a:GoeLin-backport-97c7298a
$ git checkout GoeLin-backport-97c7298a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-97c7298a

Please sign in to comment.