Skip to content

Commit

Permalink
8315741: Open source few swing JFormattedTextField and JPopupMenu tests
Browse files Browse the repository at this point in the history
Reviewed-by: kizune, tr
  • Loading branch information
Abhishek Kumar committed Sep 15, 2023
1 parent 0775bf2 commit bfbc41c
Showing 5 changed files with 486 additions and 0 deletions.
134 changes: 134 additions & 0 deletions test/jdk/javax/swing/JFormattedTextField/bug4741926.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
/*
* Copyright (c) 2003, 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 4741926
* @summary JFormattedTextField/JSpinner always consumes certain key events
* @key headful
* @run main bug4741926
*/

import java.awt.Robot;
import java.awt.event.ActionEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyEvent;
import java.util.Date;
import javax.swing.AbstractAction;
import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JFormattedTextField;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;

public class bug4741926 {

static MyFormattedTextField ftf;
static JFrame fr;
static Robot robot;
static volatile boolean passed_enter = false;
static volatile boolean passed_escape = false;
static volatile boolean ftfFocused = false;
static volatile boolean keyProcessed = false;

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

try {
robot = new Robot();
robot.setAutoDelay(100);
SwingUtilities.invokeAndWait(() -> {
fr = new JFrame("Test");
ftf = new MyFormattedTextField();
ftf.setValue("JFormattedTextField");
JPanel p = (JPanel) fr.getContentPane();
p.add(ftf);
ftf.addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent e) {
ftfFocused = true;
}
});
InputMap map = p.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);

map.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
"enter-action");
p.getActionMap().put("enter-action", new AbstractAction() {
public void actionPerformed(ActionEvent e) {
passed_enter = true;
keyProcessed = true;
}
});
map.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
"escape-action");
p.getActionMap().put("escape-action", new AbstractAction() {
public void actionPerformed(ActionEvent e) {
passed_escape = true;
keyProcessed = true;
}
});
fr.pack();
fr.setLocationRelativeTo(null);
fr.setVisible(true);
});
robot.waitForIdle();
robot.delay(1000);
test();
if (!(passed_enter && passed_escape)) {
throw new RuntimeException("JFormattedTextField consume " +
"Enter/Escape key event");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (fr != null) {
fr.dispose();
}
});
}
}

public static void test() throws Exception {
SwingUtilities.invokeAndWait(() -> {
ftf.requestFocus();
});
robot.delay(500);
doTest(KeyEvent.VK_ENTER);
doTest(KeyEvent.VK_ESCAPE);
}

static void doTest(int keyCode) throws InterruptedException {
keyProcessed = false;
KeyEvent key = new KeyEvent(ftf, KeyEvent.KEY_PRESSED,
new Date().getTime(), 0,
keyCode,
KeyEvent.CHAR_UNDEFINED);
ftf.processKey(key);
}

static class MyFormattedTextField extends JFormattedTextField {
public void processKey(KeyEvent e) {
processKeyEvent(e);
}
}
}
101 changes: 101 additions & 0 deletions test/jdk/javax/swing/JFormattedTextField/bug4863121.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* Copyright (c) 2003, 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 4863121
* @summary JFormattedTextField's NotifyAction should invoke invalidEdit if
commit fails
* @key headful
* @run main bug4863121
*/

import java.awt.Robot;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyEvent;
import java.text.Format;
import java.text.DecimalFormat;
import javax.swing.JFormattedTextField;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;

public class bug4863121 {

static TestFormattedTextField ftf;
static JFrame fr;
static Robot robot;

private static volatile boolean focused = false;
private static volatile boolean passed = false;

public static void main(String[] args) throws Exception {
try {
robot = new Robot();
robot.setAutoDelay(100);
SwingUtilities.invokeAndWait(() -> {
fr = new JFrame("Test");
ftf = new TestFormattedTextField(new DecimalFormat("####"));
ftf.setText("q");
fr.getContentPane().add(ftf);

ftf.addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent e) {
focused = true;
}
});
fr.pack();
fr.setLocationRelativeTo(null);
fr.setVisible(true);
});
robot.waitForIdle();
robot.delay(1000);
SwingUtilities.invokeAndWait(() -> {
ftf.requestFocus();
});
robot.waitForIdle();
robot.delay(500);
robot.keyPress(KeyEvent.VK_ENTER);
robot.keyRelease(KeyEvent.VK_ENTER);
if (!passed) {
throw new RuntimeException("JFormattedTextField's NotifyAction " +
"should invoke invalidEdit if commit fails");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (fr != null) {
fr.dispose();
}
});
}
}

public static class TestFormattedTextField extends JFormattedTextField {
public TestFormattedTextField(Format f) {
super(f);
}
protected void invalidEdit() {
passed = true;
}
}
}
75 changes: 75 additions & 0 deletions test/jdk/javax/swing/JFormattedTextField/bug4886538.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
* Copyright (c) 2003, 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 4886538
* @summary JFormattedTextField not returning correct value (class)
* @run main bug4886538
*/

import javax.swing.JFormattedTextField;
import javax.swing.SwingUtilities;
import javax.swing.text.DefaultFormatterFactory;

public class bug4886538 {

public static void main(String[] args) throws Exception {
// test default display formatter
TestFormattedTextField field = new TestFormattedTextField(0.0);
field.setFormatter(((DefaultFormatterFactory) field.
getFormatterFactory()).getDisplayFormatter());
field.setText("10");
field.commitEdit();

Object dblValue = field.getValue();
if (!(dblValue instanceof Double)) {
throw new RuntimeException("The JFormattedTextField's value " +
"should be instanceof Double");
}

// test default editor formatter
field = new TestFormattedTextField(0.0);
field.setFormatter(((DefaultFormatterFactory) field.
getFormatterFactory()).getEditFormatter());
field.setText("10");
field.commitEdit();

dblValue = field.getValue();
if (!(dblValue instanceof Double)) {
throw new RuntimeException("The JFormattedTextField's value " +
"should be instanceof Double");
}

}

static class TestFormattedTextField extends JFormattedTextField {
public TestFormattedTextField(Object value) {
super(value);
}
public void setFormatter(JFormattedTextField.AbstractFormatter formatter) {
super.setFormatter(formatter);
}
}

}
74 changes: 74 additions & 0 deletions test/jdk/javax/swing/JPopupMenu/bug4123919.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
* Copyright (c) 1999, 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 4123919
* @requires (os.family == "windows")
* @summary JPopupMenu.isPopupTrigger() under a different L&F.
* @key headful
* @run main bug4123919
*/

import javax.swing.JLabel;
import javax.swing.JPopupMenu;
import javax.swing.UIManager;
import javax.swing.SwingUtilities;
import java.awt.event.MouseEvent;
import java.util.Date;

public class bug4123919 {

public static void main(String[] args) throws Exception {
JPopupMenu popup = new JPopupMenu("Test");
JLabel lb = new JLabel();
UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
SwingUtilities.updateComponentTreeUI(lb);
SwingUtilities.updateComponentTreeUI(popup);
if (!popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_PRESSED,
(new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
" MotifLookAndFeel when mouse pressed...");
}
if (popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_RELEASED,
(new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
" MotifLookAndFeel when mouse released...");
}

UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
SwingUtilities.updateComponentTreeUI(lb);
SwingUtilities.updateComponentTreeUI(popup);

if (popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_PRESSED,
(new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
" WindowsLookAndFeel when mouse pressed...");
}
if (!popup.isPopupTrigger(new MouseEvent(lb, MouseEvent.MOUSE_RELEASED,
(new Date()).getTime(), MouseEvent.BUTTON3_MASK, 10, 10, 1, true))) {
throw new RuntimeException("JPopupMenu.isPopupTrigger() fails on" +
" WindowsLookAndFeel when mouse released...");
}
}
}
Loading
Oops, something went wrong.

3 comments on commit bfbc41c

@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 bfbc41c Mar 20, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on bfbc41c Mar 20, 2024

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 backport-GoeLin-bfbc41c1 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-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 bfbc41c1 from the openjdk/jdk repository.

The commit being backported was authored by Abhishek Kumar on 15 Sep 2023 and was reviewed by Alexander Zuev and Tejesh R.

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/jdk21u-dev:

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

Please sign in to comment.