8158390: [macosx] Regression: javax/swing/JMenuItem/8139169/ScreenMenuBarInputTwice.java
Reviewed-by: serb
This commit is contained in:
parent
dc8408ae5b
commit
5b7f28e99d
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -22,7 +22,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* @test
|
/* @test
|
||||||
* @bug 8139169
|
* @bug 8139169 8158390
|
||||||
* @summary verifies if TextArea gets input twice due to Apple's Screen Menubar
|
* @summary verifies if TextArea gets input twice due to Apple's Screen Menubar
|
||||||
* @requires (os.family=="mac")
|
* @requires (os.family=="mac")
|
||||||
* @library ../../regtesthelpers
|
* @library ../../regtesthelpers
|
||||||
@ -65,15 +65,13 @@ public class ScreenMenuBarInputTwice {
|
|||||||
|
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
robot = new Robot();
|
robot = new Robot();
|
||||||
|
robot.setAutoDelay(200);
|
||||||
|
robot.setAutoWaitForIdle(true);
|
||||||
createUIWithSeperateMenuBar();
|
createUIWithSeperateMenuBar();
|
||||||
robot.delay(2000);
|
|
||||||
shortcutTestCase();
|
shortcutTestCase();
|
||||||
robot.delay(2000);
|
|
||||||
cleanUp();
|
cleanUp();
|
||||||
createUIWithIntegratedMenuBar();
|
createUIWithIntegratedMenuBar();
|
||||||
robot.delay(2000);
|
|
||||||
menuTestCase();
|
menuTestCase();
|
||||||
robot.delay(2000);
|
|
||||||
cleanUp();
|
cleanUp();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -188,7 +186,6 @@ public class ScreenMenuBarInputTwice {
|
|||||||
robot.keyRelease(VK_COMMA);
|
robot.keyRelease(VK_COMMA);
|
||||||
robot.keyRelease(VK_SHIFT);
|
robot.keyRelease(VK_SHIFT);
|
||||||
robot.keyRelease(VK_META);
|
robot.keyRelease(VK_META);
|
||||||
robot.delay(2000);
|
|
||||||
checkText(textArea.getText());
|
checkText(textArea.getText());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -198,13 +195,10 @@ public class ScreenMenuBarInputTwice {
|
|||||||
robot.mouseMove(mousePoint.x, mousePoint.y);
|
robot.mouseMove(mousePoint.x, mousePoint.y);
|
||||||
robot.mousePress(InputEvent.BUTTON1_MASK);
|
robot.mousePress(InputEvent.BUTTON1_MASK);
|
||||||
robot.mouseRelease(InputEvent.BUTTON1_MASK);
|
robot.mouseRelease(InputEvent.BUTTON1_MASK);
|
||||||
robot.delay(2000);
|
|
||||||
mousePoint = Util.getCenterPoint(menuItem);
|
mousePoint = Util.getCenterPoint(menuItem);
|
||||||
robot.mouseMove(mousePoint.x, mousePoint.y);
|
robot.mouseMove(mousePoint.x, mousePoint.y);
|
||||||
robot.delay(2000);
|
|
||||||
robot.mousePress(InputEvent.BUTTON1_MASK);
|
robot.mousePress(InputEvent.BUTTON1_MASK);
|
||||||
robot.mouseRelease(InputEvent.BUTTON1_MASK);
|
robot.mouseRelease(InputEvent.BUTTON1_MASK);
|
||||||
robot.delay(2000);
|
|
||||||
checkText(textArea.getText());
|
checkText(textArea.getText());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user