Skip to content

Commit

Permalink
8306484: Open source several AWT Choice jtreg tests
Browse files Browse the repository at this point in the history
Reviewed-by: serb
  • Loading branch information
prrace committed Apr 25, 2023
1 parent 2ea62c1 commit b5362da
Show file tree
Hide file tree
Showing 6 changed files with 1,048 additions and 0 deletions.
125 changes: 125 additions & 0 deletions test/jdk/java/awt/Choice/ChoiceConsumeMouseEvents.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
* 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 6251988
@summary PIT: Choice consumes MouseReleased, MouseClicked events when clicking it with left button,
@key headful
*/

import java.awt.Choice;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Point;
import java.awt.Robot;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;

public class ChoiceConsumeMouseEvents {

static volatile Frame frame;
static volatile Robot robot;
static volatile Choice choice1 = new Choice();
static volatile boolean mousePressed = false;
static volatile boolean mouseReleased = false;
static volatile boolean mouseClicked = false;

public static void main(String[] args) throws Exception {
try {
EventQueue.invokeAndWait(() -> createUI());
runTest();
} finally {
if (frame != null) {
EventQueue.invokeAndWait(() -> frame.dispose());
}
}
}

static void createUI() {
for (int i = 1; i<10; i++){
choice1.add("item-0"+i);
}
choice1.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent me) {
mousePressed = true;
System.out.println(me);
}
public void mouseReleased(MouseEvent me) {
mouseReleased = true;
System.out.println(me);
}
public void mouseClicked(MouseEvent me) {
mouseClicked = true;
System.out.println(me);
}
});

frame = new Frame("ChoiceConsumeMouseEvents");
frame.add(choice1);
frame.setSize(400, 400);
frame.setLocationRelativeTo(null);
frame.setVisible(true);
frame.validate();
}

static void runTest() {
try {
robot = new Robot();
robot.setAutoWaitForIdle(true);
robot.setAutoDelay(50);
robot.delay(100);
testMouseClick(InputEvent.BUTTON1_DOWN_MASK, 0);
robot.delay(100);
testMouseClick(InputEvent.BUTTON1_DOWN_MASK, 100);
} catch (Throwable e) {
throw new RuntimeException("Test failed. Exception thrown: "+e);
}
}

static void testMouseClick(int button, int delay) {
Point pt = choice1.getLocationOnScreen();
robot.mouseMove(pt.x + choice1.getWidth()/2, pt.y + choice1.getHeight()/2);
robot.delay(100);
robot.mousePress(button);
robot.delay(delay);
robot.mouseRelease(button);
robot.delay(200);
if (!(mousePressed &&
mouseReleased &&
mouseClicked))
{
throw new RuntimeException("Test failed. Choice should generate PRESSED, RELEASED, CLICKED events");
} else {
System.out.println("Test passed. Choice generated MouseDragged PRESSED, RELEASED, CLICKED events");
}
robot.keyPress(KeyEvent.VK_ESCAPE);
robot.keyRelease(KeyEvent.VK_ESCAPE);
robot.delay(200);
mousePressed = false;
mouseReleased = false;
mouseClicked = false;
}
}
116 changes: 116 additions & 0 deletions test/jdk/java/awt/Choice/ChoiceFocusLostTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/*
* 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 4338368
@summary Tests that choice doesn't throw spurious mouse events when losing focus
@key headful
*/

import java.awt.Button;
import java.awt.Choice;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Panel;
import java.awt.Robot;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;

public class ChoiceFocusLostTest {

public static void main(String[] args) throws Exception {
try {
EventQueue.invokeAndWait(() -> createUI());
Robot robot = new Robot();
robot.waitForIdle();
robot.keyPress(KeyEvent.VK_TAB);
robot.delay(50);
robot.keyRelease(KeyEvent.VK_TAB);
robot.waitForIdle();
robot.delay(1000);
if (!client.isPassed()) {
throw new RuntimeException("Test failed: choice fires spurious events");
} else {
System.out.println("Test passed.");
}
} finally {
if (frame != null) {
EventQueue.invokeAndWait(() -> frame.dispose());
}
}
}

static volatile Frame frame;
static volatile ChoiceBug client;

static void createUI() {
frame = new Frame("ChoiceFocusLostTest");
client = new ChoiceBug();
frame.add(client);
frame.pack();
frame.setLocationRelativeTo(null);
frame.setVisible(true);
}
}

class ChoiceBug extends Panel {

volatile boolean passed = true;

public ChoiceBug() {
Choice choice = new Choice();
choice.add("item-1");
choice.add("item-2");
Button button = new Button("Button");
add(choice);
add(button);
choice.addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent me) {
passed = false;
}
public void mouseClicked(MouseEvent me) {
passed = false;
}
});
choice.addFocusListener(new FocusAdapter() {
public void focusGained(FocusEvent fe) {
System.out.println("Focus Gained");
System.out.println(fe);
}
public void focusLost(FocusEvent fe) {
System.out.println("Got expected FocusLost event.");
System.out.println(fe);
}
});
setSize(400, 400);
choice.requestFocus();
}

public boolean isPassed() {
return passed;
}
}
132 changes: 132 additions & 0 deletions test/jdk/java/awt/Choice/ChoiceFreezeTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
/*
* 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 4303064
@summary Tests that choice doesn't freeze display when its container is
disabled and enabled after.
@key headful
*/

import java.awt.Button;
import java.awt.Choice;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Panel;
import java.awt.Robot;
import java.awt.event.InputEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;

public class ChoiceFreezeTest {

public static void main(String[] args) throws Exception {
try {
EventQueue.invokeAndWait(() -> createUI());
runTest();
} finally {
if (frame != null) {
EventQueue.invokeAndWait(() -> frame.dispose());
}
}
}

static volatile Frame frame;
static volatile ChoiceFreezeBug client;

static void createUI() {
frame = new Frame("ChoiceFreezeTest");
client = new ChoiceFreezeBug();
frame.add(client);
frame.pack();
frame.setLocationRelativeTo(null);
frame.setVisible(true);
client.init();
}

static void runTest() throws Exception {
Robot robot = new Robot();
robot.waitForIdle();
robot.delay(2000);
robot.mouseMove(client.choice.getLocationOnScreen().x + 1, client.choice.getLocationOnScreen().y + 1);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(1000);
robot.mouseMove(client.button.getLocationOnScreen().x + 3, client.button.getLocationOnScreen().y + 3);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(1000);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(6000);

if (!client.isPassed()) {
throw new RuntimeException("Test failed: display is frozen.");
}
}
}

class ChoiceFreezeBug extends Panel {

volatile Button button;
volatile Choice choice;
volatile ChoiceMouseListener listener = new ChoiceMouseListener();

public ChoiceFreezeBug() {
choice = new Choice();
choice.addItem("Item 1");
choice.addItem("Item 2");
button = new Button("Button");
add(choice);
add(button);
button.addMouseListener(listener);
setEnabled(false);
}

void init() {
setEnabled(true);
choice.requestFocus();
}

public boolean isPassed() {
return listener.isPassed();
}
}

class ChoiceMouseListener extends MouseAdapter {

volatile boolean passed = false;

public void mouseReleased(MouseEvent e) {
passed = true;
}

public void mousePressed(MouseEvent e) {
passed = true;
}

public boolean isPassed() {
return passed;
}
}

5 comments on commit b5362da

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

The commit being backported was authored by Phil Race on 25 Apr 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 Rudometov-backport-b5362dad:Rudometov-backport-b5362dad
$ git checkout Rudometov-backport-b5362dad
# 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-b5362dad

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on b5362da Jun 29, 2023

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 b5362da Jun 29, 2023

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 GoeLin-backport-b5362dad 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 b5362dad from the openjdk/jdk repository.

The commit being backported was authored by Phil Race on 25 Apr 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/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git GoeLin-backport-b5362dad:GoeLin-backport-b5362dad
$ git checkout GoeLin-backport-b5362dad
# 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 GoeLin-backport-b5362dad

Please sign in to comment.