-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8306850: Open source AWT Model related tests
Reviewed-by: serb, azvegint
- Loading branch information
Abhishek Kumar
committed
Apr 27, 2023
1 parent
fed262a
commit 41ba05e
Showing
6 changed files
with
1,053 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,195 @@ | ||
/* | ||
* Copyright (c) 2005, 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 4957639 | ||
@summary REGRESSION: blocked mouse input in a special case on win32 | ||
@key headful | ||
@run main BlockedMouseInputTest | ||
*/ | ||
|
||
import java.awt.Dimension; | ||
import java.awt.EventQueue; | ||
import java.awt.Frame; | ||
import java.awt.Point; | ||
import java.awt.Robot; | ||
|
||
import java.awt.event.InputEvent; | ||
import java.awt.event.ItemEvent; | ||
import java.awt.event.ItemListener; | ||
|
||
import javax.swing.JComboBox; | ||
import javax.swing.JDialog; | ||
/* | ||
* Threads: | ||
* 0) Main - running others, checking | ||
* 1) First - opening first dialog | ||
* 2) Second - opening second dialog, generating item state changed events | ||
* We need 1 and 2 thread in order to don't block main thread | ||
*/ | ||
|
||
public class BlockedMouseInputTest implements ItemListener { | ||
Frame frame = null; | ||
|
||
ThreadDialog thread1 = null; | ||
ThreadDialog thread2 = null; | ||
|
||
// If we recreate dialogs in the Threads classes then the test works fine | ||
JComboBox<String> cb = null; | ||
JDialog dialog1 = null; | ||
JDialog dialog2 = null; | ||
|
||
Robot r = null; | ||
volatile Point loc = null; | ||
volatile int cbWidth; | ||
volatile int cbHeight; | ||
|
||
volatile int selected; | ||
|
||
volatile boolean passed = false; | ||
|
||
public static void main(String[] args) throws Exception { | ||
BlockedMouseInputTest test = new BlockedMouseInputTest(); | ||
test.start(); | ||
} | ||
|
||
public void start() throws Exception { | ||
try { | ||
r = new Robot(); | ||
EventQueue.invokeAndWait(() -> { | ||
frame = new Frame("Parent frame"); | ||
frame.setSize(200, 200); | ||
frame.setLocationRelativeTo(null); | ||
frame.setVisible(true); | ||
}); | ||
test(); | ||
} finally { | ||
EventQueue.invokeAndWait(() -> { | ||
if (frame != null) { | ||
frame.dispose(); | ||
} | ||
if (dialog1 != null) { | ||
dialog1.dispose(); | ||
} | ||
if (dialog2 != null) { | ||
dialog2.dispose(); | ||
} | ||
}); | ||
} | ||
} | ||
|
||
private void test() throws Exception { | ||
|
||
// The state of the combobox should stay the same to new iteration of the cycle | ||
// We couldn't run the thread twice | ||
EventQueue.invokeAndWait(() -> { | ||
cb = new JComboBox<String>(new String[]{"entry a", "entry b", | ||
"entry c", "entry d", "entry e"}); | ||
dialog1 = new JDialog(frame, "dialog1", true); | ||
dialog2 = new JDialog(frame, "dialog2", true); | ||
dialog2.getContentPane().add(cb); | ||
cb.addItemListener(this); | ||
|
||
dialog1.setLocation(20, 20); | ||
dialog1.setSize(new Dimension(150, 50)); | ||
dialog2.setLocation(120, 120); | ||
dialog2.setSize(new Dimension(150, 50)); | ||
}); | ||
|
||
for (int i = 0; i < 2; i++) { | ||
passed = false; | ||
tryGenerateEvent(); | ||
if (!passed && i != 0) { | ||
throw new RuntimeException("Test failed: triggering not occurred, iteration - " + i); | ||
} | ||
} | ||
} | ||
|
||
private void tryGenerateEvent() throws Exception { | ||
EventQueue.invokeAndWait(() -> { | ||
thread1 = new ThreadDialog(dialog1); | ||
thread2 = new ThreadDialog(dialog2); | ||
}); | ||
|
||
thread1.start(); | ||
r.delay(500); | ||
r.waitForIdle(); | ||
thread2.start(); | ||
r.delay(500); | ||
r.waitForIdle(); | ||
|
||
doRobotAction(); | ||
|
||
EventQueue.invokeAndWait(() -> { | ||
dialog2.setVisible(false); | ||
dialog1.setVisible(false); | ||
}); | ||
} | ||
|
||
public void itemStateChanged(ItemEvent ie) { | ||
passed = true; | ||
System.out.println("event: "+ie); | ||
} | ||
|
||
public void doRobotAction() throws Exception { | ||
EventQueue.invokeAndWait(() -> { | ||
loc = cb.getLocationOnScreen(); | ||
cbWidth = cb.getWidth(); | ||
cbHeight = cb.getHeight(); | ||
}); | ||
|
||
r.mouseMove(loc.x + cbWidth / 2, loc.y + cbHeight / 2); | ||
r.delay(500); | ||
r.mousePress(InputEvent.BUTTON1_DOWN_MASK); | ||
r.delay(500); | ||
r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); | ||
r.delay(500); | ||
|
||
EventQueue.invokeAndWait(() -> { | ||
selected = cb.getSelectedIndex(); | ||
}); | ||
|
||
r.mouseMove(loc.x + cbWidth / 2, loc.y + cbHeight * ((selected == 0) ? 2 : 1) + 10); | ||
r.delay(500); | ||
r.mousePress(InputEvent.BUTTON1_DOWN_MASK); | ||
r.delay(500); | ||
r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); | ||
r.delay(500); | ||
|
||
r.waitForIdle(); | ||
} | ||
} | ||
|
||
class ThreadDialog extends Thread { | ||
|
||
JDialog dialog = null; | ||
|
||
public ThreadDialog(JDialog dialog){ | ||
this.dialog = dialog; | ||
} | ||
|
||
public void run() { | ||
dialog.setVisible(true); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
/* | ||
* Copyright (c) 2005, 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 6271546 | ||
@summary REG. Mouse input blocked on a window which is a child of a modal dialog | ||
@key headful | ||
@run main BlockedMouseInputTest2 | ||
*/ | ||
|
||
import java.awt.BorderLayout; | ||
import java.awt.Button; | ||
import java.awt.Dialog; | ||
import java.awt.EventQueue; | ||
import java.awt.Frame; | ||
import java.awt.Point; | ||
import java.awt.Robot; | ||
import java.awt.event.ActionEvent; | ||
import java.awt.event.ActionListener; | ||
import java.awt.event.InputEvent; | ||
|
||
public class BlockedMouseInputTest2 { | ||
Frame frame; | ||
Dialog dlg1; | ||
Dialog dlg2; | ||
Button b; | ||
Robot r = null; | ||
volatile boolean passed = false; | ||
volatile Point p; | ||
volatile int btnWidth; | ||
volatile int btnHeight; | ||
|
||
public static void main(String args[]) throws Exception { | ||
BlockedMouseInputTest2 test = new BlockedMouseInputTest2(); | ||
test.start(); | ||
} | ||
|
||
public void start() throws Exception { | ||
try { | ||
r = new Robot(); | ||
EventQueue.invokeAndWait(() -> { | ||
frame = new Frame("Parent frame"); | ||
frame.setBounds(100, 100, 200, 100); | ||
frame.setLocationRelativeTo(null); | ||
frame.setVisible(true); | ||
|
||
dlg1 = new Dialog(frame, "Dialog 1", true); | ||
dlg1.setBounds(200, 200, 200, 100); | ||
|
||
new Thread(new Runnable() { | ||
public void run() { | ||
dlg1.setVisible(true); | ||
} | ||
}).start(); | ||
}); | ||
|
||
r.delay(1000); | ||
r.waitForIdle(); | ||
|
||
EventQueue.invokeAndWait(() -> { | ||
dlg2 = new Dialog(frame, "Dialog 2", true); | ||
dlg2.setBounds(300, 300, 200, 100); | ||
}); | ||
new Thread(new Runnable() { | ||
public void run() { | ||
dlg2.setVisible(true); | ||
} | ||
}).start(); | ||
|
||
r.delay(1000); | ||
r.waitForIdle(); | ||
|
||
EventQueue.invokeAndWait(() -> { | ||
Dialog d = new Dialog(dlg2, "D", false); | ||
d.setBounds(400, 400, 200, 100); | ||
d.setLayout(new BorderLayout()); | ||
b = new Button("Test me"); | ||
b.addActionListener(new ActionListener() { | ||
public void actionPerformed(ActionEvent e) { | ||
passed = true; | ||
} | ||
}); | ||
d.add(b, BorderLayout.CENTER); | ||
d.setVisible(true); | ||
}); | ||
|
||
r.delay(1000); | ||
r.waitForIdle(); | ||
|
||
EventQueue.invokeAndWait(() -> { | ||
p = b.getLocationOnScreen(); | ||
btnWidth = b.getSize().width; | ||
btnHeight = b.getSize().height; | ||
}); | ||
r.mouseMove(p.x + btnWidth / 2, p.y + btnHeight / 2); | ||
r.delay(500); | ||
r.mousePress(InputEvent.BUTTON1_DOWN_MASK); | ||
r.delay(500); | ||
r.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); | ||
r.delay(500); | ||
|
||
if (!passed) { | ||
throw new RuntimeException("Test is FAILED: button is not pressed"); | ||
} | ||
} finally { | ||
EventQueue.invokeAndWait(() -> { | ||
if (frame != null) { | ||
frame.dispose(); | ||
} | ||
if (dlg1 != null) { | ||
dlg1.dispose(); | ||
} | ||
if (dlg2 != null) { | ||
dlg2.dispose(); | ||
} | ||
}); | ||
} | ||
} | ||
} |
Oops, something went wrong.
41ba05e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
41ba05e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk17u-dev
41ba05e
There was a problem hiding this comment.
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-41ba05e4 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:
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: