-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automat…
…ic main test 8328269: NonFocusablePopupMenuTest.java should be marked as headful Reviewed-by: mbaesken Backport-of: b8dfeafdfd9ca024c92c9a73b59e6e71c0551985
- Loading branch information
Andrew Lu
committed
Jul 10, 2024
1 parent
dc3d552
commit 5f78ddd
Showing
3 changed files
with
96 additions
and
257 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,96 @@ | ||
/* | ||
* Copyright (c) 2007, 2024, 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 6519005 | ||
* @summary regression: Selection the item on the choice don't work properly in vista ultimate. | ||
* @key headful | ||
* @run main NonFocusablePopupMenuTest | ||
*/ | ||
|
||
import java.awt.AWTException; | ||
import java.awt.Choice; | ||
import java.awt.Dimension; | ||
import java.awt.EventQueue; | ||
import java.awt.FlowLayout; | ||
import java.awt.Frame; | ||
import java.awt.Point; | ||
import java.awt.Robot; | ||
import java.awt.event.InputEvent; | ||
import java.lang.reflect.InvocationTargetException; | ||
|
||
public class NonFocusablePopupMenuTest extends Frame { | ||
Choice choice; | ||
volatile Point pos; | ||
volatile Dimension size; | ||
volatile int selection1, selection2; | ||
|
||
public void performTest() throws AWTException, | ||
InterruptedException, InvocationTargetException { | ||
Robot robot = new Robot(); | ||
robot.setAutoDelay(100); | ||
EventQueue.invokeAndWait(() -> { | ||
choice = new Choice(); | ||
choice.add("111"); | ||
choice.add("222"); | ||
choice.add("333"); | ||
choice.add("444"); | ||
choice.setFocusable(false); | ||
this.add(choice); | ||
this.setLayout(new FlowLayout()); | ||
setSize (200, 200); | ||
setLocationRelativeTo(null); | ||
setVisible(true); | ||
}); | ||
robot.waitForIdle(); | ||
EventQueue.invokeAndWait(() -> { | ||
pos = choice.getLocationOnScreen(); | ||
size = choice.getSize(); | ||
selection1 = choice.getSelectedIndex(); | ||
}); | ||
robot.mouseMove(pos.x + size.width / 2, pos.y + size.height / 2); | ||
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); | ||
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); | ||
robot.waitForIdle(); | ||
robot.delay(500); | ||
robot.mouseMove(pos.x + size.width / 2, pos.y + size.height * 2); | ||
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); | ||
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); | ||
robot.waitForIdle(); | ||
EventQueue.invokeAndWait(() -> { | ||
selection2 = choice.getSelectedIndex(); | ||
setVisible(false); | ||
dispose(); | ||
}); | ||
if (selection1 == selection2) { | ||
throw new RuntimeException("Can not change choice selection with the mouse click"); | ||
} | ||
} | ||
|
||
public static void main(String[] args) throws AWTException, | ||
InterruptedException, InvocationTargetException { | ||
NonFocusablePopupMenuTest me = new NonFocusablePopupMenuTest(); | ||
me.performTest(); | ||
} | ||
} |
43 changes: 0 additions & 43 deletions
43
test/jdk/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html
This file was deleted.
Oops, something went wrong.
214 changes: 0 additions & 214 deletions
214
test/jdk/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java
This file was deleted.
Oops, something went wrong.
5f78ddd
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