Skip to content

Commit

Permalink
8315898: Open source swing JMenu tests
Browse files Browse the repository at this point in the history
Reviewed-by: serb
  • Loading branch information
Abhishek Kumar committed Sep 13, 2023
1 parent bb6b3f2 commit fecd2fd
Show file tree
Hide file tree
Showing 6 changed files with 357 additions and 0 deletions.
49 changes: 49 additions & 0 deletions test/jdk/javax/swing/JMenu/bug4143592.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* 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 4143592
* @summary Tests the method add(Component, int) of JMenu for insertion
the given component to a specified position of menu
* @run main bug4143592
*/

import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;

public class bug4143592 {

public static void main(String[] argv) {
JMenuBar mb = new JMenuBar();
JMenu m = mb.add(new JMenu("Order"));
m.add("beginning");
m.add("middle");
m.add("end");
m.add(new JMenuItem("in between"), 1);
if (!m.getItem(1).getText().equals("in between")) {
throw new RuntimeException("Item was inserted incorrectly.");
}
}
}
50 changes: 50 additions & 0 deletions test/jdk/javax/swing/JMenu/bug4148154.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* 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 4148154
* @summary Tests that menu items created by JMenu.add(Action) method
have right HorizontalTextPosition.
* @run main bug4148154
*/

import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
import javax.swing.JMenu;
import javax.swing.JMenuItem;

public class bug4148154
{
public static void main(String[] args) {
JMenu menu = new JMenu();
JMenuItem mi = menu.add(new AbstractAction() {
public void actionPerformed(ActionEvent ev) {}
});
if (mi.getHorizontalTextPosition() != JMenu.LEADING &&
mi.getHorizontalTextPosition() != JMenu.TRAILING) {

throw new RuntimeException("Failed:");
}
}
}
43 changes: 43 additions & 0 deletions test/jdk/javax/swing/JMenu/bug4156316.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* 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 4156316
* @summary checks if JMenu.add(Component) throws NullPointerException
* @run main bug4156316
*/

import javax.swing.JComponent;
import javax.swing.JMenu;

public class bug4156316 {

public static void main(String[] args) {
JMenu m = new JMenu("test");
m.add(new XComponent());
}

static class XComponent extends JComponent {
}
}
58 changes: 58 additions & 0 deletions test/jdk/javax/swing/JMenu/bug4161866.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* 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 4161866
* @summary Method AccessibleJMenu.removeAccessibleSelection does not
remove selections correctly
* @run main bug4161866
*/

import javax.accessibility.AccessibleSelection;
import javax.swing.JMenu;
import javax.swing.JMenuBar;

public class bug4161866 {

public static void main(String[] argv) {
JMenuBar mb = new JMenuBar();
JMenu mnu = new JMenu();
AccessibleSelection acs = mnu.getAccessibleContext().
getAccessibleSelection();
mb.add(mnu);
JMenu jm = new JMenu();
mnu.add(jm);
jm.setSelected(true);
acs.addAccessibleSelection(0);
if (!jm.isSelected()) {
throw new RuntimeException("Selection should be non-empty...");
}

acs.removeAccessibleSelection(0);
if (jm.isSelected()) {
throw new RuntimeException("Selection still non-empty after " +
"it was removed");
}
}
}
58 changes: 58 additions & 0 deletions test/jdk/javax/swing/JMenu/bug4244796.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* 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 4244796
* @summary Tests that JMenu has JMenu(Action) constructor
* @run main bug4244796
*/

import java.awt.event.ActionEvent;
import java.beans.PropertyChangeListener;
import javax.swing.Action;
import javax.swing.JMenu;

public class bug4244796 {

/**
* Auxilliary class implementing Action
*/
static class NullAction implements Action {
public void addPropertyChangeListener(
PropertyChangeListener listener) {}
public void removePropertyChangeListener(
PropertyChangeListener listener) {}
public void putValue(String key, Object value) {}
public void setEnabled(boolean b) {}
public void actionPerformed(ActionEvent e) {}

public Object getValue(String key) { return null; }
public boolean isEnabled() { return false; }
}

public static void main(String[] argv) {
Action action = new NullAction();
JMenu menu = new JMenu(action);
}
}
99 changes: 99 additions & 0 deletions test/jdk/javax/swing/JMenu/bug4767393.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
* 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 4767393
* @summary Disabled JMenu is selectable via mnemonic
* @key headful
* @run main bug4767393
*/

import java.awt.Robot;
import java.awt.event.KeyEvent;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.SwingUtilities;

public class bug4767393 {

public static JFrame mainFrame;
public static JMenuBar menuBar;
public static JMenu menu;
public static JMenu disabled;
public static volatile boolean disabledMenuSelected = true;

public static void main(String[] args) throws Exception {
try {
Robot robo = new Robot();
robo.setAutoDelay(100);
SwingUtilities.invokeAndWait(() -> {
mainFrame = new JFrame("Bug4767393");
menuBar = new JMenuBar();
menu = new JMenu("File");
disabled = new JMenu("Disabled");
menuBar.add(menu);
menu.add("Menu Item 1");
menu.add("Menu Item 2");
disabled.setEnabled(false);
disabled.setMnemonic('D');
disabled.add("Dummy menu item");
menu.add(disabled);
menu.add("Menu Item 3");
menu.add("Menu Item 4");
mainFrame.setJMenuBar(menuBar);

mainFrame.setSize(200, 200);
mainFrame.setLocationRelativeTo(null);
mainFrame.setVisible(true);
});
robo.waitForIdle();
robo.delay(500);

robo.keyPress(KeyEvent.VK_F10);
robo.keyRelease(KeyEvent.VK_F10);
robo.keyPress(KeyEvent.VK_DOWN);
robo.keyRelease(KeyEvent.VK_DOWN);
robo.delay(500);
robo.keyPress(KeyEvent.VK_D);
robo.keyRelease(KeyEvent.VK_D);
robo.delay(100);

SwingUtilities.invokeAndWait(() -> {
disabledMenuSelected = disabled.isSelected();
});

if (disabledMenuSelected) {
throw new RuntimeException("Disabled JMenu is selected" +
" by the mnemonic. Test failed.");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (mainFrame != null) {
mainFrame.dispose();
}
});
}
}
}

5 comments on commit fecd2fd

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@SoniaZaldana
Copy link
Member

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 fecd2fd Mar 1, 2024

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Abhishek Kumar on 13 Sep 2023 and was reviewed by 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/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-SoniaZaldana-fecd2fd8:backport-SoniaZaldana-fecd2fd8
$ git checkout backport-SoniaZaldana-fecd2fd8
# 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-SoniaZaldana-fecd2fd8

@SoniaZaldana
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 fecd2fd Mar 7, 2024

Choose a reason for hiding this comment

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

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

The commit being backported was authored by Abhishek Kumar on 13 Sep 2023 and was reviewed by 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 backport-SoniaZaldana-fecd2fd8:backport-SoniaZaldana-fecd2fd8
$ git checkout backport-SoniaZaldana-fecd2fd8
# 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 backport-SoniaZaldana-fecd2fd8

Please sign in to comment.