diff --git a/src/java.desktop/share/classes/java/awt/Robot.java b/src/java.desktop/share/classes/java/awt/Robot.java index 957e30126e1c3..6b63bc1968cd9 100644 --- a/src/java.desktop/share/classes/java/awt/Robot.java +++ b/src/java.desktop/share/classes/java/awt/Robot.java @@ -126,6 +126,17 @@ public class Robot { private DirectColorModel screenCapCM = null; + /** + * Default delay for mouse {@code click} and + * step delay for mouse {@code glide} in milliseconds. + */ + public static final int DEFAULT_DELAY = 20; + + /** + * Default pixel step length for mouse {@code glide}. + */ + public static final int DEFAULT_STEP_LENGTH = 2; + /** * Constructs a Robot object in the coordinate system of the primary screen. * @@ -773,4 +784,203 @@ public synchronized String toString() { String params = "autoDelay = "+getAutoDelay()+", "+"autoWaitForIdle = "+isAutoWaitForIdle(); return getClass().getName() + "[ " + params + " ]"; } + + /** + * A convenience method that simulates clicking a mouse button by calling {@code mousePress}, {@code mouseRelease}, + * and {@code waitForIdle}. Invokes {@code waitForIdle} with a default {@link #DEFAULT_DELAY delay} after + * {@code mousePress} and {@code mouseRelease} calls. For specifics on valid inputs see + * {@link java.awt.Robot#mousePress(int)}. + * + * @param buttons The button mask; a combination of one or more mouse button masks. + * @throws IllegalArgumentException if the {@code buttons} mask contains the mask for + * extra mouse button and support for extended mouse buttons is + * {@link Toolkit#areExtraMouseButtonsEnabled() disabled} by Java + * @throws IllegalArgumentException if the {@code buttons} mask contains the mask for + * extra mouse button that does not exist on the mouse and support for extended + * mouse buttons is {@link Toolkit#areExtraMouseButtonsEnabled() enabled} + * by Java + * @throws IllegalThreadStateException if called on the AWT event dispatching thread + * @see #mousePress(int) + * @see #mouseRelease(int) + * @see #DEFAULT_DELAY + * @see InputEvent#getMaskForButton(int) + * @see Toolkit#areExtraMouseButtonsEnabled() + * @see java.awt.event.MouseEvent + * @since 25 + */ + public void click(int buttons) { + mousePress(buttons); + waitForIdle(DEFAULT_DELAY); + mouseRelease(buttons); + waitForIdle(DEFAULT_DELAY); + } + + /** + * A convenience method that clicks mouse button 1. + * + * @throws IllegalThreadStateException if called on the AWT event dispatching thread + * @see #click(int) + * @since 25 + */ + public void click() { + click(InputEvent.BUTTON1_DOWN_MASK); + } + + /** + * A convenience method that calls {@code waitForIdle} then waits an additional specified + * {@code delayValue} time in milliseconds. + * + * @param delayValue Additional delay length in milliseconds to wait until thread + * sync been completed + * @throws IllegalThreadStateException if called on the AWT event + * dispatching thread + * @throws IllegalArgumentException if {@code delayValue} is not between {@code 0} + * and {@code 60,000} milliseconds inclusive + * @since 25 + */ + public synchronized void waitForIdle(int delayValue) { + waitForIdle(); + delay(delayValue); + } + + /** + * A convenience method that moves the mouse in multiple + * steps from its current location to the destination coordinates + * with a default {@link #DEFAULT_STEP_LENGTH step-length} and {@link #DEFAULT_DELAY delay}. + * + * @param x Destination point x coordinate + * @param y Destination point y coordinate + * + * @throws IllegalThreadStateException if called on the AWT event dispatching + * thread and {@code isAutoWaitForIdle} would return true + * @see #DEFAULT_STEP_LENGTH + * @see #DEFAULT_DELAY + * @see #glide(int, int, int, int, int, int) + * @since 25 + */ + public void glide(int x, int y) { + Point p = MouseInfo.getPointerInfo().getLocation(); + glide(p.x, p.y, x, y); + } + + /** + * A convenience method that moves the mouse in multiple steps + * from source coordinates to the destination coordinates with + * a default {@link #DEFAULT_STEP_LENGTH step-length} and {@link #DEFAULT_DELAY delay}. + * + * @param fromX Source point x coordinate + * @param fromY Source point y coordinate + * @param toX Destination point x coordinate + * @param toY Destination point y coordinate + * + * @throws IllegalThreadStateException if called on the AWT event dispatching + * thread and {@code isAutoWaitForIdle} would return true + * @see #DEFAULT_STEP_LENGTH + * @see #DEFAULT_DELAY + * @see #glide(int, int, int, int, int, int) + * @since 25 + */ + public void glide(int fromX, int fromY, int toX, int toY) { + glide(fromX, fromY, toX, toY, DEFAULT_STEP_LENGTH, DEFAULT_DELAY); + } + + /** + * A convenience method that moves the mouse in multiple + * steps from source point to the destination point with + * given {@code stepLength} and {@code stepDelay}. + * + * @param srcX Source point x coordinate + * @param srcY Source point y coordinate + * @param destX Destination point x coordinate + * @param destY Destination point y coordinate + * @param stepLength Preferred length of one step in pixels + * @param stepDelay Delay between steps in milliseconds + * + * @throws IllegalArgumentException if {@code stepLength} is a negative value or + * greater than the distance between source and destination points + * @throws IllegalArgumentException if {@code stepDelay} is not between {@code 0} + * and {@code 60,000} milliseconds inclusive + * @throws IllegalThreadStateException if called on the AWT event dispatching + * thread and {@code isAutoWaitForIdle} would return true + * @see #mouseMove(int, int) + * @see #delay(int) + * @since 25 + */ + public void glide(int srcX, int srcY, int destX, int destY, int stepLength, int stepDelay) { + int stepNum; + double tDx, tDy; + double dx, dy, ds; + double x, y; + + dx = (destX - srcX); + dy = (destY - srcY); + ds = Math.sqrt(dx*dx + dy*dy); + + tDx = dx / ds * stepLength; + tDy = dy / ds * stepLength; + + int stepsCount = (int) ds / stepLength; + + // Walk the mouse to the destination one step at a time + mouseMove(srcX, srcY); + + for (x = srcX, y = srcY, stepNum = 0; + stepNum < stepsCount; + stepNum++) { + x += tDx; + y += tDy; + mouseMove((int)x, (int)y); + delay(stepDelay); + } + + // Ensure the mouse moves to the right destination. + // The steps may have led the mouse to a slightly wrong place. + if (x != destX || y != destY) mouseMove(destX, destY); + } + + /** + * A convenience method that simulates typing a key by calling {@code keyPress} + * and {@code keyRelease}. Invokes {@code waitForIdle} with a default {@link #DEFAULT_DELAY delay} + * after {@code keyPress} and {@code keyRelease} calls. + *

+ * Key codes that have more than one physical key associated with them + * (e.g. {@code KeyEvent.VK_SHIFT} could mean either the + * left or right shift key) will map to the left key. + * + * @param keycode Key to type (e.g. {@code KeyEvent.VK_A}) + * @throws IllegalArgumentException if {@code keycode} is not + * a valid key + * @throws IllegalThreadStateException if called on the AWT event dispatching thread + * @see #keyPress(int) + * @see #keyRelease(int) + * @see java.awt.event.KeyEvent + * @see #DEFAULT_DELAY + * @since 25 + */ + public synchronized void type(int keycode) { + keyPress(keycode); + waitForIdle(DEFAULT_DELAY); + keyRelease(keycode); + waitForIdle(DEFAULT_DELAY); + } + + /** + * A convenience method that simulates typing a char by calling {@code keyPress} + * and {@code keyRelease}. Gets the ExtendedKeyCode for the char and calls + * type(int keycode). + * + * @param c Character to be typed (e.g. {@code 'a'}) + * @throws IllegalArgumentException if {@code keycode} is not + * a valid key + * @throws IllegalThreadStateException if called on the AWT event dispatching thread + * @see #type(int) + * @see #keyPress(int) + * @see #keyRelease(int) + * @see java.awt.event.KeyEvent + * @see #DEFAULT_DELAY + * @since 25 + */ + public synchronized void type(char c) { + type(KeyEvent.getExtendedKeyCodeForChar(c)); + } } diff --git a/test/jdk/java/awt/Component/PaintAll/PaintAll.java b/test/jdk/java/awt/Component/PaintAll/PaintAll.java index b70bd17aab785..33d5e9ee7c30f 100644 --- a/test/jdk/java/awt/Component/PaintAll/PaintAll.java +++ b/test/jdk/java/awt/Component/PaintAll/PaintAll.java @@ -34,6 +34,7 @@ import java.awt.Label; import java.awt.List; import java.awt.Panel; +import java.awt.Robot; import java.awt.ScrollPane; import java.awt.Scrollbar; import java.awt.TextArea; @@ -47,8 +48,6 @@ @bug 6596915 @summary Test Component.paintAll() method @author sergey.bylokhov@oracle.com: area=awt.component - @library /lib/client/ - @build ExtendedRobot @run main PaintAll */ public class PaintAll { @@ -67,7 +66,7 @@ public class PaintAll { private static volatile boolean scrollPanePainted; private static volatile boolean textAreaPainted; private static volatile boolean textFieldPainted; - private static ExtendedRobot robot = null; + private static Robot robot = null; private static final Button buttonStub = new Button() { @Override @@ -287,7 +286,7 @@ private static void validation() { private static void sleep() { if(robot == null) { try { - robot = new ExtendedRobot(); + robot = new Robot(); }catch(Exception ex) { ex.printStackTrace(); throw new RuntimeException("Unexpected failure"); diff --git a/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java b/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java index 46e16078b62bf..415f6e0e05630 100644 --- a/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java +++ b/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java @@ -29,13 +29,11 @@ * @summary An attempt to set non-trivial background, shape, or translucency * to a decorated toplevel should end with an exception. * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com) - * @library /lib/client - * @build ExtendedRobot * @run main DecoratedExceptions */ public class DecoratedExceptions { public static void main(String args[]) throws Exception{ - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); Toolkit.getDefaultToolkit().getSystemEventQueue().invokeAndWait(() -> { Frame frame = new Frame("Frame"); frame.setBounds(50,50,400,200); diff --git a/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java b/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java index 88b4beb09b75a..6ba5a9274be97 100644 --- a/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java +++ b/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java @@ -34,6 +34,7 @@ import java.awt.Label; import java.awt.List; import java.awt.Point; +import java.awt.Robot; import java.awt.Scrollbar; import java.awt.TextArea; import java.awt.TextField; @@ -52,14 +53,12 @@ * @summary Display a dialog with a parent, the dialog contains all awt components * added to it & each components are setted with different cursors types. * Dispose the parent & collect GC. Garbage collection should happen - * @library /lib/client - * @build ExtendedRobot * @run main/othervm -Xmx20m DisposeParentGC */ public class DisposeParentGC { Frame parentFrame; - ExtendedRobot robot; + Robot robot; ArrayList> refs = new ArrayList>(); ReferenceQueue

que = new ReferenceQueue<>(); @@ -69,7 +68,7 @@ public static void main(String []args) throws Exception { } DisposeParentGC() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initGui); } diff --git a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java index c7ec6c6d969f3..ca2aae34feaf2 100644 --- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java +++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java @@ -25,8 +25,6 @@ * @test * @key headful * @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus - * @library /lib/client - * @build ExtendedRobot * @run main ActiveAWTWindowTest */ @@ -36,6 +34,7 @@ import java.awt.EventQueue; import java.awt.FlowLayout; import java.awt.Frame; +import java.awt.Robot; import java.awt.TextField; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -165,9 +164,9 @@ public void actionPerformed(ActionEvent e) { } public void doTest() { - ExtendedRobot robot; + Robot robot; try { - robot = new ExtendedRobot(); + robot = new Robot(); } catch (Exception e) { e.printStackTrace(); throw new RuntimeException("Cannot create robot"); diff --git a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java index b9f497929fa6f..d4e5584cf046e 100644 --- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java +++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java @@ -28,7 +28,6 @@ * @author Jitender(jitender.singh@eng.sun.com) area=AWT * @author yan * @library /lib/client - * @build ExtendedRobot * @run main ActiveSwingWindowTest */ @@ -45,7 +44,7 @@ public class ActiveSwingWindowTest { private JButton button, button2; private JTextField textField, textField2; private int eventType, eventType1; - private ExtendedRobot robot; + private Robot robot; private Object lock1 = new Object(); private Object lock2 = new Object(); private Object lock3 = new Object(); @@ -151,7 +150,7 @@ public void actionPerformed(ActionEvent e) { public void doTest() { try { - robot = new ExtendedRobot(); + robot = new Robot(); } catch (Exception e) { e.printStackTrace(); throw new RuntimeException("Cannot create robot"); diff --git a/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java index ab922f44312df..64a42eb337b13 100644 --- a/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java +++ b/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java @@ -28,7 +28,6 @@ * @author Jitender(jitender.singh@eng.sun.com) area=AWT* * @author yan * @library /lib/client - * @build ExtendedRobot * @run main FrameCloseTest */ @@ -43,7 +42,7 @@ public class FrameCloseTest { private Frame frame, frame2; private Component button, dummyButton; private int eventType, eventType1, eventType2; - private ExtendedRobot robot; + private Robot robot; private Object lock1 = new Object(); private Object lock2 = new Object(); private Object lock3 = new Object(); @@ -156,7 +155,7 @@ public void run() { throw new RuntimeException("Interrupted or unexpected Exception occured"); } try { - robot = new ExtendedRobot(); + robot = new Robot(); robot.waitForIdle(1000); } catch (Exception e) { e.printStackTrace(); diff --git a/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java b/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java index cf28660100130..00500a0e66597 100644 --- a/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java +++ b/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java @@ -29,7 +29,7 @@ * @author Jitender(jitender.singh@eng.sun.com) area=AWT * @author yan * @library /lib/client /test/lib - * @build ExtendedRobot jdk.test.lib.Platform + * @build jdk.test.lib.Platform * @run main RepaintTest */ @@ -45,6 +45,7 @@ import java.awt.Panel; import java.awt.Point; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.TextField; import javax.swing.JFrame; import javax.swing.JButton; @@ -61,7 +62,7 @@ public class RepaintTest { private Frame frame; private Component button; private Component textField; - private ExtendedRobot robot; + private Robot robot; private final Object buttonLock = new Object(); private volatile boolean buttonClicked = false; private final int MAX_TOLERANCE_LEVEL = 10; @@ -133,7 +134,7 @@ private Component createButton(boolean swingControl, String txt) { public void doTest(boolean swingControl) throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); robot.setAutoDelay(50); EventQueue.invokeAndWait(() -> initializeGUI(swingControl)); diff --git a/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java b/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java index dc1b2c097f5ae..ae8141d1c6330 100644 --- a/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java +++ b/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java @@ -28,8 +28,6 @@ @requires os.family == "linux" @summary List does not honor user specified background, foreground colors on XToolkit @author Dmitry Cherepanov area=awt.list - @library /lib/client - @build ExtendedRobot @run main SetBackgroundTest */ @@ -46,7 +44,7 @@ public class SetBackgroundTest { private static boolean isXAWT = (Toolkit.getDefaultToolkit().getClass().getName().equals("sun.awt.X11.XToolkit")); - private static ExtendedRobot robot = null; + private static Robot robot = null; private static Frame frame = null; private static final Color color = Color.red; @@ -86,7 +84,7 @@ private static void test() { try{ - robot = new ExtendedRobot(); + robot = new Robot(); }catch(AWTException e){ throw new RuntimeException(e.getMessage()); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java index ca77357e043e4..bb9e3f7cc8a70 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDDAppModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java index d898c5d906b8f..a922e129f93d2 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDDDocModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java index badd1198b2806..23b37a04a1a80 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDDModelessTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java index 6dd6ce9a5348d..0ba3a898093dc 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java @@ -30,9 +30,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDDNonModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java index b9e0accddd7cd..3eaef86e556a5 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java @@ -31,9 +31,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDDSetModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java index 744fe3502cdaf..0995513a2d7b3 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java @@ -31,7 +31,7 @@ public class BlockingDDTest { private TestDialog parent, dialog; private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private final Dialog.ModalityType modalityType; private final boolean setModal; @@ -40,7 +40,7 @@ private BlockingDDTest(Dialog.ModalityType modType, boolean modal) throws Except modalityType = modType; setModal = modal; - robot = new ExtendedRobot(); + robot = new Robot(); createGUI(); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java index ed4118f3160b5..9a22d05849990 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDDToolkitModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java index 8cc54ef164faa..7f4b198b2e37c 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDFAppModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java index 44a68be6a6723..41d0849ef9550 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDFSetModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java index a30192a576bb5..4b82b8eb40966 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java @@ -34,12 +34,12 @@ public class BlockingDFTest { private TestFrame frame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private BlockingDFTest(Dialog.ModalityType modalityType, boolean setModal) throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(() -> { createGUI(modalityType, setModal); }); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java index 58a6260441452..be90aa6a1a88a 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main BlockingDFToolkitModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java index b15f634abdbbc..ddab9e9eb314a 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java @@ -32,9 +32,8 @@ * and respond to key events. Check also if the other windows * receive mouse and key events. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java index b2b22370f7d78..4df48d4585670 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java @@ -32,9 +32,8 @@ * and respond to key events. Check also if the other windows * receive mouse and key events. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java index 8b4a109314b76..3053103959bf0 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java @@ -31,9 +31,8 @@ * and respond to key events. Check also if the other windows * receive mouse and key events. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java index 10337d097d0c4..061a92367cbbb 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java @@ -31,9 +31,8 @@ * and respond to key events. Check also if the other windows * receive mouse and key events. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java index 81193170ab674..2f661231ebd51 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java @@ -30,7 +30,7 @@ public class BlockingDFWTest { private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; public enum Parent {DIALOG, FRAME}; @@ -43,7 +43,7 @@ public enum Parent {DIALOG, FRAME}; public BlockingDFWTest(Parent parentWin, Dialog.ModalityType modalityType) throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(() -> { createGUI(parentWin, modalityType); }); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java index 0b4bda13d8766..f062ce5f12dde 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java @@ -34,9 +34,8 @@ * whether all the windows lying down the document root * (Frame) get blocked. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java index 98174a6fd3b18..1b9867813d055 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of the blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java index 019f2a47bd093..2906349972182 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of the blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java index 79c0afc96b7b1..ea228421ca300 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of the blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java index 5bd387ee2535b..e2a4989952871 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java @@ -31,9 +31,8 @@ * and respond to key events. Check also the correctness * of the blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java index 16b54893c7831..8a659fda30c3f 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java @@ -31,9 +31,8 @@ * and respond to key events. Check also the correctness * of the blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java index d9312fe3c7c83..b5b46c747cc49 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java @@ -33,7 +33,7 @@ public class BlockingFDTest { private TestDialog dialog; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private final Dialog.ModalityType modalityType; private final boolean setModal; @@ -43,7 +43,7 @@ private BlockingFDTest(Dialog.ModalityType modType, boolean modal) throws Except modalityType = modType; setModal = modal; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java index f7a5fb3951991..d7a9b4628ee11 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java @@ -32,9 +32,8 @@ * and respond to key events. Check also the correctness * of the blocking behavior for the parent Frame. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java index b482f9d80d1ef..42b5f58217804 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java index 5cece9f94dd12..d294df8722592 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java index b2e6d87002e5e..301b9dc243b5e 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java index 8a1686446221e..5d9e8f205beb0 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java index 57fa6d7acaae3..4ac43cf71d7b5 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java index 9d0944d31c3c2..2ced61b438ce4 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java index 134a4134565f2..baa8744fa873f 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java index 5e1783ec3329c..4675bffb5987d 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java index 489837d99c7aa..80cdc94033151 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java @@ -30,9 +30,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java index df08cac69f32f..bd80aaac6150f 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java index 6b235f14e1262..a2a9e0ebb104c 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java index 487f92b0aaf30..dcb17e19e129c 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Check also the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java index 5d91b325dd6d8..d6ec857b17165 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java @@ -38,14 +38,14 @@ public class BlockingFDWTest { private Frame hiddenFrame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; public enum DialogOwner {HIDDEN_DIALOG, NULL_DIALOG, HIDDEN_FRAME, NULL_FRAME}; public BlockingFDWTest(Dialog.ModalityType modalityType, DialogOwner owner) throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(() -> { createGUI(modalityType, owner); }); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java index 09f18747ae4be..609d7d58cc095 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java index ddeddf0fc04a2..95213c5384271 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java index 91aedb3f7494d..9a79a7eed442c 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java index 22fba4b3b02b0..4bc8151d41c00 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java index 7a28a15a100f0..af77529a85a87 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java index 09b019b2d6674..c14c70d3651e8 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java index 55bb34a514040..ad4492cc32422 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java index 2ccb1af982de4..92d8ebe8fd75d 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java index a1ab92d743b96..3fbbe6de6860e 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java @@ -40,7 +40,7 @@ public class BlockingWindowsDocModalTest { private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private List allWindows; @@ -51,7 +51,7 @@ public BlockingWindowsDocModalTest(Parent p) throws Exception { root = p; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java index 171d10dc4e140..6b27ae884378a 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java index 24a6b143d52d7..f11da687ca1cb 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java index 56eb3b0a993a0..199fd56c511cb 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java index 5df41776e01df..5d5cffdb7d802 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java index 3b68423c31006..19be551400fdd 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java index 4ed2def39a7e2..fc7f1261e6716 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java @@ -31,9 +31,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java index c38bb5f88a14d..035b937c2e7cf 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java @@ -34,7 +34,7 @@ public class BlockingWindowsTest { private TestWindow window, childWindow; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private List allWindows; @@ -50,7 +50,7 @@ private BlockingWindowsTest(Dialog.ModalityType modType, DialogOwner owner) throws Exception { modalityType = modType; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(() -> { createGUI(setModal, owner); }); diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java index 1f19feed7b522..39f1cc4026fc8 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java index c61d4274b5f36..cf13d66d82a00 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java index 402ea473a3206..935508142b86d 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java index 433123cf209c1..98e6be7cafa58 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java index 25c78f42b3b85..efad0a35d4fef 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java index 8e7106c9c6490..a0fa0acdb3e9d 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java @@ -32,9 +32,8 @@ * and respond to key events, when there are other windows shown. * Also check the correctness of blocking behavior for other windows shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java index e11df37ab751c..bcf13e4026dd1 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog receives focus; check * if its components receive focus and respond to key events * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main UnblockedDialogAppModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java index f63168fb0f29f..483345d9d4c80 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog receives focus; check * if its components receive focus and respond to key events * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main UnblockedDialogDocModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java index 847f55f6102eb..fd23e2320c109 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog receives focus; check * if its components receive focus and respond to key events * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main UnblockedDialogModelessTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java index 12959b9410ffe..ea5d6b6c36cef 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java @@ -29,9 +29,8 @@ * @summary Check whether a non-modal Dialog receives focus; check * if its components receive focus and respond to key events * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main UnblockedDialogNonModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java index 65857937f7c47..0825b93383488 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java @@ -29,9 +29,8 @@ * @summary Check whether a modal Dialog receives focus; check * if its components receive focus and respond to key events * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main UnblockedDialogSetModalTest diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java index 33eead43c173e..43ce695fccc82 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java @@ -30,7 +30,7 @@ public class UnblockedDialogTest { private TestDialog dialog; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private Dialog parentDialog; private Frame parentFrame; @@ -43,7 +43,7 @@ private enum DialogOwner {HIDDEN_DIALOG, HIDDEN_FRAME, NULL_DIALOG, NULL_FRAME}; private UnblockedDialogTest(Dialog.ModalityType modType, boolean set) throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); modalityType = modType; setModal = set; } diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java index 0139e78958f5f..dc38644931dd0 100644 --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog receives focus; check * if its components receive focus and respond to key events * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @run main UnblockedDialogToolkitModalTest diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java index 5a5392e2727b9..513f16bd9f8c4 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java @@ -31,9 +31,8 @@ * happens: an application modal dialog (D) having null frame owner is shown; * a window having D as owner is shown; a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java index c7a21cbaf494f..4e511b9c23d92 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java @@ -31,9 +31,8 @@ * following happens: a document modal dialog (D) having null frame owner is shown; * a window having D as owner is shown; a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java index 7914630db77af..80e915e4bea7b 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java @@ -31,9 +31,8 @@ * following happens: a modeless dialog (D) having null frame owner is shown; * a window having D as owner is shown; a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java index 24cbeb5dcaffd..cb09fe4f06228 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java @@ -31,9 +31,8 @@ * happens: a non-modal dialog (D) having null frame owner is shown; a window having D * as owner is shown; a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java index 22abfcf322905..bcb36b7ffa77b 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java @@ -80,7 +80,7 @@ public void doCloseAction() { private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private Dialog.ModalityType modalityType; @@ -88,7 +88,7 @@ public void doCloseAction() { modalityType = modType; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java index c7db3ee983b56..c578ffcbdacea 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java @@ -32,9 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java index d08427b05d2c5..30576df8d6565 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java @@ -32,9 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java index 49aa4cd18bdbd..0dc2291005a31 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java @@ -32,9 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java index 818ece821915b..a7a3be20935a4 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java @@ -32,9 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java index 322dd6b94d4cb..ba2c074586b38 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsTest.java @@ -86,13 +86,13 @@ public void doCloseAction() { private Frame parentFrame; private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private Dialog.ModalityType modalityType; FocusTransferDialogsTest(Dialog.ModalityType modType) throws Exception { modalityType = modType; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java index 98a7681b3aeae..427a69cfc4a0f 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java @@ -31,9 +31,8 @@ * the following happens: a frame is shown; an application modal dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java index c56efac4d235c..0537da60df5aa 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java @@ -31,9 +31,8 @@ * the following happens: a frame is shown; a document modal dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java index 5f09fbd350da5..c7a913b2d0d2a 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java @@ -31,9 +31,8 @@ * the following happens: a frame is shown; a modeless dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java index d283d38224d81..d74d766f54c31 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java @@ -31,9 +31,8 @@ * the following happens: a frame is shown; a non-modal dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java index 41e2fb086f2c3..77edaa78a52b2 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWTest.java @@ -73,7 +73,7 @@ public void doCloseAction() { private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private final Dialog.ModalityType modalityType; @@ -81,7 +81,7 @@ public void doCloseAction() { modalityType = modType; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java index 74363ff815c4c..e135bcfdaba9b 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a hidden dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java index 159b83ae4e143..8a7ac90cef261 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java index a6d72d39be5d9..b31fda18d49cf 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a null dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java index de85dcdda5eb2..4b932a027c743 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a null frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java index b3590fb8b5fc1..f2c3632069c33 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a hidden dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java index 0de91a1d61523..a793fe302e5ac 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java index b5e644bb61651..5ce4b9c4ee3bb 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a null dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java index 1414816ce248a..a273f1f4647bc 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a null frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java index a374e80441171..c5c0cf175f9af 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a hidden dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java index ee53aa9998417..43f5126fffca0 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java index cd7fcfd07bbfe..f124409c8b02f 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a null dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java index f75a0c2e8dde2..80e73c583cc51 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a null frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java index ecbca18d2adc7..11b8017573199 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a hidden dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java index 85aaae71fa808..364ace1fca747 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a hidden frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java index f9a025c395a02..faa33bb5ce79a 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a null dialog owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java index d119637de0b42..ec64c67571a5a 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java @@ -31,9 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a null frame owner is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java index 8ed4d1e70d475..e5f6fd3f53775 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java @@ -88,7 +88,7 @@ public void doCloseAction() { private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private final Dialog.ModalityType modalityType; @@ -101,7 +101,7 @@ public enum DialogParent {NULL_DIALOG, NULL_FRAME, HIDDEN_DIALOG, HIDDEN_FRAME}; modalityType = modType; dialogParent = dlgParent; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java index 27f5eca34ecf5..bf067edccab8c 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * an application modal dialog having a frame (F) owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java index 5ed4bd742bc23..36efc93efbe65 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java @@ -32,9 +32,8 @@ * an application modal dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java index 4c8d5505e5272..fc007a1f1aa78 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java @@ -32,9 +32,8 @@ * an application modal dialog having F owner is shown; F is shown. * * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java index 70a27b9df2fcb..2e420e8ef6b2b 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * a document modal dialog with a frame (F) owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java index 49ca3e1534ed8..0cac44e567888 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java @@ -32,9 +32,8 @@ * a document modal dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java index 9ed7836ed404f..c70797c9b4878 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a frame (F) owner is shown; * a document modal dialog having F owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java index b30d1b1691403..9a53d4ce08c58 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * a modeless dialog having a frame (F) owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java index bacfcea7f38d3..12952f996e366 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java @@ -32,9 +32,8 @@ * a modeless dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java index e4c15ef0e59c1..4334110eca3a0 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a frame (F) owner is shown; * a modeless dialog having F owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java index 0ea648d9e2083..2be3d9e85247f 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * a non-modal dialog having a frame (F) owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java index 61e337b9d4fab..4b9395bfcbdce 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java @@ -32,9 +32,8 @@ * a non-modal dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java index 304295bdbb5dd..8b3cdf14fb91a 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java @@ -31,9 +31,8 @@ * the following happens: a window having a frame (F) owner is shown; * a non-modal dialog having F owner is shown; F is shown. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java index b0a89a8fce5e0..7325c9099a2f7 100644 --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java @@ -82,7 +82,7 @@ public void doOpenAction() { private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private Dialog.ModalityType modalityType; @@ -101,7 +101,7 @@ public enum WindowParent {FRAME, NEW_FRAME}; dialogParent = dlgParent; windowParent = winParent; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater( this::createGUI ); } diff --git a/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java b/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java index 86dea801ea418..3b805c11de451 100644 --- a/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java +++ b/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java @@ -36,7 +36,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame @@ -78,11 +77,11 @@ public void doOpenAction() { private static final int delay = 1000; - private final ExtendedRobot robot; + private final Robot robot; NullModalityDialogTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); robot.setAutoDelay(100); EventQueue.invokeAndWait(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java index a884cd29bd9d4..f7670ff05c26f 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog created with null Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java index a31e8483a2355..f16bd44b16734 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java index 557e30bf09e2e..5f913b3ef41f9 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java index 55cfb091e4e95..ce1766d0d1e51 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java index 930483d042cf1..147baae33d220 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java index 1727291a0a520..f74aabf7c2e75 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java @@ -30,9 +30,8 @@ * @summary Check whether an application modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java b/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java index 9bdca52e41f96..fe4da4e9a431c 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java @@ -34,7 +34,7 @@ public class OnTopDDFTest { private volatile Frame hiddenFrame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; boolean setModal; @@ -45,7 +45,7 @@ private OnTopDDFTest(Dialog.ModalityType modType, modalityType = modType; setModal = modal; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java index d4507c4cc86d5..c98508137b73d 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog created with null Frame * constructor follows normal Z order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java index 96d3e3d722c4e..d6c361094018b 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog created with null Dialog * constructor follows normal Z order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java index c46b7f3c0a5d9..47b5408634911 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog created with hidden Frame * constructor follows normal Z order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java index 8951e62b7c838..5803f087df076 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog created with hidden Dialog * constructor follows normal Z order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java index 71c3b1fca20f7..210d0f5eacfe0 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java index c39d410fc6820..37e9fd13d1d22 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java @@ -30,9 +30,8 @@ * @summary Check whether a document modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java b/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java index 8de885b3258b8..24b9bd54751b4 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java @@ -35,7 +35,7 @@ public class OnTopFDFTest { private volatile Frame hiddenFrame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; public enum DialogOwner {HIDDEN_DIALOG, NULL_DIALOG, HIDDEN_FRAME, NULL_FRAME, FRAME}; @@ -51,7 +51,7 @@ private OnTopFDFTest(Dialog.ModalityType modType, modalityType = modType; setModal = modal; owner = o; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java index 8d6cf7b31115e..e151d6a71a87d 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modal Dialog created with null Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java index 9ced69b027165..d434603c773e6 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java index b9ab9070338f0..beb8487e90e8c 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java index 10991dae919ea..6df3ae21f386b 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java index 2d877feb4be5f..0274c99435b07 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java index 97896b128713c..c80cadb19e9ab 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modal Dialog created with visible Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java index 8bb3a6daa7f3a..eaf69fe8d730b 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog created with a * null Frame constructor follows normal Z Order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java index 623c8478ad85f..e3809e28d6f8d 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog created with a * null Dialog constructor follows normal Z Order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java index e4748974db02b..0ca22a710b211 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog created with a * hidden Frame constructor follows normal Z Order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java index f2b2aa440d548..404db53138128 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog created with a * hidden Dialog constructor follows normal Z Order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java index c9be83bdaecd7..fc3928fafcb33 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog created with a * visible Frame constructor follows normal Z Order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java index 18524c2e4176b..012bb5f7d316a 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java @@ -30,9 +30,8 @@ * @summary Check whether a modeless Dialog created with a visible Dialog * constructor follows a normal Z order. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java index 2ee4fdd36a59a..9fb4c99717020 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with null Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java index 4f9e8d9c94b03..bdbd210d5a1f7 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java index e5ee37c6dbe3c..dcac0393758d8 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java index 004877d069495..a389ef4cf0445 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java index 0e6ec1295b184..e46a45b303308 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java index 9c4ab8f770cb2..4e6574a5a3914 100644 --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java @@ -30,9 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java index 233dc53306c39..1a8d63ea94a19 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java @@ -33,7 +33,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java b/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java index 1a753c44cabaa..ddc8a2078ac5d 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java @@ -34,7 +34,7 @@ public class ToBackDDFTest { private volatile CustomDialog dialog; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private Frame hiddenFrame; @@ -47,7 +47,7 @@ private ToBackDDFTest(Dialog.ModalityType modType, modalityType = modType; setModal = modal; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java index d13ca719c3b3e..0e986cb1ffe47 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java @@ -33,7 +33,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java b/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java index ef17ae5804c82..ede8ab3819686 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java @@ -34,7 +34,7 @@ public class ToBackFDFTest { private volatile TestFrame leftFrame, rightFrame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private Dialog hiddenDialog; private Frame hiddenFrame; @@ -53,7 +53,7 @@ private ToBackFDFTest(Dialog.ModalityType modType, setModal = modal; owner = o; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java index ece7555753682..48c98db7ff75c 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java @@ -32,7 +32,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java index 16a5f7663d317..6243180557c6b 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java @@ -32,7 +32,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java index c9dedaaabac0f..9afd0b6b83aae 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java @@ -32,7 +32,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java index fbfc201f18e20..5ff2eae61ae83 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java @@ -31,7 +31,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java index 71800c7950762..4a99850085f75 100644 --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java @@ -33,7 +33,6 @@ * * @library ../helpers /lib/client/ * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java index 7056d3b7f8bff..3fb861fb3da31 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java @@ -31,9 +31,8 @@ * blocking application modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java index c8f0392c1a352..471f8e2ca1a8b 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java @@ -31,9 +31,8 @@ * blocking document modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java index 7912e5c46c692..74e2d41bfa8fc 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalBlockedTest.java @@ -31,12 +31,12 @@ public class DialogToFrontModalBlockedTest { private volatile Frame parent; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private DialogToFrontModalBlockedTest(Dialog.ModalityType modalityType, boolean setModal) throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(() -> { createGUI(modalityType, setModal); }); diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java index 62e7f2e595c9d..3ca2b7beeb490 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java @@ -29,9 +29,8 @@ * blocking modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java index 4faea19db2f43..d03b2b4d9eb5f 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java @@ -28,9 +28,8 @@ * @summary Check that calling toFront method does not bring a dialog to the top * of a child modeless dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModelessTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModelessTest.java index 080488c05600f..7a58cbf935f8b 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModelessTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModelessTest.java @@ -30,13 +30,13 @@ public class DialogToFrontModelessTest { private volatile Frame parent; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private boolean isModeless; public DialogToFrontModelessTest(boolean modeless) throws Exception { isModeless = modeless; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java index d21e21e04735a..ae2f687e5a700 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java @@ -28,9 +28,8 @@ * @summary Check that calling toFront method does not bring a dialog to the top * of a non-modal child dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java index 80b3c6331eac0..c2adbfa812c60 100644 --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java @@ -31,9 +31,8 @@ * blocking toolkit modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java index 5358ed22d2c94..8075eb00d0ced 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java @@ -31,9 +31,8 @@ * blocking application modal dialog having a null Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java index 8ac7a9cbd93fc..eb6f5b52b2494 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java @@ -31,9 +31,8 @@ * blocking application modal dialog having a null Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java index b77ae1733c9bf..f57e0f7ad07f0 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java @@ -31,9 +31,8 @@ * blocking application modal dialog having a hidden Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java index cc906a3e32ca7..cef9882ea2067 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java @@ -31,9 +31,8 @@ * blocking application modal dialog having a hidden Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java index d8b9e2b681a09..ad7e5e99ff2f0 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java @@ -31,9 +31,8 @@ * blocking application modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java index fd56bca7712a2..419e1333ae0d4 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java @@ -31,9 +31,8 @@ * blocking document modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java index 0d93f771e87f3..f204be27bb4cf 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java @@ -29,9 +29,8 @@ * @bug 8050885 * @summary Check if toFront method works correctly for a document modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java index 60fca45414f89..ca24419136efa 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java @@ -30,9 +30,8 @@ * blocking modal dialog having a null Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java index 7870bc33b0b6e..c925ce24be9a3 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java @@ -30,9 +30,8 @@ * blocking modal dialog having a null Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java index c051acd42c905..db195255106ef 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java @@ -30,9 +30,8 @@ * blocking modal dialog having a hidden Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java index 4d19bfa01802f..28487861a7728 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java @@ -30,9 +30,8 @@ * blocking modal dialog having a hidden Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java index c2737d9aecedd..6b1c59cefc2e2 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java @@ -30,9 +30,8 @@ * blocking modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java index 2a7e0de9da8be..f295936510782 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModalBlockedTest.java @@ -32,7 +32,7 @@ public class FrameToFrontModalBlockedTest { private volatile Frame hiddenFrame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; public enum DialogOwner {HIDDEN_DIALOG, NULL_DIALOG, HIDDEN_FRAME, NULL_FRAME, FRAME}; @@ -48,7 +48,7 @@ private FrameToFrontModalBlockedTest(Dialog.ModalityType modType, setModal = modal; owner = o; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java index 664d6995e6889..1b4d4dd733cf1 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java @@ -29,9 +29,8 @@ * @summary Check that calling toFront method does not bring a frame to the top of * a modeless child dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModelessTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModelessTest.java index 00c67cc1fc60d..038e13bb0f3f2 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModelessTest.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModelessTest.java @@ -31,7 +31,7 @@ public class FrameToFrontModelessTest { private volatile TestFrame leftFrame, rightFrame; private static final int delay = 500; - private final ExtendedRobot robot; + private final Robot robot; private boolean isModeless; @@ -40,7 +40,7 @@ public class FrameToFrontModelessTest { public FrameToFrontModelessTest(boolean modeless) throws Exception { isModeless = modeless; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeLater(this::createGUI); } diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java index 448db3f1ac53b..7def84a1b8d87 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java @@ -29,9 +29,8 @@ * @summary Check that calling toFront method does not bring a frame to the top * of a non-modal child dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java index 9eb0d836aed7f..397747231533d 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java @@ -31,9 +31,8 @@ * blocking modal toolkit dialog having a null Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java index 7cc0c41ec7559..28e93aa97b5f8 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java @@ -31,9 +31,8 @@ * blocking toolkit modal dialog having a null Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java index d2369bfb574a0..6c0c538932e1a 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java @@ -31,9 +31,8 @@ * blocking toolkit modal dialog having a hidden Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java index c1ad95027ed34..9bb4eb2d0cfeb 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java @@ -31,9 +31,8 @@ * blocking toolkit modal dialog having a hidden Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java index a023050c1d368..975fedd5ae862 100644 --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java @@ -31,9 +31,8 @@ * blocking toolkit modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers /lib/client/ + * @library ../helpers * @library /test/lib - * @build ExtendedRobot * @build Flag * @build TestDialog * @build TestFrame diff --git a/test/jdk/java/awt/Modal/helpers/TestDialog.java b/test/jdk/java/awt/Modal/helpers/TestDialog.java index 2ae93f835b98e..c030fdf5e34d0 100644 --- a/test/jdk/java/awt/Modal/helpers/TestDialog.java +++ b/test/jdk/java/awt/Modal/helpers/TestDialog.java @@ -197,7 +197,7 @@ public void windowIconified(WindowEvent e) {} @Override public void windowOpened(WindowEvent e) {} - public void clickButton(Button b, ExtendedRobot robot) { + public void clickButton(Button b, Robot robot) { try { Flag.waitTillShown(b); @@ -213,11 +213,11 @@ public void clickButton(Button b, ExtendedRobot robot) { } } - public void clickOpenButton(ExtendedRobot robot) throws Exception { + public void clickOpenButton(Robot robot) throws Exception { clickOpenButton(robot, true, ""); } - public void clickOpenButton(ExtendedRobot robot, + public void clickOpenButton(Robot robot, boolean refState, String message) throws Exception { openClicked.reset(); @@ -230,11 +230,11 @@ public void clickOpenButton(ExtendedRobot robot, assertEQ(openClicked.flag(), refState, msg + " " + message); } - public void clickCloseButton(ExtendedRobot robot) throws Exception { + public void clickCloseButton(Robot robot) throws Exception { clickCloseButton(robot, true, ""); } - public void clickCloseButton(ExtendedRobot robot, + public void clickCloseButton(Robot robot, boolean refState, String message) throws Exception { closeClicked.reset(); @@ -247,16 +247,16 @@ public void clickCloseButton(ExtendedRobot robot, assertEQ(closeClicked.flag(), refState, msg + " " + message); } - public void clickDummyButton(ExtendedRobot robot) throws Exception { + public void clickDummyButton(Robot robot) throws Exception { clickDummyButton(robot, Flag.ATTEMPTS); } - public void clickDummyButton(ExtendedRobot robot, + public void clickDummyButton(Robot robot, int attempts) throws Exception { clickDummyButton(robot, attempts, true, ""); } - public void clickDummyButton(ExtendedRobot robot, + public void clickDummyButton(Robot robot, int attempts, boolean refState, String message) throws Exception { @@ -271,7 +271,7 @@ public void clickDummyButton(ExtendedRobot robot, } - private void clickInside(ExtendedRobot robot) throws Exception { + private void clickInside(Robot robot) throws Exception { try { Flag.waitTillShown(topPanel); @@ -286,7 +286,7 @@ private void clickInside(ExtendedRobot robot) throws Exception { } } - public void transferFocusToDialog(ExtendedRobot robot, + public void transferFocusToDialog(Robot robot, String message, Button b) throws Exception { focusGained.reset(); @@ -305,7 +305,7 @@ public void transferFocusToDialog(ExtendedRobot robot, } } - public void transferFocusToBlockedDialog(ExtendedRobot robot, + public void transferFocusToBlockedDialog(Robot robot, String message, Button b) throws Exception { focusGained.reset(); @@ -325,7 +325,7 @@ public void transferFocusToBlockedDialog(ExtendedRobot robot, } } - public void checkBlockedDialog(ExtendedRobot robot, + public void checkBlockedDialog(Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); @@ -345,7 +345,7 @@ public void checkBlockedDialog(ExtendedRobot robot, "A blocked Dialog gained focus when component clicked. " + message); } - public void checkUnblockedDialog(ExtendedRobot robot, + public void checkUnblockedDialog(Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); diff --git a/test/jdk/java/awt/Modal/helpers/TestFrame.java b/test/jdk/java/awt/Modal/helpers/TestFrame.java index dd8ed1530efcc..e05a5beca099d 100644 --- a/test/jdk/java/awt/Modal/helpers/TestFrame.java +++ b/test/jdk/java/awt/Modal/helpers/TestFrame.java @@ -189,7 +189,7 @@ public void windowIconified(WindowEvent e) {} @Override public void windowOpened(WindowEvent e) {} - public void clickButton(Button b, ExtendedRobot robot) { + public void clickButton(Button b, Robot robot) { try { Flag.waitTillShown(b); } catch (InterruptedException e) {} @@ -204,11 +204,11 @@ public void clickButton(Button b, ExtendedRobot robot) { } } - public void clickOpenButton(ExtendedRobot robot) throws Exception { + public void clickOpenButton(Robot robot) throws Exception { clickOpenButton(robot, true, ""); } - public void clickOpenButton(ExtendedRobot robot, + public void clickOpenButton(Robot robot, boolean refState, String message) throws Exception { openClicked.reset(); @@ -221,11 +221,11 @@ public void clickOpenButton(ExtendedRobot robot, assertEQ(openClicked.flag(), refState, msg + " " + message); } - public void clickCloseButton(ExtendedRobot robot) throws Exception { + public void clickCloseButton(Robot robot) throws Exception { clickCloseButton(robot, true, ""); } - public void clickCloseButton(ExtendedRobot robot, + public void clickCloseButton(Robot robot, boolean refState, String message) throws Exception { closeClicked.reset(); @@ -238,16 +238,16 @@ public void clickCloseButton(ExtendedRobot robot, assertEQ(closeClicked.flag(), refState, msg + " " + message); } - public void clickDummyButton(ExtendedRobot robot) throws Exception { + public void clickDummyButton(Robot robot) throws Exception { clickDummyButton(robot, Flag.ATTEMPTS); } - public void clickDummyButton(ExtendedRobot robot, + public void clickDummyButton(Robot robot, int attempts) throws Exception { clickDummyButton(robot, attempts, true, ""); } - public void clickDummyButton(ExtendedRobot robot, + public void clickDummyButton(Robot robot, int attempts, boolean refState, String message) throws Exception { @@ -261,7 +261,7 @@ public void clickDummyButton(ExtendedRobot robot, assertEQ(dummyClicked.flag(), refState, msg + " " + message); } - public void clickInside(ExtendedRobot robot) throws Exception { + public void clickInside(Robot robot) throws Exception { try { Flag.waitTillShown(topPanel); } catch (InterruptedException e) {} @@ -275,7 +275,7 @@ public void clickInside(ExtendedRobot robot) throws Exception { } } - public void transferFocusToFrame(ExtendedRobot robot, + public void transferFocusToFrame(Robot robot, String message, Button b) throws Exception { focusGained.reset(); @@ -294,7 +294,7 @@ public void transferFocusToFrame(ExtendedRobot robot, } } - public void transferFocusToBlockedFrame(ExtendedRobot robot, + public void transferFocusToBlockedFrame(Robot robot, String message, Button b) throws Exception { focusGained.reset(); @@ -316,7 +316,7 @@ public void transferFocusToBlockedFrame(ExtendedRobot robot, } public void checkBlockedFrame( - ExtendedRobot robot, String message) throws Exception { + Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); @@ -336,7 +336,7 @@ public void checkBlockedFrame( "A blocked Frame gained focus when component clicked. " + message); } - public void checkUnblockedFrame(ExtendedRobot robot, + public void checkUnblockedFrame(Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); diff --git a/test/jdk/java/awt/Modal/helpers/TestWindow.java b/test/jdk/java/awt/Modal/helpers/TestWindow.java index 1e2ffb078c8ef..455ddb9064325 100644 --- a/test/jdk/java/awt/Modal/helpers/TestWindow.java +++ b/test/jdk/java/awt/Modal/helpers/TestWindow.java @@ -194,7 +194,7 @@ public void windowIconified(WindowEvent e) {} @Override public void windowOpened(WindowEvent e) {} - public void clickButton(Button b, ExtendedRobot robot) { + public void clickButton(Button b, Robot robot) { try { Flag.waitTillShown(b); } catch (InterruptedException e) {} @@ -209,11 +209,11 @@ public void clickButton(Button b, ExtendedRobot robot) { } } - public void clickOpenButton(ExtendedRobot robot) throws Exception { + public void clickOpenButton(Robot robot) throws Exception { clickOpenButton(robot, true, ""); } - public void clickOpenButton(ExtendedRobot robot, + public void clickOpenButton(Robot robot, boolean refState, String message) throws Exception { openClicked.reset(); @@ -226,11 +226,11 @@ public void clickOpenButton(ExtendedRobot robot, assertEQ(openClicked.flag(), refState, msg + " " + message); } - public void clickCloseButton(ExtendedRobot robot) throws Exception { + public void clickCloseButton(Robot robot) throws Exception { clickCloseButton(robot, true, ""); } - public void clickCloseButton(ExtendedRobot robot, + public void clickCloseButton(Robot robot, boolean refState, String message) throws Exception { closeClicked.reset(); @@ -243,11 +243,11 @@ public void clickCloseButton(ExtendedRobot robot, assertEQ(closeClicked.flag(), refState, msg + " " + message); } - public void clickDummyButton(ExtendedRobot robot) throws Exception { + public void clickDummyButton(Robot robot) throws Exception { clickDummyButton(robot, true, ""); } - public void clickDummyButton(ExtendedRobot robot, + public void clickDummyButton(Robot robot, boolean refState, String message) throws Exception { dummyClicked.reset(); @@ -260,7 +260,7 @@ public void clickDummyButton(ExtendedRobot robot, assertEQ(dummyClicked.flag(), refState, msg + " " + message); } - public void checkBlockedWindow(ExtendedRobot robot, + public void checkBlockedWindow(Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); @@ -281,7 +281,7 @@ public void checkBlockedWindow(ExtendedRobot robot, } public void checkUnblockedWindowWithBlockedParent( - ExtendedRobot robot, String message) throws Exception { + Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); @@ -297,7 +297,7 @@ public void checkUnblockedWindowWithBlockedParent( "when its parent is non-focusable. " + message); } - public void checkUnblockedWindow(ExtendedRobot robot, + public void checkUnblockedWindow(Robot robot, String message) throws Exception { dummyGained.reset(); dummyClicked.reset(); diff --git a/test/jdk/java/awt/Paint/ExposeOnEDT.java b/test/jdk/java/awt/Paint/ExposeOnEDT.java index f153ae83c738c..e55ae1c9f5015 100644 --- a/test/jdk/java/awt/Paint/ExposeOnEDT.java +++ b/test/jdk/java/awt/Paint/ExposeOnEDT.java @@ -30,12 +30,11 @@ * @bug 7090424 * @author Sergey Bylokhov * @library /lib/client/ - * @build ExtendedRobot * @run main ExposeOnEDT */ public final class ExposeOnEDT { - private static ExtendedRobot robot = null; + private static Robot robot = null; private static final Button buttonStub = new Button() { @Override public void paint(final Graphics g) { @@ -279,7 +278,7 @@ private static void validation() { private static void sleep() { if(robot == null) { try { - robot = new ExtendedRobot(); + robot = new Robot(); }catch(Exception ex) { ex.printStackTrace(); throw new RuntimeException("Unexpected failure"); diff --git a/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java b/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java index 4a09d155ad754..fff6611ca4ee8 100644 --- a/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java +++ b/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java @@ -28,13 +28,13 @@ import java.awt.Graphics; import java.awt.Label; import java.awt.Point; +import java.awt.Robot; /** * @test * @key headful * @bug 7157680 * @library /lib/client - * @build ExtendedRobot * @author Sergey Bylokhov * @run main/othervm -Dsun.java2d.uiScale=1 PaintNativeOnUpdate */ @@ -43,7 +43,7 @@ public final class PaintNativeOnUpdate extends Label { private boolean fullUpdate = true; public static void main(final String[] args) throws AWTException { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.setAutoDelay(50); final Frame frame = new Frame(); final Component label = new PaintNativeOnUpdate(); diff --git a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java index e6ae8ff866ada..08aea904dd108 100644 --- a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java +++ b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java @@ -25,6 +25,7 @@ import java.awt.Canvas; import java.awt.EventQueue; import java.awt.Frame; +import java.awt.Robot; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; import java.awt.event.InputEvent; @@ -44,7 +45,6 @@ * some key with one or more modifiers. * @library /lib/client * @library /test/lib - * @build ExtendedRobot * @run main ModifierRobotKeyTest */ @@ -52,7 +52,7 @@ public class ModifierRobotKeyTest extends KeyAdapter { private volatile boolean focusGained = false; private volatile boolean startTest = false; - private ExtendedRobot robot; + private Robot robot; private volatile Frame frame; private Canvas canvas; @@ -151,7 +151,7 @@ private void initializeGUI() { public void doTest() throws Exception { try { - robot = new ExtendedRobot(); + robot = new Robot(); robot.setAutoDelay(50); robot.waitForIdle(1000); diff --git a/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java b/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java index a7a4bedaf4122..d41b2b252febc 100644 --- a/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java +++ b/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java @@ -23,6 +23,7 @@ import java.awt.Dimension; import java.awt.Frame; +import java.awt.Robot; import java.awt.ScrollPane; import java.awt.Toolkit; @@ -32,7 +33,6 @@ * @bug 7124213 * @author Sergey Bylokhov * @library /lib/client/ - * @build ExtendedRobot * @run main ScrollPanePreferredSize */ public final class ScrollPanePreferredSize { @@ -57,7 +57,7 @@ public static void main(final String[] args) { private static void sleep() { try { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(500); } catch (Exception ex) { ex.printStackTrace(); diff --git a/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java b/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java index 26b165a740cd1..7f753d57bc20f 100644 --- a/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java +++ b/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java @@ -30,14 +30,13 @@ @summary verify LOCK buttons toogle @author Yuri.Nesterenko, Dmitriy.Ermashov @library /lib/client - @build ExtendedRobot @run main LockingKeyStateTest */ public class LockingKeyStateTest { Frame frame; - ExtendedRobot robot; + Robot robot; // Note that Kana lock you may actually toggle only if you have one. static int[] lockingKeys = { KeyEvent.VK_CAPS_LOCK, KeyEvent.VK_NUM_LOCK, @@ -49,7 +48,7 @@ public class LockingKeyStateTest { Toolkit toolkit = Toolkit.getDefaultToolkit(); LockingKeyStateTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait( this::createGui ); } diff --git a/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java b/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java index 54cde28da70f7..3bbe23e7b13a6 100644 --- a/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java +++ b/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java @@ -27,6 +27,7 @@ import java.awt.AWTException; import java.awt.EventQueue; import java.awt.Point; +import java.awt.Robot; import java.awt.SystemTray; import java.awt.TrayIcon; import java.awt.image.BufferedImage; @@ -47,7 +48,6 @@ * java.desktop/java.awt.Helper * jdk.test.lib.Platform * jtreg.SkippedException - * ExtendedRobot * SystemTrayIconHelper * @run main ActionCommand */ @@ -55,7 +55,7 @@ public class ActionCommand { TrayIcon icon; - ExtendedRobot robot; + Robot robot; volatile boolean actionPerformed = false; volatile String actionCommand = null; @@ -92,7 +92,7 @@ public static void main(String[] args) throws Exception { } void doTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(() -> { SystemTray tray = SystemTray.getSystemTray(); diff --git a/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java b/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java index 4eda5be2d15ba..d5fed1c1a87c4 100644 --- a/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java +++ b/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java @@ -38,7 +38,7 @@ * @library /java/awt/patchlib * @library /lib/client ../ * @build java.desktop/java.awt.Helper - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main ActionEventMask */ @@ -47,7 +47,7 @@ public class ActionEventMask { private Image image; TrayIcon icon; - ExtendedRobot robot; + Robot robot; boolean actionPerformed = false; boolean listenersInvoked = false; @@ -159,7 +159,7 @@ public void windowClosing(WindowEvent event) { private void doTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); Point iconPosition = SystemTrayIconHelper.getTrayIconLocation(icon); if (iconPosition == null) diff --git a/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java b/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java index d3e73aa15ced1..f9504e17c44d4 100644 --- a/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java +++ b/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java @@ -37,7 +37,7 @@ * @library /java/awt/patchlib * @library /lib/client ../ * @build java.desktop/java.awt.Helper - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main MouseEventMaskTest */ diff --git a/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java b/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java index 62ac3e3796665..992cc998e3726 100644 --- a/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java +++ b/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java @@ -32,7 +32,7 @@ * @summary Check for mouseMoved event for java.awt.TrayIcon * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com) * @library /lib/client ../ - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main MouseMovedTest */ @@ -59,7 +59,7 @@ public void mouseMoved(MouseEvent event) { }); SystemTray.getSystemTray().add(icon); - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); Dimension size = Toolkit.getDefaultToolkit().getScreenSize(); if (System.getProperty("os.name").toLowerCase().startsWith("win")) robot.glide(size.width / 2, size.height-15, size.width, size.height-15, 1, 3); diff --git a/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java b/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java index 8f31652c4c1ce..e8c88ed4e161e 100644 --- a/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java +++ b/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java @@ -28,7 +28,6 @@ @summary Reference to the popup leaks after the TrayIcon is removed. @requires os.family != "windows" @library /lib/client/ - @build ExtendedRobot @run main/othervm -Xmx50m PopupMenuLeakTest */ @@ -39,6 +38,7 @@ import java.awt.MenuItem; import java.awt.PopupMenu; import java.awt.RenderingHints; +import java.awt.Robot; import java.awt.SystemTray; import java.awt.TrayIcon; import javax.swing.SwingUtilities; @@ -52,13 +52,13 @@ public class PopupMenuLeakTest { static final AtomicReference> iconWeakReference = new AtomicReference<>(); static final AtomicReference> popupWeakReference = new AtomicReference<>(); - static ExtendedRobot robot; + static Robot robot; public static void main(String[] args) throws Exception { if (!SystemTray.isSupported()) { System.out.println("SystemTray not supported. Skipping the test."); return; } - robot = new ExtendedRobot(); + robot = new Robot(); SwingUtilities.invokeAndWait(PopupMenuLeakTest::createSystemTrayIcon); sleep(); // To make the test automatic we explicitly call addNotify on a popup to create the peer diff --git a/test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java b/test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java index 3941c3b89edd4..f800b4fbabd8b 100644 --- a/test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java +++ b/test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java @@ -20,6 +20,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ +import java.awt.Robot; import java.awt.TrayIcon; import java.awt.SystemTray; import java.awt.EventQueue; @@ -41,14 +42,14 @@ * @library /java/awt/patchlib * @library /lib/client ../ * @build java.desktop/java.awt.Helper - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main RightClickWhenBalloonDisplayed */ public class RightClickWhenBalloonDisplayed { TrayIcon icon; - ExtendedRobot robot; + Robot robot; int actionPerformedCount = -1; public static void main(String[] args) throws Exception { @@ -68,7 +69,7 @@ public static void main(String[] args) throws Exception { } RightClickWhenBalloonDisplayed() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initializeGUI); robot.waitForIdle(1000); } diff --git a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java index d449238547422..430a7f2bf12d0 100644 --- a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java +++ b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java @@ -33,14 +33,14 @@ * @library /java/awt/patchlib * @library /lib/client ../../ * @build java.desktop/java.awt.Helper - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main FunctionalityCheck */ public class FunctionalityCheck { TrayIcon icon; - ExtendedRobot robot; + Robot robot; boolean actionPerformed = false; Object actionLock = new Object(); @@ -79,7 +79,7 @@ public static void main(String[] args) throws Exception { } FunctionalityCheck() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initializeGUI); } diff --git a/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java b/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java index 045aa0113f512..3bca43d5418f1 100644 --- a/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java +++ b/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java @@ -24,6 +24,7 @@ import java.awt.EventQueue; import java.awt.Image; import java.awt.Point; +import java.awt.Robot; import java.awt.SystemTray; import java.awt.TrayIcon; import java.awt.event.InputEvent; @@ -43,7 +44,7 @@ * @library /java/awt/patchlib * @library /lib/client ../ * @build java.desktop/java.awt.Helper - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main TrayIconEventModifiersTest */ @@ -52,7 +53,7 @@ public class TrayIconEventModifiersTest { Image image; TrayIcon icon; - ExtendedRobot robot; + Robot robot; Object mouseLock = new Object(); @@ -121,7 +122,7 @@ public static void main(String[] args) throws Exception { } public TrayIconEventModifiersTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initializeGUI); } diff --git a/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java b/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java index 04a6835e1c652..2e522056ab2f6 100644 --- a/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java +++ b/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java @@ -35,7 +35,7 @@ * @library /java/awt/patchlib * @library /lib/client ../ * @build java.desktop/java.awt.Helper - * @build ExtendedRobot SystemTrayIconHelper + * @build SystemTrayIconHelper * @run main TrayIconEventsTest */ @@ -43,7 +43,7 @@ public class TrayIconEventsTest { private static boolean isOel7orLater; TrayIcon icon; - ExtendedRobot robot; + Robot robot; boolean actionPerformed = false; Object actionLock = new Object(); @@ -88,7 +88,7 @@ public static void main(String[] args) throws Exception { } public TrayIconEventsTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initializeGUI); } diff --git a/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java b/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java index 2bea773f1e579..41cad4b16117f 100644 --- a/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java +++ b/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java @@ -26,6 +26,7 @@ import java.awt.EventQueue; import java.awt.Point; +import java.awt.Robot; import java.awt.SystemTray; import java.awt.TrayIcon; import java.awt.event.InputEvent; @@ -49,7 +50,6 @@ * java.desktop/java.awt.Helper * jdk.test.lib.Platform * jtreg.SkippedException - * ExtendedRobot * SystemTrayIconHelper * @run main TrayIconMouseTest */ @@ -57,8 +57,7 @@ public class TrayIconMouseTest { TrayIcon icon; - ExtendedRobot robot; - + Robot robot; volatile boolean actionPerformed = false; final Object actionLock = new Object(); @@ -99,7 +98,7 @@ public static void main(String[] args) throws Exception { } TrayIconMouseTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initializeGUI); } diff --git a/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java index acf6bda58fcd0..8ff199e190ab7 100644 --- a/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java +++ b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java @@ -31,6 +31,7 @@ import java.awt.MenuItem; import java.awt.Point; import java.awt.PopupMenu; +import java.awt.Robot; import java.awt.SystemTray; import java.awt.TrayIcon; import java.awt.event.InputEvent; @@ -47,13 +48,11 @@ * @library * /java/awt/patchlib * /java/awt/TrayIcon - * /lib/client * /test/lib * @build * java.desktop/java.awt.Helper * jdk.test.lib.Platform * jtreg.SkippedException - * ExtendedRobot * SystemTrayIconHelper * @run main TrayIconPopupTest */ @@ -61,7 +60,7 @@ public class TrayIconPopupTest { TrayIcon icon; - ExtendedRobot robot; + Robot robot; volatile boolean actionPerformed = false; final Object actionLock = new Object(); @@ -94,7 +93,7 @@ public static void main(String[] args) throws Exception { } TrayIconPopupTest() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::initializeGUI); robot.waitForIdle(1000); EventQueue.invokeAndWait( () -> window.setLocation(100, 100)); diff --git a/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java b/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java index 4ab38ca70ffeb..493a914597508 100644 --- a/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java +++ b/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java @@ -35,7 +35,6 @@ * @author Jitender(jitender.singh@eng.sun.com) area=AWT * @author dmitriy.ermashov@oracle.com * @library /lib/client - * @build ExtendedRobot * @run main ImageTransferTest */ @@ -156,7 +155,7 @@ public void compareImages() { public void doTest() throws Exception { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(2000); TransferableObject imagedata = new TransferableObject(image1); diff --git a/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java b/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java index 990857182e73e..4c7f4a15b1c58 100644 --- a/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java +++ b/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java @@ -21,14 +21,12 @@ * questions. */ - /* * @test * @key headful * @requires (os.family == "linux") * @summary To make sure that System & Primary clipboards should behave independently * @library /lib/client - * @build ExtendedRobot * @run main IndependenceAWTTest */ @@ -61,7 +59,7 @@ public class IndependenceAWTTest { private static volatile Point ttf1Center; private static volatile Point glideStartLocation; - public static void main (String[] args) throws Exception { + public static void main(String[] args) throws Exception { try { robot = new ExtendedRobot(); EventQueue.invokeAndWait(IndependenceAWTTest::createAndShowUI); @@ -109,7 +107,7 @@ private static void getPrimaryClipboard() { primaryClip = Toolkit.getDefaultToolkit().getSystemSelection(); if (primaryClip == null) { throw new RuntimeException("Method getSystemSelection() is returning null" - + " on Linux platform"); + + " on Linux platform"); } } catch (HeadlessException e) { System.out.println("Headless exception thrown " + e); @@ -144,7 +142,7 @@ private static void getClipboardsContent() throws Exception { } // Method to compare the Contents return by system & primary clipboard - private static void compareText (boolean mustEqual) { + private static void compareText(boolean mustEqual) { if ((tf2.getText()).equals(tf3.getText())) { if (mustEqual) System.out.println("Selected text & clipboard contents are same\n"); @@ -171,7 +169,7 @@ private static void test() throws Exception { glideStartLocation.x -= 10; }); - robot.glide(glideStartLocation, ttf1Center); + robot.glide(glideStartLocation.x, glideStartLocation.y, ttf1Center.x, ttf1Center.y); robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); robot.waitForIdle(20); diff --git a/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java b/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java index b2f594c13ae78..deb7bfb4bcbcb 100644 --- a/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java +++ b/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java @@ -27,7 +27,6 @@ * @requires (os.family == "linux") * @summary To make sure that System & Primary clipboards should behave independently * @library /lib/client - * @build ExtendedRobot * @run main IndependenceSwingTest */ @@ -44,7 +43,6 @@ import java.awt.event.FocusEvent; import java.awt.event.InputEvent; import java.awt.event.MouseEvent; - import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JTextField; @@ -61,7 +59,7 @@ public class IndependenceSwingTest { private static volatile Point ttf1Center; private static volatile Point glideStartLocation; - public static void main (String[] args) throws Exception { + public static void main(String[] args) throws Exception { try { robot = new ExtendedRobot(); SwingUtilities.invokeAndWait(IndependenceSwingTest::createAndShowUI); @@ -109,7 +107,7 @@ private static void getPrimaryClipboard() { primaryClip = Toolkit.getDefaultToolkit().getSystemSelection(); if (primaryClip == null) { throw new RuntimeException("Method getSystemSelection() is returning null" - + " on Linux platform"); + + " on Linux platform"); } } catch (HeadlessException e) { System.out.println("Headless exception thrown " + e); @@ -144,7 +142,7 @@ private static void getClipboardsContent() throws Exception { } // Method to compare the Contents return by system & primary clipboard - private static void compareText (boolean mustEqual) { + private static void compareText(boolean mustEqual) { if ((tf2.getText()).equals(tf3.getText())) { if (mustEqual) System.out.println("Selected text & clipboard contents are same\n"); @@ -171,7 +169,7 @@ private static void test() throws Exception { glideStartLocation.x -= 10; }); - robot.glide(glideStartLocation, ttf1Center); + robot.glide(glideStartLocation.x, glideStartLocation.y, ttf1Center.x, ttf1Center.y); robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); robot.waitForIdle(20); diff --git a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java index f1e3a0bfaad7f..ac71e97808f49 100644 --- a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java +++ b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java @@ -37,7 +37,6 @@ * that it's mapped to primary clipboard * @author Jitender(jitender.singh@eng.sun.com) area=AWT * @library /lib/client - * @build ExtendedRobot * @run main SystemSelectionAWTTest */ @@ -109,7 +108,7 @@ public void compareText() { } public void doTest() throws Exception { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); frame.setLocation(100, 100); robot.waitForIdle(2000); diff --git a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java index 665e8fda839cb..c3c16f64ebe31 100644 --- a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java +++ b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java @@ -38,7 +38,6 @@ * that it's mapped to primary clipboard * @author Jitender(jitender.singh@eng.sun.com) area=AWT * @library /lib/client - * @build ExtendedRobot * @run main SystemSelectionSwingTest */ @@ -111,7 +110,7 @@ public void compareText() { } public void doTest() throws Exception { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); jframe.setLocation(100, 100); robot.waitForIdle(2000); diff --git a/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java b/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java index ecdb4685a24be..3710b04060774 100644 --- a/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java +++ b/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java @@ -37,7 +37,6 @@ * @build LWComponent * @build LWButton * @build LWList - * @build ExtendedRobot * @run main/timeout=300 ExtendedModifiersTest */ import java.awt.Button; @@ -48,6 +47,7 @@ import java.awt.GridLayout; import java.awt.List; import java.awt.Point; +import java.awt.Robot; import java.awt.TextArea; import java.awt.TextField; import java.awt.event.InputEvent; @@ -69,7 +69,7 @@ public class ExtendedModifiersTest implements KeyListener { List list; LWList listLW; - private final ExtendedRobot robot; + private final Robot robot; private static final int WAIT_DELAY = 5000; private static final int KEY_DELAY = 100; private final Object lock; @@ -146,7 +146,7 @@ public void createGUI() { public ExtendedModifiersTest() throws Exception { lock = new Object(); - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait(this::createGUI); } @@ -223,7 +223,7 @@ private void doTest() throws Exception { Point center = new Point(xc, yc); robot.waitForIdle(); - robot.glide(origin, center); + robot.glide(origin.x, origin.y, center.x, center.y); robot.click(); robot.waitForIdle(); diff --git a/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java b/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java index 194733ffc1e7b..e8ab54b56c304 100644 --- a/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java +++ b/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java @@ -34,7 +34,6 @@ * @build LWComponent * @build LWButton * @build LWList - * @build ExtendedRobot * @run main/timeout=300 KeyMaskTest */ @@ -47,6 +46,7 @@ import java.awt.GridLayout; import java.awt.List; import java.awt.Point; +import java.awt.Robot; import java.awt.TextArea; import java.awt.TextField; import java.awt.event.InputEvent; @@ -75,7 +75,7 @@ public class KeyMaskTest extends KeyAdapter { List list; LWList listLW; - ExtendedRobot robot; + Robot robot; private final static int robotDelay = 500; private final static int waitDelay = 3500; @@ -87,7 +87,7 @@ public class KeyMaskTest extends KeyAdapter { KeyMaskTest() throws Exception { lock = new Object(); - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait( this::createGUI ); } @@ -188,7 +188,7 @@ void doTest() throws Exception { Point center = new Point(xc, yc); robot.delay(robotDelay); - robot.glide(origin, center); + robot.glide(origin.x, origin.y, center.x, center.y); robot.click(); robot.delay(robotDelay); diff --git a/test/jdk/java/awt/event/MouseEvent/DragMouseEventTest.java b/test/jdk/java/awt/event/MouseEvent/DragMouseEventTest.java index 3f8d10651ff19..4cebf8c855b76 100644 --- a/test/jdk/java/awt/event/MouseEvent/DragMouseEventTest.java +++ b/test/jdk/java/awt/event/MouseEvent/DragMouseEventTest.java @@ -28,8 +28,8 @@ * Checkbox, Choice, Label, List, Scrollbar, TextArea, TextField * for Left, Middle and Right mouse buttons * @key headful - * @library /lib/client /java/awt/regtesthelpers - * @build ExtendedRobot Util + * @library /java/awt/regtesthelpers + * @build Util * @run main/othervm -Dsun.java2d.uiScale=1 DragMouseEventTest */ @@ -47,6 +47,7 @@ import java.awt.Panel; import java.awt.Point; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.Scrollbar; import java.awt.TextArea; import java.awt.TextField; @@ -64,7 +65,7 @@ import test.java.awt.regtesthelpers.Util; public class DragMouseEventTest { - private static ExtendedRobot robot; + private static Robot robot; private static DragMouseEventFrame dmef; private static final int DELAY = 200; @@ -87,7 +88,7 @@ private static void createAndShowGUI() { } private static void test() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); robot.waitForIdle(); robot.delay(500); @@ -224,7 +225,7 @@ private static void testButtonDrag(Component component, System.out.printf("> gliding from (%d,%d) to (%d,%d)\n", start.x, start.y, mid.x, mid.y); - robot.glide(start, mid); + robot.glide(start.x, start.y, mid.x, mid.y); robot.waitForIdle(); robot.delay(DELAY); @@ -234,7 +235,7 @@ private static void testButtonDrag(Component component, System.out.printf("> gliding after crossing the border (%d,%d) to (%d,%d)\n", mid.x, mid.y, end.x, end.y); - robot.glide(mid, end); + robot.glide(mid.x, mid.y, end.x, end.y); robot.mouseRelease(button); robot.waitForIdle(); diff --git a/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java b/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java index cac3985a2536a..7470cdd7cb1d6 100644 --- a/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java @@ -30,6 +30,7 @@ import java.awt.GridLayout; import java.awt.List; import java.awt.Point; +import java.awt.Robot; import java.awt.TextArea; import java.awt.TextField; import java.awt.event.InputEvent; @@ -60,7 +61,6 @@ * @build LWComponent * @build LWButton * @build LWList - * @build ExtendedRobot * @run main/timeout=300 MouseButtonsAndKeyMasksTest */ @@ -75,7 +75,7 @@ public class MouseButtonsAndKeyMasksTest implements MouseListener, KeyListener { List list; LWList listLW; - ExtendedRobot robot; + Robot robot; private final static int robotDelay = 500; private final static int keyDelay = 100; @@ -90,7 +90,7 @@ public class MouseButtonsAndKeyMasksTest implements MouseListener, KeyListener { MouseButtonsAndKeyMasksTest() throws Exception { lock = new Object(); - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait( this::createGUI ); } @@ -229,7 +229,7 @@ void doTest() throws Exception { Point center = new Point(xc, yc); robot.delay(robotDelay); - robot.glide(origin, center); + robot.glide(origin.x, origin.y, center.x, center.y); robot.click(); robot.delay(robotDelay); diff --git a/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java b/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java index 55db074e12e4b..60e0284dfeba7 100644 --- a/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java @@ -49,7 +49,6 @@ * @build LWComponent * @build LWButton * @build LWList - * @build ExtendedRobot * @run main/timeout=600 MouseButtonsTest */ @@ -69,7 +68,7 @@ public class MouseButtonsTest implements MouseListener { private int modifiers = 0; - private final ExtendedRobot robot; + private final Robot robot; private final static int robotDelay = 1000; private final static int waitDelay = 3500; @@ -81,7 +80,7 @@ public class MouseButtonsTest implements MouseListener { MouseButtonsTest() throws Exception { lock = new Object(); - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait( this::createGUI ); } @@ -195,7 +194,7 @@ void doTest() throws Exception { Point center = new Point(xc, yc); robot.delay(robotDelay); - robot.glide(origin, center); + robot.glide(origin.x, origin.y, center.x, center.y); robot.click(); robot.delay(robotDelay); diff --git a/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java b/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java index c5203acfdd813..99f0fb7256010 100644 --- a/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java @@ -26,8 +26,8 @@ * @bug 4095172 * @summary Test for no proper mouse coordinates on MOUSE_ENTER/MOUSE_EXIT events for Win boxes. * @key headful - * @library /lib/client /java/awt/regtesthelpers - * @build ExtendedRobot Util + * @library /java/awt/regtesthelpers + * @build Util * @run main MouseEnterTest */ @@ -35,6 +35,7 @@ import java.awt.Frame; import java.awt.Point; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -68,7 +69,7 @@ private static void initAndShowGUI() { } private static void test() throws Exception { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(); robot.delay(500); @@ -82,9 +83,9 @@ private static void test() throws Exception { System.out.println("\n------------------\n"); System.out.printf("%s > %s > %s\n", p1, p2, p1); - robot.glide(p1, p2); + robot.glide(p1.x, p1.y, p2.x, p2.y); robot.waitForIdle(); - robot.glide(p2, p1); + robot.glide(p2.x, p2.y, p1.x, p1.y); robot.waitForIdle(); robot.delay(200); mouseAdapter.testEvents(); @@ -92,9 +93,9 @@ private static void test() throws Exception { System.out.println("\n------------------\n"); System.out.printf("%s > %s > %s\n", p2, p1, p2); - robot.glide(p2, p1); + robot.glide(p2.x, p2.y, p1.x, p1.y); robot.waitForIdle(); - robot.glide(p1, p2); + robot.glide(p1.x, p1.y, p2.x, p2.y); robot.waitForIdle(); robot.delay(200); mouseAdapter.testEvents(); diff --git a/test/jdk/java/awt/event/MouseEvent/MouseEventsDuringDrag.java b/test/jdk/java/awt/event/MouseEvent/MouseEventsDuringDrag.java index 4a4c9d36af169..81f5579a8ad39 100644 --- a/test/jdk/java/awt/event/MouseEvent/MouseEventsDuringDrag.java +++ b/test/jdk/java/awt/event/MouseEvent/MouseEventsDuringDrag.java @@ -27,8 +27,8 @@ * @summary Checks whether mouse events are reported correctly during drag. * @author Stuart Lawrence, Brent Christian: area=event * @key headful - * @library /lib/client /java/awt/regtesthelpers - * @build ExtendedRobot Util + * @library /java/awt/regtesthelpers + * @build Util * @run main MouseEventsDuringDrag */ @@ -59,6 +59,7 @@ import java.awt.Panel; import java.awt.Point; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.event.InputEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -68,7 +69,7 @@ public class MouseEventsDuringDrag { - private static ExtendedRobot robot; + private static Robot robot; private static Frame frame; private static final MouseHandler mouseHandler = new MouseHandler(); @@ -92,7 +93,7 @@ public static void main(String[] args) throws Exception { } private static void test() throws Exception { - robot = new ExtendedRobot(); + robot = new Robot(); robot.waitForIdle(); robot.delay(500); @@ -121,7 +122,7 @@ private static void testcase(Component moveTo, String message) throws Exception Point endDragLocation = new Point(moveToBound.x + 10, moveToBound.y + moveToBound.height / 2); - robot.mouseMove(startDragLocation); + robot.mouseMove(startDragLocation.x, startDragLocation.y); robot.waitForIdle(); robot.delay(200); mouseHandler.reset(); @@ -129,7 +130,7 @@ private static void testcase(Component moveTo, String message) throws Exception robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.waitForIdle(); - robot.glide(startDragLocation, endDragLocation); + robot.glide(startDragLocation.x, startDragLocation.y, endDragLocation.x, endDragLocation.y); robot.waitForIdle(); robot.glide(endDragLocation.x, endDragLocation.y, endDragLocation.x - 20, endDragLocation.y); diff --git a/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java b/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java index f38d3eac0f809..94fd525979af8 100644 --- a/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java @@ -37,12 +37,11 @@ * @summary Check whether correct modifiers set when multiple mouse buttons were pressed; * check number of received events. * - * @library /lib/client/ ../../helpers/lwcomponents/ + * @library ../../helpers/lwcomponents/ * @library /test/lib * @build LWComponent * @build LWButton * @build LWList - * @build ExtendedRobot * @run main/timeout=600 MultipleMouseButtonsTest */ @@ -51,7 +50,7 @@ public class MultipleMouseButtonsTest implements MouseListener { private final static int robotDelay = 1000; - private final ExtendedRobot robot; + private final Robot robot; private final Object lock = new Object(); private Frame frame; @@ -139,7 +138,7 @@ public void mouseReleased(MouseEvent e) { } MultipleMouseButtonsTest() throws Exception { - this.robot = new ExtendedRobot(); + this.robot = new Robot(); EventQueue.invokeAndWait( this::createGUI ); } @@ -169,9 +168,9 @@ void doTest() throws Exception { Point center = new Point(xc, yc); robot.delay(robotDelay); - robot.mouseMove(origin); + robot.mouseMove(origin.x, origin.y); robot.delay(robotDelay); - robot.glide(origin, center); + robot.glide(origin.x, origin.y, center.x, center.y); robot.delay(robotDelay); robot.click(); robot.delay(robotDelay); diff --git a/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java b/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java index c07a3e2cdc989..6fd28d4c3bd61 100644 --- a/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java +++ b/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java @@ -33,7 +33,6 @@ * @requires (os.family == "mac") * * @library /lib/client/ - * @build ExtendedRobot * @run main Corrupted2XImageTest */ @@ -103,7 +102,7 @@ private static boolean cmpColors(Color c1, Color c2) { private void doTest() throws Exception { - ExtendedRobot r = new ExtendedRobot(); + Robot r = new Robot(); System.out.println("format: " + format); r.waitForIdle(1000); EventQueue.invokeAndWait(this::UI); diff --git a/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java b/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java index 4e1c9963e978e..32fad9e3a222c 100644 --- a/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java +++ b/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java @@ -30,7 +30,6 @@ * when multiresolution image is used for their construction. * * @library /lib/client/ - * @build ExtendedRobot * @run main/othervm -Dsun.java2d.uiScale=1 MenuMultiresolutionIconTest * @run main/othervm -Dsun.java2d.uiScale=2 MenuMultiresolutionIconTest */ @@ -47,7 +46,7 @@ public class MenuMultiresolutionIconTest extends JPanel { private final static int SZ = 50; private final static String SCALE = "sun.java2d.uiScale"; private final static Color C1X = Color.RED, C2X = Color.BLUE; - private final ExtendedRobot r; + private final Robot r; private static BufferedImage generateImage(int scale, Color c) { @@ -72,7 +71,7 @@ private static BaseMultiResolutionImage createIcon() { public MenuMultiresolutionIconTest() throws Exception { - r = new ExtendedRobot(); + r = new Robot(); SwingUtilities.invokeAndWait(this::createUI); } diff --git a/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java b/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java index 2aec652fcee7a..36f39b2462692 100644 --- a/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java +++ b/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java @@ -29,7 +29,6 @@ @summary Check if correct resolution variant is used for JOptionPane dialog / internal frame icons. @library /lib/client/ - @build ExtendedRobot @run main/othervm/timeout=300 -Dsun.java2d.uiScale=1 MultiResolutionJOptionPaneIconTest @run main/othervm/timeout=300 -Dsun.java2d.uiScale=2 MultiResolutionJOptionPaneIconTest */ @@ -51,7 +50,7 @@ public class MultiResolutionJOptionPaneIconTest implements ActionListener { private final JDesktopPane parentPane = new JDesktopPane(); private final JButton run = new JButton("run"); - private final ExtendedRobot robot = new ExtendedRobot(); + private final Robot robot = new Robot(); private static BufferedImage getSquare(int sz, Color c) { @@ -159,7 +158,7 @@ private void showDialogOrFrame() { } } - public void clickButton(ExtendedRobot robot) { + public void clickButton(Robot robot) { Point pt = run.getLocationOnScreen(); robot.mouseMove(pt.x + run.getWidth() / 2, pt.y + run.getHeight() / 2); diff --git a/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java b/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java index 9bda4745ce4f7..6cc424ac07f9c 100644 --- a/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java +++ b/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java @@ -30,7 +30,6 @@ * when multiresolution image is used for their construction. * * @library /lib/client/ - * @build ExtendedRobot * @run main/othervm/timeout=240 -Dsun.java2d.uiScale=1 MultiresolutionIconTest * @run main/othervm/timeout=240 -Dsun.java2d.uiScale=2 MultiresolutionIconTest */ @@ -57,7 +56,7 @@ public class MultiresolutionIconTest extends JFrame { private JLabel lbl; private JTabbedPane tabbedPane; - private final ExtendedRobot r; + private final Robot r; private static BufferedImage generateImage(int sz, Color c) { @@ -71,7 +70,7 @@ private static BufferedImage generateImage(int sz, Color c) { public MultiresolutionIconTest(UIManager.LookAndFeelInfo lf) throws Exception { UIManager.setLookAndFeel(lf.getClassName()); - r = new ExtendedRobot(); + r = new Robot(); SwingUtilities.invokeAndWait(this::UI); } diff --git a/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java b/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java index 2c7a4e2067897..63d77c5908847 100644 --- a/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java +++ b/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java @@ -23,6 +23,7 @@ import java.awt.Graphics; +import java.awt.Robot; import java.awt.Toolkit; import java.awt.image.BufferedImage; import java.lang.reflect.InvocationTargetException; @@ -37,7 +38,6 @@ * @bug 8009919 * @author Sergey Bylokhov * @library /lib/client/ - * @build ExtendedRobot * @run main JButtonPaintNPE */ public final class JButtonPaintNPE { @@ -71,7 +71,7 @@ protected void paintComponent(final Graphics g) { private static void sleep() { try { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(1000); }catch(Exception ex) { ex.printStackTrace(); diff --git a/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java b/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java index 0c3fd5bbfce8c..d1a4b29b821aa 100644 --- a/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java +++ b/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java @@ -27,7 +27,6 @@ * @bug 4523758 * @summary Directly check that torn-off combo works * @library /lib/client - * @build ExtendedRobot * @run main bug4523758 */ /* @@ -91,7 +90,7 @@ public void itemStateChanged(ItemEvent event) { } private void doTest() throws Exception { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(1000); final Point cl = combo.getLocationOnScreen(); diff --git a/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java b/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java index 6ba3d41c0a7f2..e76c14754226b 100644 --- a/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java +++ b/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java @@ -32,7 +32,6 @@ @summary Combo box consuming escape and enter key events @author Petr Pchelko @library /lib/client/ - @build ExtendedRobot @run main ConsumedKeyTest */ public class ConsumedKeyTest { diff --git a/test/jdk/javax/swing/JComponent/7154030/bug7154030.java b/test/jdk/javax/swing/JComponent/7154030/bug7154030.java index 6e58918305884..2898c8f5c3ce6 100644 --- a/test/jdk/javax/swing/JComponent/7154030/bug7154030.java +++ b/test/jdk/javax/swing/JComponent/7154030/bug7154030.java @@ -35,6 +35,7 @@ import java.awt.Graphics; import java.awt.Insets; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.Toolkit; import java.awt.image.BufferedImage; import javax.imageio.ImageIO; @@ -49,7 +50,6 @@ * @library ../../regtesthelpers/ * @library /lib/client/ * @build Util - * @build ExtendedRobot * @run main bug7154030 */ @@ -67,7 +67,7 @@ public static void main(String[] args) throws Exception { BufferedImage imageHide = null; - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); SwingUtilities.invokeAndWait(new Runnable() { diff --git a/test/jdk/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java b/test/jdk/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java index a5521fa179c92..c0ef73c6715c6 100644 --- a/test/jdk/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java +++ b/test/jdk/javax/swing/JFrame/NSTexturedJFrame/NSTexturedJFrame.java @@ -22,6 +22,7 @@ */ import java.awt.Rectangle; +import java.awt.Robot; import java.awt.Toolkit; import java.awt.Color; import java.awt.image.BufferedImage; @@ -39,7 +40,7 @@ * @summary We should support NSWindowStyleMaskTexturedBackground style on OSX. * @library /test/lib * /lib/client - * @build ExtendedRobot jdk.test.lib.Platform + * @build jdk.test.lib.Platform * @run main NSTexturedJFrame */ @@ -51,14 +52,14 @@ public final class NSTexturedJFrame { private static Rectangle bounds; private static volatile int step; private static JFrame frame; - private static ExtendedRobot robot; + private static Robot robot; public static void main(final String[] args) throws Exception { if (!Platform.isOSX()) { System.out.println("This test is for OSX, considered passed."); return; } - robot = new ExtendedRobot(); + robot = new Robot(); robot.setAutoDelay(50); // Default window appearance showFrame(); diff --git a/test/jdk/javax/swing/JLayer/6824395/bug6824395.java b/test/jdk/javax/swing/JLayer/6824395/bug6824395.java index 899e8627590c2..98b0663e3459d 100644 --- a/test/jdk/javax/swing/JLayer/6824395/bug6824395.java +++ b/test/jdk/javax/swing/JLayer/6824395/bug6824395.java @@ -27,7 +27,6 @@ * @summary Checks that JLayer inside JViewport works is correctly laid out * @author Alexander Potochkin * @library /lib/client/ - * @build ExtendedRobot * @run main bug6824395 */ @@ -72,7 +71,7 @@ public void run() { } }); try { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(300); }catch(Exception ex) { ex.printStackTrace(); diff --git a/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java b/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java index 84abe007ca7dd..a759d0deddd9c 100644 --- a/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java +++ b/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java @@ -27,7 +27,6 @@ * @bug 4634626 * @summary Implement context popup menus for components * @library /lib/client - * @build ExtendedRobot * @run main bug4634626 */ @@ -40,6 +39,7 @@ import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.Component; +import java.awt.Robot; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -172,9 +172,9 @@ public void windowOpened(WindowEvent ev) { class RobotThread implements Runnable { public void run() { - ExtendedRobot robo; + Robot robo; try { - robo = new ExtendedRobot(); + robo = new Robot(); }catch(Exception ex) { ex.printStackTrace(); throw new RuntimeException("Cannot create Robot"); @@ -247,7 +247,7 @@ public void destroy() { } } - private void clickMouseOn(ExtendedRobot robot, Component c, int button) { + private void clickMouseOn(Robot robot, Component c, int button) { java.awt.Point p = c.getLocationOnScreen(); java.awt.Dimension size = c.getSize(); p.x += size.width / 2; diff --git a/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java b/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java index 0ee6ff220dd4d..0f088cadfa799 100644 --- a/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java +++ b/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java @@ -27,7 +27,6 @@ * @summary JMenuItems in JPopupMenus not receiving ActionEvents - incompat with 1.5 * @author Alexander Potochkin * @library /lib/client - * @build ExtendedRobot * @run main bug6515446 */ @@ -73,7 +72,7 @@ public void mouseReleased(MouseEvent e) { } }); - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.setAutoDelay(10); robot.waitForIdle(); diff --git a/test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java b/test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java index b7a7494c9924e..b754c03d80b74 100644 --- a/test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java +++ b/test/jdk/javax/swing/JPopupMenu/7154841/bug7154841.java @@ -29,7 +29,7 @@ * @summary JPopupMenu is overlapped by a Dock on Mac OS X * @library /test/lib * /lib/client - * @build ExtendedRobot jdk.test.lib.Platform + * @build jdk.test.lib.Platform * @run main bug7154841 */ @@ -75,7 +75,7 @@ public static void main(String[] args) throws Exception { } try { - ExtendedRobot r = new ExtendedRobot(); + Robot r = new Robot(); r.setAutoDelay(100); r.setAutoWaitForIdle(true); r.mouseMove(0, 0); diff --git a/test/jdk/javax/swing/JSlider/6401380/bug6401380.java b/test/jdk/javax/swing/JSlider/6401380/bug6401380.java index 7a78f2bc30790..02655dde5c60d 100644 --- a/test/jdk/javax/swing/JSlider/6401380/bug6401380.java +++ b/test/jdk/javax/swing/JSlider/6401380/bug6401380.java @@ -27,7 +27,6 @@ * @bug 6401380 * @summary JSlider - mouse click ont the left side of the knob is ignored. * @library /lib/client - * @build ExtendedRobot * @author Alexander Potochkin * @run main bug6401380 */ @@ -61,7 +60,7 @@ public bug6401380() { public static void main(String[] args) throws Exception { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.setAutoDelay(10); SwingUtilities.invokeAndWait(new Runnable() { diff --git a/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java b/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java index 83b6a2432bd4d..f653f5edf7e2e 100644 --- a/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java +++ b/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java @@ -24,6 +24,7 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.Toolkit; import javax.swing.JComponent; import javax.swing.JFrame; @@ -42,7 +43,6 @@ * @author Alexey Ivanov * @summary Selected tab should be scrolled into view. * @library /lib/client/ - * @build ExtendedRobot * @run main bug7170310 */ @@ -125,7 +125,7 @@ private static void check() { } private static void sync() { try { - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(300); }catch(Exception ex) { ex.printStackTrace(); diff --git a/test/jdk/javax/swing/reliability/Task.java b/test/jdk/javax/swing/reliability/Task.java index 7f67ee85df1c0..5125101135c6a 100644 --- a/test/jdk/javax/swing/reliability/Task.java +++ b/test/jdk/javax/swing/reliability/Task.java @@ -31,9 +31,9 @@ public abstract class Task { protected T gui; - protected ExtendedRobot robot; + protected Robot robot; - public Task(Class guiClass, ExtendedRobot robot) throws Exception { + public Task(Class guiClass, Robot robot) throws Exception { this.robot = robot; SwingUtilities.invokeAndWait( () -> { try { diff --git a/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java b/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java index 2f0dd632ef990..bcd349cf3a7fc 100644 --- a/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java +++ b/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java @@ -31,17 +31,16 @@ * using setVisible() method. * @author Aruna Samji * @library /lib/client - * @build ExtendedRobot * @run main TaskUndJFrameProperties */ public class TaskUndJFrameProperties extends Task { public static void main (String[] args) throws Exception { - new TaskUndJFrameProperties(GUIUndFrame.class, new ExtendedRobot()).task(); + new TaskUndJFrameProperties(GUIUndFrame.class, new Robot()).task(); } - TaskUndJFrameProperties(Class guiClass, ExtendedRobot robot) throws Exception { + TaskUndJFrameProperties(Class guiClass, Robot robot) throws Exception { super(guiClass, robot); } @@ -66,7 +65,7 @@ public void task() throws Exception { Point button2Center = gui.jbutton2.getLocationOnScreen(); button2Center.translate(gui.jbutton2.getWidth()/2, gui.jbutton2.getHeight()/2); - robot.glide(button1Origin, button1Center); + robot.glide(button1Origin.x, button1Origin.y, button1Center.x, button1Center.y); robot.waitForIdle(1000); robot.click(); //After Hide @@ -81,7 +80,7 @@ public void task() throws Exception { //click on the jbutton2 in jframe2 SwingUtilities.invokeAndWait(gui.jframe2::toFront); robot.waitForIdle(1000); - robot.glide(button2Origin, button2Center); + robot.glide(button2Origin.x, button2Origin.y, button2Center.x, button2Center.y); robot.waitForIdle(1000); robot.click(); //After Show diff --git a/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java b/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java index cb79d8893e587..f326140b1d45a 100644 --- a/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java +++ b/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java @@ -34,17 +34,16 @@ * location of the jframe after restoration from zoom or icon. * @author Aruna Samji * @library /lib/client - * @build ExtendedRobot * @run main TaskZoomJFrameChangeState */ public class TaskZoomJFrameChangeState extends Task { public static void main (String[] args) throws Exception { - new TaskZoomJFrameChangeState(GUIZoomFrame.class, new ExtendedRobot()).task(); + new TaskZoomJFrameChangeState(GUIZoomFrame.class, new Robot()).task(); } - TaskZoomJFrameChangeState(Class guiClass, ExtendedRobot robot) throws Exception { + TaskZoomJFrameChangeState(Class guiClass, Robot robot) throws Exception { super(guiClass, robot); } diff --git a/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java b/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java index 658a5a9d8b774..c0b124c3d14ce 100644 --- a/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java +++ b/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java @@ -30,17 +30,16 @@ * @summary Construct a jframe with some components and zoom the frame and bring it back to normal state. * @author Aruna Samji * @library /lib/client - * @build ExtendedRobot * @run main TaskZoomJFrameRepaint */ public class TaskZoomJFrameRepaint extends Task { public static void main (String[] args) throws Exception { - new TaskZoomJFrameRepaint(GUIZoomFrame.class, new ExtendedRobot()).task(); + new TaskZoomJFrameRepaint(GUIZoomFrame.class, new Robot()).task(); } - TaskZoomJFrameRepaint(Class guiClass, ExtendedRobot robot) throws Exception { + TaskZoomJFrameRepaint(Class guiClass, Robot robot) throws Exception { super(guiClass, robot); } diff --git a/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java b/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java index d0f5ff1ec0ab3..08bd18f3e7bad 100644 --- a/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java +++ b/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java @@ -47,7 +47,6 @@ * @summary Ensures that a custom document may not extend AbstractDocument * @author Sergey Malenkov * @library /lib/client/ - * @build ExtendedRobot * @run main Test6968363 */ public class Test6968363 implements Runnable, Thread.UncaughtExceptionHandler { @@ -56,7 +55,7 @@ public class Test6968363 implements Runnable, Thread.UncaughtExceptionHandler { public static void main(String[] args) throws Exception { Runnable task = new Test6968363(); invokeAndWait(task); - ExtendedRobot robot = new ExtendedRobot(); + Robot robot = new Robot(); robot.waitForIdle(100); robot.keyPress(VK_LEFT); robot.waitForIdle(100); diff --git a/test/jdk/lib/client/ExtendedRobot.java b/test/jdk/lib/client/ExtendedRobot.java index 9f4a451236b41..03f99503464da 100644 --- a/test/jdk/lib/client/ExtendedRobot.java +++ b/test/jdk/lib/client/ExtendedRobot.java @@ -50,10 +50,7 @@ */ public class ExtendedRobot extends Robot { - - private static int DEFAULT_SPEED = 20; // Speed for mouse glide and click private static int DEFAULT_SYNC_DELAY = 500; // Default Additional delay for waitForIdle() - private static int DEFAULT_STEP_LENGTH = 2; // Step length (in pixels) for mouse glide private final int syncDelay = DEFAULT_SYNC_DELAY; @@ -106,180 +103,8 @@ public ExtendedRobot(GraphicsDevice screen) throws AWTException { * * @see #waitForIdle() */ - public int getSyncDelay(){ return this.syncDelay; } - - /** - * Clicks mouse button(s) by calling {@link java.awt.Robot#mousePress(int)} and - * {@link java.awt.Robot#mouseRelease(int)} methods - * - * - * @param buttons The button mask; a combination of one or more mouse button masks. - * @throws IllegalArgumentException if the {@code buttons} mask contains the mask for - * extra mouse button and support for extended mouse buttons is - * {@link Toolkit#areExtraMouseButtonsEnabled() disabled} by Java - * @throws IllegalArgumentException if the {@code buttons} mask contains the mask for - * extra mouse button that does not exist on the mouse and support for extended - * mouse buttons is {@link Toolkit#areExtraMouseButtonsEnabled() enabled} - * by Java - * - * @see #mousePress(int) - * @see #mouseRelease(int) - * @see InputEvent#getMaskForButton(int) - * @see Toolkit#areExtraMouseButtonsEnabled() - * @see java.awt.event.MouseEvent - */ - public void click(int buttons) { - mousePress(buttons); - waitForIdle(DEFAULT_SPEED); - mouseRelease(buttons); - waitForIdle(); - } - - /** - * Clicks mouse button 1 - * - * @throws IllegalArgumentException if the {@code buttons} mask contains the mask for - * extra mouse button and support for extended mouse buttons is - * {@link Toolkit#areExtraMouseButtonsEnabled() disabled} by Java - * @throws IllegalArgumentException if the {@code buttons} mask contains the mask for - * extra mouse button that does not exist on the mouse and support for extended - * mouse buttons is {@link Toolkit#areExtraMouseButtonsEnabled() enabled} - * by Java - * - * @see #click(int) - */ - public void click() { - click(InputEvent.BUTTON1_DOWN_MASK); - } - - /** - * Waits until all events currently on the event queue have been processed with given - * delay after syncing threads. It uses more advanced method of synchronizing threads - * unlike {@link java.awt.Robot#waitForIdle()} - * - * @param delayValue Additional delay length in milliseconds to wait until thread - * sync been completed - * @throws sun.awt.SunToolkit.IllegalThreadException if called on the AWT event - * dispatching thread - */ - public synchronized void waitForIdle(int delayValue) { - super.waitForIdle(); - delay(delayValue); - } - - /** - * Waits until all events currently on the event queue have been processed with delay - * {@link #getSyncDelay()} after syncing threads. It uses more advanced method of - * synchronizing threads unlike {@link java.awt.Robot#waitForIdle()} - * - * @throws sun.awt.SunToolkit.IllegalThreadException if called on the AWT event - * dispatching thread - * - * @see #waitForIdle(int) - */ - @Override - public synchronized void waitForIdle() { - waitForIdle(syncDelay); - } - - /** - * Move the mouse in multiple steps from where it is - * now to the destination coordinates. - * - * @param x Destination point x coordinate - * @param y Destination point y coordinate - * - * @see #glide(int, int, int, int) - */ - public void glide(int x, int y) { - Point p = MouseInfo.getPointerInfo().getLocation(); - glide(p.x, p.y, x, y); - } - - /** - * Move the mouse in multiple steps from where it is - * now to the destination point. - * - * @param dest Destination point - * - * @see #glide(int, int) - */ - public void glide(Point dest) { - glide(dest.x, dest.y); - } - - /** - * Move the mouse in multiple steps from source coordinates - * to the destination coordinates. - * - * @param fromX Source point x coordinate - * @param fromY Source point y coordinate - * @param toX Destination point x coordinate - * @param toY Destination point y coordinate - * - * @see #glide(int, int, int, int, int, int) - */ - public void glide(int fromX, int fromY, int toX, int toY) { - glide(fromX, fromY, toX, toY, DEFAULT_STEP_LENGTH, DEFAULT_SPEED); - } - - /** - * Move the mouse in multiple steps from source point to the - * destination point with default speed and step length. - * - * @param src Source point - * @param dest Destination point - * - * @see #glide(int, int, int, int, int, int) - */ - public void glide(Point src, Point dest) { - glide(src.x, src.y, dest.x, dest.y, DEFAULT_STEP_LENGTH, DEFAULT_SPEED); - } - - /** - * Move the mouse in multiple steps from source point to the - * destination point with given speed and step length. - * - * @param srcX Source point x cordinate - * @param srcY Source point y cordinate - * @param destX Destination point x cordinate - * @param destY Destination point y cordinate - * @param stepLength Approximate length of one step - * @param speed Delay between steps. - * - * @see #mouseMove(int, int) - * @see #delay(int) - */ - public void glide(int srcX, int srcY, int destX, int destY, int stepLength, int speed) { - int stepNum; - double tDx, tDy; - double dx, dy, ds; - double x, y; - - dx = (destX - srcX); - dy = (destY - srcY); - ds = Math.sqrt(dx*dx + dy*dy); - - tDx = dx / ds * stepLength; - tDy = dy / ds * stepLength; - - int stepsCount = (int) ds / stepLength; - - // Walk the mouse to the destination one step at a time - mouseMove(srcX, srcY); - - for (x = srcX, y = srcY, stepNum = 0; - stepNum < stepsCount; - stepNum++) { - x += tDx; - y += tDy; - mouseMove((int)x, (int)y); - delay(speed); - } - - // Ensure the mouse moves to the right destination. - // The steps may have led the mouse to a slightly wrong place. - mouseMove(destX, destY); + public int getSyncDelay() { + return this.syncDelay; } /** @@ -293,7 +118,6 @@ public synchronized void mouseMove(Point position) { mouseMove(position.x, position.y); } - /** * Emulate native drag and drop process using {@code InputEvent.BUTTON1_DOWN_MASK}. * The method successively moves mouse cursor to point with coordinates @@ -334,62 +158,4 @@ public void dragAndDrop(int fromX, int fromY, int toX, int toY){ public void dragAndDrop(Point from, Point to){ dragAndDrop(from.x, from.y, to.x, to.y); } - - /** - * Successively presses and releases a given key. - *

- * Key codes that have more than one physical key associated with them - * (e.g. {@code KeyEvent.VK_SHIFT} could mean either the - * left or right shift key) will map to the left key. - * - * @param keycode Key to press (e.g. {@code KeyEvent.VK_A}) - * @throws IllegalArgumentException if {@code keycode} is not - * a valid key - * - * @see java.awt.Robot#keyPress(int) - * @see java.awt.Robot#keyRelease(int) - * @see java.awt.event.KeyEvent - */ - public void type(int keycode) { - keyPress(keycode); - waitForIdle(DEFAULT_SPEED); - keyRelease(keycode); - waitForIdle(DEFAULT_SPEED); - } - - /** - * Types given character - * - * @param c Character to be typed (e.g. {@code 'a'}) - * - * @see #type(int) - * @see java.awt.event.KeyEvent - */ - public void type(char c) { - type(KeyEvent.getExtendedKeyCodeForChar(c)); - } - - /** - * Types given array of characters one by one - * - * @param symbols Array of characters to be typed - * - * @see #type(char) - */ - public void type(char[] symbols) { - for (int i = 0; i < symbols.length; i++) { - type(symbols[i]); - } - } - - /** - * Types given string - * - * @param s String to be typed - * - * @see #type(char[]) - */ - public void type(String s) { - type(s.toCharArray()); - } }