Skip to content

Commit

Permalink
8315761: Open source few swing JList and JMenuBar tests
Browse files Browse the repository at this point in the history
Reviewed-by: psadhukhan, tr
  • Loading branch information
Abhishek Kumar committed Sep 13, 2023
1 parent 2d168c5 commit bb6b3f2
Show file tree
Hide file tree
Showing 4 changed files with 249 additions and 0 deletions.
50 changes: 50 additions & 0 deletions test/jdk/javax/swing/JList/bug4300224.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright (c) 2000, 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 4300224
* @summary BasicListUI.ListDataHandler improperly updates list selection on insertion
* @run main bug4300224
*/

import javax.swing.JList;
import javax.swing.DefaultListModel;

public class bug4300224 {

public static void main(String[] args) throws Exception {
DefaultListModel<String> model = new DefaultListModel<>();
JList<String> list = new JList<>(model);

model.addElement("List Item 1");
model.addElement("List Item 2");
model.addElement("List Item 3");
model.addElement("List Item 4");
list.setSelectedIndex(2);
model.insertElementAt("Inserted Item", 0);
if (list.getSelectedIndex() != 3) {
throw new RuntimeException("Inserted element improperly updates list selection");
}
}
}
46 changes: 46 additions & 0 deletions test/jdk/javax/swing/JList/bug4487689.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* 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 4487689
* @summary JList.setSelectedValue() throws ArrayIndexOutOfBoundsException on empty list.
* @run main bug4487689
*/

import java.util.Vector;
import javax.swing.JList;

public class bug4487689 {

public static void main(String[] args) throws Exception {
JList<String> list = new JList<>(new Vector<String>());

list.setSelectedIndex(0);
list.getSelectedValue();

int[] indices = {0,1};
list.setSelectedIndices(indices);
list.getSelectedValues();
}
}
66 changes: 66 additions & 0 deletions test/jdk/javax/swing/JList/bug4832765.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* 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 4832765
* @summary JList vertical scrolling doesn't work properly.
* @run main bug4832765
*/

import java.awt.Dimension;
import java.awt.Rectangle;
import javax.swing.JFrame;
import javax.swing.JList;
import javax.swing.JScrollPane;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;

public class bug4832765 {

public static void main(String[] argv) throws Exception {
SwingUtilities.invokeAndWait(() -> {
String[] data = {"One", "Two", "Three", "Four",
"Five", "Six ", "Seven", "Eight",
"Nine", "Ten", "Eleven", "Twelv"};
JList<String> list = new JList<>(data);
list.setLayoutOrientation(JList.HORIZONTAL_WRAP);

JScrollPane jsp = new JScrollPane(list);
Rectangle rect = list.getCellBounds(5, 5);
Dimension d = new Dimension(200, rect.height);
jsp.setPreferredSize(d);
jsp.setMinimumSize(d);

list.scrollRectToVisible(rect);

int unit = list.getScrollableUnitIncrement(rect,
SwingConstants.VERTICAL,
-1);
if (unit <= 0) {
throw new RuntimeException("JList scrollable unit increment" +
" should be greate than 0.");
}
});
}
}
87 changes: 87 additions & 0 deletions test/jdk/javax/swing/JMenuBar/bug4802656.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
* 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 4802656
* @summary Problem with keyboard navigation in JMenus JMenuItems if setVisible(false)
* @key headful
* @run main bug4802656
*/

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 bug4802656 {

public static JFrame mainFrame;
public static JMenu menu2;
public static volatile boolean menu2Selected = true;

public static void main(String[] args) throws Exception {
Robot robo = new Robot();
robo.setAutoDelay(100);
try {
SwingUtilities.invokeAndWait(() -> {
mainFrame = new JFrame("Bug4802656");
JMenuBar menuBar = new JMenuBar();
JMenu menu1 = new JMenu("File");
menu2 = new JMenu("Hidden");
JMenu menu3 = new JMenu("Help");
menuBar.add(menu1);
menuBar.add(menu2);
menuBar.add(menu3);
menu2.setVisible(false);
mainFrame.setJMenuBar(menuBar);
mainFrame.setSize(200, 200);
mainFrame.setLocationRelativeTo(null);
mainFrame.setVisible(true);
});
robo.waitForIdle();
robo.delay(1000);
robo.keyPress(KeyEvent.VK_F10);
robo.keyRelease(KeyEvent.VK_F10);
robo.keyPress(KeyEvent.VK_RIGHT);
robo.keyRelease(KeyEvent.VK_RIGHT);
robo.delay(500);

SwingUtilities.invokeAndWait(() -> {
menu2Selected = menu2.isSelected();
});

if (menu2Selected) {
throw new RuntimeException("Test failed");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (mainFrame != null) {
mainFrame.dispose();
}
});
}
}
}

7 comments on commit bb6b3f2

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@luchenlin
Copy link

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 bb6b3f2 Jan 26, 2024

Choose a reason for hiding this comment

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

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

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

@luchenlin
Copy link

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 bb6b3f2 Jan 26, 2024

Choose a reason for hiding this comment

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

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

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

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-luchenlin-bb6b3f24:backport-luchenlin-bb6b3f24
$ git checkout backport-luchenlin-bb6b3f24
# 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-luchenlin-bb6b3f24

@luchenlin
Copy link

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 bb6b3f2 Jan 26, 2024

Choose a reason for hiding this comment

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

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

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

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

Please sign in to comment.