Skip to content

Commit

Permalink
8305943: Open source few AWT Focus related tests
Browse files Browse the repository at this point in the history
Reviewed-by: prr, serb
  • Loading branch information
prsadhuk committed Apr 20, 2023
1 parent b8f0a66 commit 64ed816
Show file tree
Hide file tree
Showing 5 changed files with 765 additions and 0 deletions.
133 changes: 133 additions & 0 deletions test/jdk/java/awt/Focus/NoFocusOwnerAWTTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/*
* Copyright (c) 2001, 2023, 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 4390019
@summary REGRESSION: Alt-F4 keybinding no longer shuts down java application on Windows
@key headful
@requires (os.family == "windows")
@run main NoFocusOwnerAWTTest
*/
import java.awt.Frame;
import java.awt.BorderLayout;
import java.awt.EventQueue;
import java.awt.Label;
import java.awt.MenuBar;
import java.awt.Menu;
import java.awt.MenuItem;
import java.awt.MenuShortcut;
import java.awt.Robot;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import java.awt.event.WindowAdapter;

public class NoFocusOwnerAWTTest {

static boolean actionFired = false;
static boolean closingWindowCalled = false;
static Frame frame;

public static void main(String[] args) throws Exception {
try {
if (!System.getProperty("os.name").startsWith("Windows")) {
// this test is Win32 test only
return;
}
EventQueue.invokeAndWait(() -> {

frame = new Frame("No Focus Owner AWT Test");
frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
System.out.println("windowClosing() is called.");
closingWindowCalled = true;
}
});
frame.addFocusListener(new FocusListener() {
public void focusGained(FocusEvent fe) {
System.out.println("focus gained on frame");
}
public void focusLost(FocusEvent fe) {
System.out.println("focus lost on frame");
}
});
MenuBar mb = new MenuBar();
Menu m = new Menu("This is Menu");
MenuItem mi = new MenuItem("Menu Item");
mi.setShortcut(new MenuShortcut(KeyEvent.VK_A));
mi.addActionListener( new ActionListener() {
public void actionPerformed(ActionEvent ae) {
System.out.println("action");
actionFired = true;
}
});
m.add(mi);
mb.add(m);
frame.setMenuBar(mb);
Label lb;
frame.add(lb = new Label("press"));
lb.addFocusListener(new FocusListener() {
public void focusGained(FocusEvent fe) {
System.out.println("focus gained on label");
}
public void focusLost(FocusEvent fe) {
System.out.println("focus lost on label");
}
});
frame.pack();
frame.toFront();
frame.setLocationRelativeTo(null);
frame.setVisible(true);
});

Robot robot = new Robot();
robot.setAutoDelay(100);
robot.delay(1000);
robot.keyPress(KeyEvent.VK_CONTROL);
robot.keyPress(KeyEvent.VK_A);
robot.waitForIdle();
robot.keyRelease(KeyEvent.VK_A);
robot.keyRelease(KeyEvent.VK_CONTROL);
robot.waitForIdle();
robot.keyPress(KeyEvent.VK_ALT);
robot.keyPress(KeyEvent.VK_F4);
robot.waitForIdle();
robot.keyRelease(KeyEvent.VK_F4);
robot.keyRelease(KeyEvent.VK_ALT);
robot.waitForIdle();
robot.delay(1000);

if (!actionFired || !closingWindowCalled) {
throw new RuntimeException("Test FAILED(actionFired="+actionFired+
";closingWindowCalled="+closingWindowCalled+")");
}
} finally {
if (frame != null) {
frame.dispose();
}
}
}
}// class NoFocusOwnerAWTTest
100 changes: 100 additions & 0 deletions test/jdk/java/awt/Focus/NoFocusOwnerSwingTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright (c) 2001, 2023, 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 4390019
@summary REGRESSION: Alt-F4 keybinding no longer shuts down java application on Windows
@key headful
@requires (os.family == "windows")
@run main NoFocusOwnerSwingTest
*/

import java.awt.BorderLayout;
import java.awt.EventQueue;
import java.awt.Label;
import java.awt.MenuBar;
import java.awt.Menu;
import java.awt.MenuItem;
import java.awt.MenuShortcut;
import java.awt.Robot;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
import java.awt.event.WindowAdapter;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;

public class NoFocusOwnerSwingTest {
static boolean closingWindowCalled = false;
static JFrame frame;

public static void main(String[] args) throws Exception {
try {
if (!System.getProperty("os.name").startsWith("Windows")) {
// this test is Win32 test only
return;
}

SwingUtilities.invokeAndWait(() -> {
frame = new JFrame("No Focus Owner Swing Test");
JButton btn;
frame.getContentPane().add(btn = new JButton("press"));
frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
System.out.println("windowClosing is called");
closingWindowCalled = true;
}
});
frame.pack();
frame.toFront();
frame.setLocationRelativeTo(null);
frame.setVisible(true);
});

Robot robot = new Robot();
robot.setAutoDelay(100);
robot.delay(1000);
robot.keyPress(KeyEvent.VK_ALT);
robot.keyPress(KeyEvent.VK_F4);
robot.waitForIdle();
robot.keyRelease(KeyEvent.VK_F4);
robot.keyRelease(KeyEvent.VK_ALT);
robot.waitForIdle();

if (!closingWindowCalled) {
throw new RuntimeException("Test FAILED(closingWindowCalled=" +
closingWindowCalled + ")");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (frame != null) {
frame.dispose();
}
});
}
}
}// class NoFocusOwnerSwingTest
Loading

3 comments on commit 64ed816

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@Rudometov
Copy link
Member

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 64ed816 May 18, 2023

Choose a reason for hiding this comment

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

@Rudometov the backport was successfully created on the branch Rudometov-backport-64ed816a 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 64ed816a from the openjdk/jdk repository.

The commit being backported was authored by Prasanta Sadhukhan on 20 Apr 2023 and was reviewed by Phil Race and Sergey Bylokhov.

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.git Rudometov-backport-64ed816a:Rudometov-backport-64ed816a
$ git checkout Rudometov-backport-64ed816a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git Rudometov-backport-64ed816a

Please sign in to comment.