infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-04 07:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8215921: There is no change when select different Foreground and Background by mouse

Browse Source 
Reviewed-by: serb, psadhukhan
This commit is contained in:
Krishna Addepalli 2019-01-30 15:02:05 +05:30
parent b2f2e669c9
commit cf132f89b2
3 changed files with 182 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
View File

@ -468,6 +468,7 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
if (unfurledChoice.isMouseInListArea(e)) {
int newIdx = helper.getSelectedIndex();
if (newIdx >= 0) {
int currentItem = ((Choice)target).getSelectedIndex();
// Update the selected item in the target now that
// the mouse selection is complete.
if (newIdx != dragStartIdx) {
@ -484,7 +485,7 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
* LeftMouseButton used */
if (e.getButton() == MouseEvent.BUTTON1 &&
(!firstPress || wasDragged ) &&
((Choice)target).getSelectedIndex() != newIdx)
(newIdx != currentItem))
{
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,

1
test/jdk/ProblemList.txt
View File

@ -254,7 +254,6 @@ java/awt/Choice/PopupPosTest/PopupPosTest.html 8192930 windows-all
java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java 7100044 macosx-all,linux-all
java/awt/Component/CreateImage/CreateImage.java 8198334 windows-all
java/awt/Component/GetScreenLocTest/GetScreenLocTest.java 4753654 generic-all
java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html 8192929 windows-all,linux-all
java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html 8017454 macosx-all
java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java 8000171 windows-all
java/awt/Frame/MiscUndecorated/RepaintTest.java 8079267 windows-all,linux-all

180
test/jdk/java/awt/Choice/SelectNewItemTest/SelectNewItemTest.java Normal file
View File

@ -0,0 +1,180 @@
/*
* Copyright (c) 2019, 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 8215921
@summary Test that selecting a different item does send an ItemEvent
@key headful
@run main SelectNewItemTest
*/
import java.awt.Choice;
import java.awt.Robot;
import java.awt.Frame;
import java.awt.BorderLayout;
import java.awt.AWTException;
import java.awt.Point;
import java.awt.Dimension;
import java.awt.event.InputEvent;
import java.awt.event.ItemListener;
import java.awt.event.WindowListener;
import java.awt.event.ItemEvent;
import java.awt.event.WindowEvent;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
public class SelectNewItemTest implements ItemListener, WindowListener {
//Declare things used in the test, like buttons and labels here
private Frame frame;
private Choice theChoice;
private Robot robot;
private CountDownLatch latch = new CountDownLatch(1);
private volatile boolean passed = false;
private void init()
{
try {
robot = new Robot();
robot.setAutoDelay(500);
} catch (AWTException e) {
throw new RuntimeException("Unable to create Robot. Test fails.");
}
frame = new Frame("SelectNewItemTest");
frame.setLayout(new BorderLayout());
theChoice = new Choice();
for (int i = 0; i < 10; i++) {
theChoice.add(new String("Choice Item " + i));
}
theChoice.addItemListener(this);
frame.add(theChoice);
frame.addWindowListener(this);
frame.setLocation(1,20);
frame.setSize(200, 50);
robot.mouseMove(10, 30);
frame.pack();
frame.setVisible(true);
}
public static void main(String... args) {
SelectNewItemTest test = new SelectNewItemTest();
test.init();
try {
test.latch.await(12000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {}
test.robot.waitForIdle();
try {
if (!test.passed) {
throw new RuntimeException("TEST FAILED.");
}
} finally {
test.frame.dispose();
}
}
private void run() {
try {
Thread.sleep(1000);
Point loc = theChoice.getLocationOnScreen();
int selectedIndex = theChoice.getSelectedIndex();
Dimension size = theChoice.getSize();
robot.mouseMove(loc.x + size.width - 10, loc.y + size.height / 2);
robot.setAutoDelay(250);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(1000);
//make sure that the mouse moves to a different item, so that
//itemStateChanged is called.
robot.mouseMove(loc.x + size.width / 2, loc.y + 3 * size.height);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle();
if (selectedIndex == theChoice.getSelectedIndex())
throw new RuntimeException("Test case failed - expected to select" +
" a different item than " + selectedIndex);
selectedIndex = theChoice.getSelectedIndex();
//now click on the same item and make sure that item event is
//not generated.
robot.delay(1000);
robot.mouseMove(loc.x + size.width - 10, loc.y + size.height / 2);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
//Make sure that the popup menu scrolls back to show the index from
//beginning, so that the second mouse click happens on the previously
//selected item.
//For example, on windows, it automatically scrolls the list to show
//the currently selected item just below the choice, which can
//throw off the test.
if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
robot.mouseWheel(-100);
}
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.delay(1000);
robot.mouseMove(loc.x + size.width / 2, loc.y + 3 * size.height);
robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
robot.waitForIdle();
if (selectedIndex != theChoice.getSelectedIndex())
throw new RuntimeException("Test failed. Expected to select the same item " +
"located at: " + selectedIndex + " but got an item selected at: " + theChoice.getSelectedIndex());
} catch(InterruptedException e) {
throw new RuntimeException(e.getCause());
} finally {
latch.countDown();
}
}
@Override public void itemStateChanged(ItemEvent e) {
if (!passed) {
System.out.println("ItemEvent received. Test passes");
passed = true;
} else {
System.out.println("ItemEvent received for second click. Test fails");
passed = false;
}
}
@Override public void windowOpened(WindowEvent e) {
System.out.println("windowActivated()");
(new Thread(this::run)).start();
}
@Override public void windowActivated(WindowEvent e) {}
@Override public void windowDeactivated(WindowEvent e) {}
@Override public void windowClosed(WindowEvent e) {}
@Override public void windowClosing(WindowEvent e) {}
@Override public void windowIconified(WindowEvent e) {}
@Override public void windowDeiconified(WindowEvent e) {}
}