Skip to content

Commit

Permalink
8307080: Open source some more JComboBox jtreg tests
Browse files Browse the repository at this point in the history
Reviewed-by: kizune
  • Loading branch information
prrace committed Apr 28, 2023
1 parent 4818c79 commit b8de394
Show file tree
Hide file tree
Showing 5 changed files with 425 additions and 0 deletions.
55 changes: 55 additions & 0 deletions test/jdk/javax/swing/JComboBox/bug4171464.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* 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 4171464
@summary JComboBox should not throw InternalError
*/

import javax.swing.ComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.event.ListDataListener;

public class bug4171464 {

public static void main(String args[]) {
ComboBoxModel model = new ComboBoxModel() {
public void setSelectedItem(Object anItem) {}
public Object getSelectedItem() {return null;}
public int getSize() {return 0;}
public Object getElementAt(int index) {return null;}
public void addListDataListener(ListDataListener l) {}
public void removeListDataListener(ListDataListener l) {}
};
JComboBox comboBox = new JComboBox();
comboBox.setModel(model);
try {
comboBox.addItem(new Object() {});
} catch (InternalError e) {
// InternalError not suitable if app supplies non-mutable model.
throw new RuntimeException("4171464 TEST FAILED");
} catch (Exception e) {
// Expected exception due to non-mutable model.
}
}
}
58 changes: 58 additions & 0 deletions test/jdk/javax/swing/JComboBox/bug4244614.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 4244614
@summary Tests that JComboBox has setAction(Action) constructor
*/

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

public class bug4244614 {

/** Auxiliary 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) {
Object[] comboData = {"First", "Second", "Third"};
JComboBox combo = new JComboBox(comboData);
Action action = new NullAction();
combo.setAction(action);
}
}
81 changes: 81 additions & 0 deletions test/jdk/javax/swing/JComboBox/bug4276920.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* 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 4276920
@summary Tests that BasicComboPopup.hide() doesn't cause unnecessary repaints
@key headful
*/

import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;

public class bug4276920 {

static volatile TestComboBox combo;
static volatile JFrame frame;

public static void main(String[] args) throws Exception {
try {
SwingUtilities.invokeAndWait(bug4276920::createUI);
Thread.sleep(2000);
int before = combo.getRepaintCount();
SwingUtilities.invokeAndWait(combo::hidePopup);
int after = combo.getRepaintCount();
if (after > before) {
throw new Error("Failed 4276920: BasicComboPopup.hide() caused unnecessary repaint()");
}
} finally {
if (frame != null) {
SwingUtilities.invokeAndWait(frame::dispose);
}
}
}

static void createUI() {
combo = new TestComboBox(new String[] {"Why am I so slow?"});
frame = new JFrame("bug4276920");
frame.getContentPane().add(combo);
frame.pack();
frame.validate();
frame.setVisible(true);
}

static class TestComboBox extends JComboBox {
int count = 0;

TestComboBox(Object[] content) {
super(content);
}

public void repaint() {
super.repaint();
count++;
}

int getRepaintCount() {
return count;
}
}
}
115 changes: 115 additions & 0 deletions test/jdk/javax/swing/JComboBox/bug4924758.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
/*
* Copyright (c) 2004, 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 4924758
@summary 1.4 REGRESSION: In Motif L&F JComboBox doesn't react when spacebar is pressed
@key headful
*/

import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.Robot;
import java.awt.event.KeyEvent;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.PopupMenuListener;
import javax.swing.event.PopupMenuEvent;
import java.awt.event.KeyEvent;

public class bug4924758 {

static volatile boolean passed = false;
volatile boolean isLafOk = true;

volatile JFrame mainFrame;
volatile JComboBox comboBox;

public static void main(String[] args) throws Exception {
bug4924758 test = new bug4924758();
try {
SwingUtilities.invokeAndWait(test::createUI);
if (!test.isLafOk) {
throw new RuntimeException("Could not create Win L&F");
}
test.test();
if (!passed) {
throw new RuntimeException(
"Popup was not closed after VK_SPACE press. Test failed.");
}
} finally {
JFrame f = test.mainFrame;
if (f != null) {
SwingUtilities.invokeAndWait(() -> f.dispose());
}
}
}

void createUI() {
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
} catch (Exception ex) {
System.err.println("Can not initialize Motif L&F. Testing skipped.");
isLafOk = false;
return;
}

mainFrame = new JFrame("Bug4924758");
String[] items = {"One", "Two", "Three"};
comboBox = new JComboBox(items);
comboBox.addPopupMenuListener(new PopupMenuListener() {
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}

public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
passed = true;
}

public void popupMenuCanceled(PopupMenuEvent e) {}
});
mainFrame.setLayout(new BorderLayout());
mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
mainFrame.add(comboBox, BorderLayout.CENTER);
mainFrame.pack();
mainFrame.setLocationRelativeTo(null);
mainFrame.setVisible(true);
}

void test() throws Exception {
Robot robot = new Robot();
robot.setAutoDelay(50);
robot.delay(2000);
Point p = comboBox.getLocationOnScreen();
Dimension size = comboBox.getSize();
p.x += size.width / 2;
p.y += size.height / 2;
robot.mouseMove(p.x, p.y);
robot.keyPress(KeyEvent.VK_DOWN);
robot.keyRelease(KeyEvent.VK_DOWN);
robot.keyPress(KeyEvent.VK_SPACE);
robot.keyRelease(KeyEvent.VK_SPACE);
robot.delay(2000);
}
}
Loading

3 comments on commit b8de394

@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 b8de394 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-b8de3943 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 b8de3943 from the openjdk/jdk repository.

The commit being backported was authored by Phil Race on 28 Apr 2023 and was reviewed by Alexander Zuev.

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-b8de3943:Rudometov-backport-b8de3943
$ git checkout Rudometov-backport-b8de3943
# 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-b8de3943

Please sign in to comment.