changeset 52896:7199c4da1a6f

8186549: move ExtendedRobot closer to tests Reviewed-by: serb
author shurailine
date Tue, 13 Nov 2018 07:11:50 -0800
parents 4c436aab570a
children 52ea97fb80b0
files test/jdk/java/awt/Component/PaintAll/PaintAll.java test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java test/jdk/java/awt/Frame/FramesGC/FramesGC.java test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java test/jdk/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java test/jdk/java/awt/Paint/ExposeOnEDT.java test/jdk/java/awt/Paint/PaintNativeOnUpdate.java test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupClickTest.java test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java test/jdk/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java test/jdk/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java test/jdk/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java test/jdk/javax/swing/JComboBox/4523758/bug4523758.java test/jdk/javax/swing/JComboBox/6559152/bug6559152.java test/jdk/javax/swing/JComboBox/8015300/Test8015300.java test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java test/jdk/javax/swing/JComponent/7154030/bug7154030.java test/jdk/javax/swing/JInternalFrame/6647340/bug6647340.java test/jdk/javax/swing/JInternalFrame/6725409/bug6725409.java test/jdk/javax/swing/JLayer/6824395/bug6824395.java test/jdk/javax/swing/JMenu/4417601/bug4417601.java test/jdk/javax/swing/JMenu/6359669/bug6359669.java test/jdk/javax/swing/JMenu/6538132/bug6538132.java test/jdk/javax/swing/JMenuItem/6249972/bug6249972.java test/jdk/javax/swing/JOptionPane/6428694/bug6428694.java test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java test/jdk/javax/swing/JPopupMenu/6217905/bug6217905.java test/jdk/javax/swing/JPopupMenu/6415145/bug6415145.java test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java test/jdk/javax/swing/JPopupMenu/6544309/bug6544309.java test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java test/jdk/javax/swing/JSlider/6401380/bug6401380.java test/jdk/javax/swing/JTabbedPane/7024235/Test7024235.java test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java test/jdk/javax/swing/JTree/8003400/Test8003400.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java test/jdk/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java test/jdk/lib/client/ExtendedRobot.java test/jdk/lib/testlibrary/ExtendedRobot.java
diffstat 344 files changed, 750 insertions(+), 750 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/java/awt/Component/PaintAll/PaintAll.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Component/PaintAll/PaintAll.java	Tue Nov 13 07:11:50 2018 -0800
@@ -47,7 +47,7 @@
   @bug 6596915
   @summary Test Component.paintAll() method
   @author sergey.bylokhov@oracle.com: area=awt.component
-  @library ../../../../lib/testlibrary/
+  @library /lib/client/
   @build ExtendedRobot
   @run main PaintAll
 */
--- a/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @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/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main DecoratedExceptions
  */
--- a/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/DisposeParentGC/DisposeParentGC.java	Tue Nov 13 07:11:50 2018 -0800
@@ -35,7 +35,7 @@
  *          added to it & each components are setted with different cursors types.
  *          Dispose the parent & collect GC. Garbage collection should happen
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main/othervm -Xmx20m DisposeParentGC
  */
--- a/test/jdk/java/awt/Frame/FramesGC/FramesGC.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/FramesGC/FramesGC.java	Tue Nov 13 07:11:50 2018 -0800
@@ -33,7 +33,7 @@
  * @key headful
  * @summary Verify that disposed frames are collected with GC
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main/othervm -Xmx20m FramesGC
  */
--- a/test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java	Tue Nov 13 07:11:50 2018 -0800
@@ -36,7 +36,7 @@
  * @summary Set extendedState Frame.MAXIMIZED_BOTH for undecorated Frame and JFrame.
  *          Check if resulted size is equal to GraphicsEnvironment.getMaximumWindowBounds().
  *
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main MaximizedUndecorated
  */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
  * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main ActiveAWTWindowTest
  */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @summary To check proper WINDOW_EVENTS are triggered when JFrame gains or losses the focus
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
  * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main ActiveSwingWindowTest
  */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/FrameCloseTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @summary To make sure Undecorated Frame triggers correct windows events while closing
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT*
  * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main FrameCloseTest
  */
--- a/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Frame/MiscUndecorated/RepaintTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  *          all the components on it are repainted correctly
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
  * @author yan
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main RepaintTest
  */
--- a/test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/GraphicsDevice/IncorrectDisplayModeExitFullscreen.java	Tue Nov 13 07:11:50 2018 -0800
@@ -33,7 +33,7 @@
  * @key headful
  * @bug 8019587
  * @author Sergey Bylokhov
- * @library ../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main IncorrectDisplayModeExitFullscreen
  */
--- a/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/List/SetBackgroundTest/SetBackgroundTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
   @requires (os.family == "linux") | (os.family == "solaris")
   @summary List does not honor user specified background, foreground colors on XToolkit
   @author Dmitry Cherepanov  area=awt.list
-  @library ../../../../lib/testlibrary
+  @library /lib/client
   @build ExtendedRobot
   @run main SetBackgroundTest
 */
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @bug 8054359 7186009
  * @summary Check whether a FileDialog set to document modality behaves as expected.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @bug 8054359
  * @summary Check whether a modeless FileDialog behaves as expected.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @bug 8054359 7186009
  * @summary Check whether a FileDialog set to toolkit modality behaves as expected.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -34,7 +34,7 @@
  *          whether all the windows lying down the document root
  *          (Frame) get blocked.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether a non-modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether a modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalDialogOrderingTest/ModalDialogOrderingTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -35,7 +35,7 @@
  * @bug 8008728
  * @summary [macosx] Swing. JDialog. Modal dialog goes to background
  * @author Alexandr Scherbatiy
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main ModalDialogOrderingTest
  */
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent dialog to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent dialog to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent dialog to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent frame to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent frame to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent frame to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent dialog to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent dialog to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent dialog to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent frame to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent frame to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          (it shouldn't). Checks also whether setting a parent frame to be
  *          modality excluded excludes its children from being blocked too.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog
  *          with a hidden frame owner is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog
  *          with a hidden frame owner is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog
  *          with a hidden frame owner is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog
  *          with a hidden frame owner is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          an application modal dialog having a null dialog owner is shown;
  *          a frame is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          an application modal dialog having F owner is shown; F is shown.
  *
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          a document modal dialog having a null dialog owner is shown;
  *          a frame is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          a modeless dialog having a null dialog owner is shown;
  *          a frame is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          a non-modal dialog having a null dialog owner is shown;
  *          a frame is shown.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          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/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  *          parent has a proper modal blocking behavior. Also show a document modal
  *          dialog and check if it blocks the document properly.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  *          parent has a proper modal blocking behavior. Also show a document modal
  *          dialog and check if it blocks the document properly.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Check correctness of modal blocking behavior for a chain of Dialogs
  *          having different modality types with a Frame as a document root.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  *          work properly. Also check whether the blocking dialogs are
  *          opening on top of the windows they block.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary This is a simple check if a chain of dialogs having different
  *          modality types block each other properly.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -34,7 +34,7 @@
  * @summary Check whether a Dialog set with null modality type
  *          behaves like a modeless dialog
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog created with null Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog created with null Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog created with hidden Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog created with hidden Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether an application modal Dialog created with visible
  *          Dialog constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog created with null Frame
  *          constructor follows normal Z order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog created with null Dialog
  *          constructor follows normal Z order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog created with hidden Frame
  *          constructor follows normal Z order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog created with hidden Dialog
  *          constructor follows normal Z order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a document modal Dialog created with visible
  *          Dialog constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modal Dialog created with null Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modal Dialog created with null Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modal Dialog created with hidden Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modal Dialog created with hidden Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modal Dialog created with visible Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog created with a
  *          null Frame constructor follows normal Z Order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog created with a
  *          null Dialog constructor follows normal Z Order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog created with a
  *          hidden Frame constructor follows normal Z Order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog created with a
  *          hidden Dialog constructor follows normal Z Order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog created with a
  *          visible Frame constructor follows normal Z Order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless Dialog created with a visible Dialog
  *          constructor follows a normal Z order.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog created with null Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog created with null Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog created with hidden Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog created with hidden Dialog
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog created with visible Frame
  *          constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a toolkit modal Dialog created with visible
  *          Dialog constructor stays on top of the windows it blocks.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with null Frame parent.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with null Dialog parent.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with hidden Frame parent.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check if toBack method works correctly for
  *          a document modal dialog with hidden Dialog parent.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless dialog having a null Frame constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless dialog having a null Dialog constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless dialog having a hidden Frame constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check whether a modeless dialog having a hidden Dialog constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check if toBack method works correctly for a modeless dialog
  *          having a visible Frame constructor.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Check if toBack method works correctly for a modeless dialog
  *          having a visible Dialog constructor.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether a non-modal dialog having a null Frame constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether a non-modal dialog having a null Dialog constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether a non-modal dialog having a hidden Frame constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether a non-modal dialog having a hidden Dialog constructor
  *          goes behind other windows when toBack is called for it.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check if toBack method works correctly for a non-modal dialog
  *          having a visible Frame constructor.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check if toBack method works correctly for a non-modal dialog
  *          having a visible Dialog constructor.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          constructor still stays on top of the blocked windows even
  *          after calling toBack for the dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking application modal dialog does not bring it to the top
  *          of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking document modal dialog does not bring it to the top
  *          of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  *          blocking modal dialog does not bring it to the top
  *          of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Check that calling toFront method does not bring a dialog to the top
  *          of a child modeless dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Check that calling toFront method does not bring a dialog to the top
  *          of a non-modal child dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking toolkit modal dialog does not bring it to the top
  *          of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking application modal dialog having a null Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking application modal dialog having a null Dialog parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking application modal dialog having a hidden Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking application modal dialog having a hidden Dialog parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking application modal dialog having a visible Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking document modal dialog having a visible Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @bug 8050885
  * @summary Check if toFront method works correctly for a document modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          blocking modal dialog having a null Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          blocking modal dialog having a null Dialog parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          blocking modal dialog having a hidden Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          blocking modal dialog having a hidden Dialog parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  *          blocking modal dialog having a visible Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check that calling toFront method does not bring a frame to the top of
  *          a modeless child dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check that calling toFront method does not bring a frame to the top
  *          of a non-modal child dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking modal toolkit dialog having a null Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking toolkit modal dialog having a null Dialog parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking toolkit modal dialog having a hidden Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking toolkit modal dialog having a hidden Dialog parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  *          blocking toolkit modal dialog having a visible Frame parent
  *          does not bring the frame to the top of the modal dialog.
  *
- * @library ../helpers /lib/testlibrary/
+ * @library ../helpers /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
--- a/test/jdk/java/awt/Paint/ExposeOnEDT.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Paint/ExposeOnEDT.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @key headful
  * @bug 7090424
  * @author Sergey Bylokhov
- * @library ../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main ExposeOnEDT
  */
--- a/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Paint/PaintNativeOnUpdate.java	Tue Nov 13 07:11:50 2018 -0800
@@ -33,7 +33,7 @@
  * @test
  * @key headful
  * @bug 7157680
- * @library ../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @author Sergey Bylokhov
  * @run main PaintNativeOnUpdate
--- a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -53,7 +53,7 @@
  *
  * @summary Make sure that modifier key mask is set when robot press
  *          some key with one or more modifiers.
- * @library /lib/testlibrary/
+ * @library /lib/client/
  * @library /test/lib
  * @build ExtendedRobot
  * @key headful
--- a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  * @key headful
  * @summary Make sure that modifier key mask is set when robot press
  *          some key with one or more modifiers.
- * @library /lib/testlibrary
+ * @library /lib/client
  * @library /test/lib
  * @build ExtendedRobot
  * @run main ModifierRobotKeyTest
--- a/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/ScrollPane/ScrollPanePreferredSize/ScrollPanePreferredSize.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  * @key headful
  * @bug 7124213
  * @author Sergey Bylokhov
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main ScrollPanePreferredSize
  */
--- a/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
   @key headful
   @summary verify LOCK buttons toogle
   @author Yuri.Nesterenko, Dmitriy.Ermashov
-  @library ../../../../lib/testlibrary
+  @library /lib/client
   @build ExtendedRobot
   @run main LockingKeyStateTest
 */
--- a/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/ActionCommand/ActionCommand.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          (single clicked, on Mac)
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @library /java/awt/patchlib
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
--- a/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/ActionEventMask/ActionEventMask.java	Tue Nov 13 07:11:50 2018 -0800
@@ -36,7 +36,7 @@
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main ActionEventMask
--- a/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/ActionEventTest/ActionEventTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Verify that ActionEvent is received with correct modifiers set.
  * @modules java.desktop/java.awt:open
  * @modules java.desktop/java.awt.peer
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @library /java/awt/patchlib
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
--- a/test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/ModalityTest/ModalityTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build ExtendedRobot SystemTrayIconHelper
  * @build java.desktop/java.awt.Helper
  * @run main ModalityTest
--- a/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/MouseEventMask/MouseEventMaskTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -35,7 +35,7 @@
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main MouseEventMaskTest
--- a/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/MouseMovedTest/MouseMovedTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
  * @bug 7153700
  * @summary Check for mouseMoved event for java.awt.TrayIcon
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main MouseMovedTest
  */
--- a/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
   @bug 8007220 8039081
   @summary Reference to the popup leaks after the TrayIcon is removed.
   @requires os.family != "windows"
-  @library ../../../../lib/testlibrary/
+  @library /lib/client/
   @build ExtendedRobot
   @run main/othervm -Xmx50m PopupMenuLeakTest
  */
--- a/test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java	Tue Nov 13 07:11:50 2018 -0800
@@ -39,7 +39,7 @@
  * @summary Right clicking on TrayIcon shouldn't trigger ActionEvent when balloon is displayed.
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main RightClickWhenBalloonDisplayed
--- a/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/SecurityCheck/FunctionalityCheck/FunctionalityCheck.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../../lib/testlibrary ../../
+ * @library /lib/client ../../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main/othervm/policy=tray.policy -Djava.security.manager FunctionalityCheck
--- a/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/SystemTrayIconHelper.java	Tue Nov 13 07:11:50 2018 -0800
@@ -34,7 +34,7 @@
 /*
  * @summary This is a helper class to find the location of a system tray icon,
  *          and skip some OS specific cases in tests.
- * @library ../../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot SystemTrayIconHelper
  */
 public class SystemTrayIconHelper {
--- a/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/TrayIconEventModifiers/TrayIconEventModifiersTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  *          TrayIcon is clicked pressing the modifier keys
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main TrayIconEventModifiersTest
--- a/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/TrayIconEvents/TrayIconEventsTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -33,7 +33,7 @@
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main TrayIconEventsTest
--- a/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/TrayIconMouseTest/TrayIconMouseTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -38,7 +38,7 @@
  *          or single clicked with button 1 on rest.
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main TrayIconMouseTest
--- a/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupClickTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupClickTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -40,7 +40,7 @@
  * @author Shashidhara Veerabhadraiah (shashidhara.veerabhadraiah@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main TrayIconPopupClickTest
--- a/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/TrayIcon/TrayIconPopup/TrayIconPopupTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
  * @modules java.desktop/java.awt:open
  * @library /java/awt/patchlib
- * @library ../../../../lib/testlibrary ../
+ * @library /lib/client ../
  * @build java.desktop/java.awt.Helper
  * @build ExtendedRobot SystemTrayIconHelper
  * @run main TrayIconPopupTest
--- a/test/jdk/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java	Tue Nov 13 07:11:50 2018 -0800
@@ -35,7 +35,7 @@
  * @bug 8001472
  * @summary Background of the window should not depend from the paint()/update()
  * @author Sergey Bylokhov
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main BackgroundIsNotUpdated
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/FocusAWTTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -50,7 +50,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main FocusAWTTest
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShape.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main SetShape
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeAndClick.java	Tue Nov 13 07:11:50 2018 -0800
@@ -49,7 +49,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main SetShapeAndClick
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/SetShapeDynamicallyAndClick.java	Tue Nov 13 07:11:50 2018 -0800
@@ -48,7 +48,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main SetShapeDynamicallyAndClick
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Shaped.java	Tue Nov 13 07:11:50 2018 -0800
@@ -44,7 +44,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main Shaped
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedByAPI.java	Tue Nov 13 07:11:50 2018 -0800
@@ -43,7 +43,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @run main ShapedByAPI
  */
 public class ShapedByAPI extends Common {
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucent.java	Tue Nov 13 07:11:50 2018 -0800
@@ -43,7 +43,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main ShapedTranslucent
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/ShapedTranslucentWindowClick.java	Tue Nov 13 07:11:50 2018 -0800
@@ -45,7 +45,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main ShapedTranslucentWindowClick
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/StaticallyShaped.java	Tue Nov 13 07:11:50 2018 -0800
@@ -43,7 +43,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main StaticallyShaped
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/Translucent.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main Translucent
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentChoice.java	Tue Nov 13 07:11:50 2018 -0800
@@ -43,7 +43,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main TranslucentChoice
  */
--- a/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/ShapedAndTranslucentWindows/TranslucentWindowClick.java	Tue Nov 13 07:11:50 2018 -0800
@@ -40,7 +40,7 @@
  *
  * @author mrkam
  * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com)
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main TranslucentWindowClick
  */
--- a/test/jdk/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/Window/setLocRelativeTo/SetLocationRelativeToTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          so that their centers coincide
  *          or, if the component is hidden, centered on the screen.
  * @bug 8036915
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main/timeout=1200 SetLocationRelativeToTest
  */
--- a/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/datatransfer/ImageTransfer/ImageTransferTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -36,7 +36,7 @@
  *          system clipboard
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
  * @author dmitriy.ermashov@oracle.com
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main ImageTransferTest
  */
--- a/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/datatransfer/Independence/IndependenceAWTTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -34,7 +34,7 @@
  * @summary To make sure that System & Primary clipboards should behave independently
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
  * @author dmitriy.ermashov@oracle.com
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main IndependenceAWTTest
  */
--- a/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/datatransfer/Independence/IndependenceSwingTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  * @summary To make sure that System & Primary clipboards should behave independently
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
  * @author dmitriy.ermashov@oracle.com
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main IndependenceSwingTest
  */
--- a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionAWTTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -38,7 +38,7 @@
  * @summary To check the functionality of newly added API getSystemSelection & make sure
  *          that it's mapped to primary clipboard
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main SystemSelectionAWTTest
  */
--- a/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/datatransfer/SystemSelection/SystemSelectionSwingTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -39,7 +39,7 @@
  * @summary To check the functionality of newly added API getSystemSelection & make sure
  *          that it's mapped to primary clipboard
  * @author Jitender(jitender.singh@eng.sun.com) area=AWT
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main SystemSelectionSwingTest
  */
--- a/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  * @bug 8007156 8025126
  * @summary Extended key code is not set for a key event
  * @author Alexandr Scherbatiy
- * @library ../../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main ExtendedKeyCodeTest
  */
--- a/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *          2. InputEvent.getModifiersExText() returns
  *             correct extended modifier keys description
  *
- * @library /lib/testlibrary/ ../../helpers/lwcomponents/
+ * @library /lib/client/ ../../helpers/lwcomponents/
  * @library /test/lib
  * @build LWComponent
  * @build LWButton
--- a/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check whether KeyEvent.getModifiers() returns correct modifiers
  *          when Ctrl, Alt or Shift keys are pressed.
  *
- * @library /lib/testlibrary/ ../../helpers/lwcomponents/
+ * @library /lib/client/ ../../helpers/lwcomponents/
  * @library /test/lib
  * @build LWComponent
  * @build LWButton
--- a/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -46,7 +46,7 @@
  *          and KeyEvent.getModifiers() return correct modifiers when pressing
  *          keys Ctrl, Alt, Shift, Meta and mouse buttons sequentially
  *
- * @library /lib/testlibrary/ ../../helpers/lwcomponents/
+ * @library /lib/client/ ../../helpers/lwcomponents/
  * @library /test/lib
  * @build LWComponent
  * @build LWButton
--- a/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -44,7 +44,7 @@
  *          number when the mouse buttons are pressed and getModifiers()
  *          returns correct modifiers
  *
- * @library /lib/testlibrary/ ../../helpers/lwcomponents/
+ * @library /lib/client/ ../../helpers/lwcomponents/
  * @library /test/lib
  * @build LWComponent
  * @build LWButton
--- a/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -37,7 +37,7 @@
  * @summary Check whether correct modifiers set when multiple mouse buttons were pressed;
  *          check number of received events.
  *
- * @library /lib/testlibrary/ ../../helpers/lwcomponents/
+ * @library /lib/client/ ../../helpers/lwcomponents/
  * @library /test/lib
  * @build LWComponent
  * @build LWButton
--- a/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/image/multiresolution/Corrupted2XImageTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -32,7 +32,7 @@
  *
  * @requires (os.family == "mac")
  *
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main Corrupted2XImageTest
  */
--- a/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check that correct resolution variants are chosen for menu icons
  *          when multiresolution image is used for their construction.
  *
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main/othervm -Dsun.java2d.uiScale=1 MenuMultiresolutionIconTest
  * @run main/othervm -Dsun.java2d.uiScale=2 MenuMultiresolutionIconTest
--- a/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
   @author a.stepanov
   @summary Check if correct resolution variant is used
            for JOptionPane dialog / internal frame icons.
-  @library ../../../../lib/testlibrary/
+  @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
--- a/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/image/multiresolution/MultiresolutionIconTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @summary Check that correct resolution variants are chosen for icons
  *          when multiresolution image is used for their construction.
  *
- * @library ../../../../lib/testlibrary/
+ * @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
--- a/test/jdk/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/java/awt/keyboard/AltPlusNumberKeyCombinationsTest/AltPlusNumberKeyCombinationsTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @key headful
  * @summary Test that it is possible to type "Alt code" on Windows.
  * @requires (os.family == "windows")
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main AltPlusNumberKeyCombinationsTest
  */
--- a/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java	Tue Nov 13 07:11:50 2018 -0800
@@ -36,7 +36,7 @@
  * @key headful
  * @bug 8009919
  * @author Sergey Bylokhov
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main JButtonPaintNPE
  */
--- a/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JComboBox/4523758/bug4523758.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @key headful
  * @bug 4523758
  * @summary Directly check that torn-off combo works
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug4523758
  */
--- a/test/jdk/javax/swing/JComboBox/6559152/bug6559152.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JComboBox/6559152/bug6559152.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Checks that you can select an item in JComboBox with keyboard
  *          when it is a JTable cell editor.
  * @author Mikhail Lapshin
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug6559152
  */
--- a/test/jdk/javax/swing/JComboBox/8015300/Test8015300.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JComboBox/8015300/Test8015300.java	Tue Nov 13 07:11:50 2018 -0800
@@ -42,7 +42,7 @@
    @requires (os.family == "windows")
  * @summary Tests that editable combobox selects all text.
  * @author Sergey Malenkov
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build ExtendedRobot
  * @run main Test8015300
--- a/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java	Tue Nov 13 07:11:50 2018 -0800
@@ -31,7 +31,7 @@
   @bug 8031485 8058193
   @summary Combo box consuming escape and enter key events
   @author Petr Pchelko
-  @library ../../../../lib/testlibrary/
+  @library /lib/client/
   @build ExtendedRobot
   @run main ConsumedKeyTest
 */
--- a/test/jdk/javax/swing/JComponent/7154030/bug7154030.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JComponent/7154030/bug7154030.java	Tue Nov 13 07:11:50 2018 -0800
@@ -47,7 +47,7 @@
  * @summary Swing components fail to hide after calling hide()
  * @author Jonathan Lu
  * @library ../../regtesthelpers/
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build Util
  * @build ExtendedRobot
  * @run main bug7154030
--- a/test/jdk/javax/swing/JInternalFrame/6647340/bug6647340.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JInternalFrame/6647340/bug6647340.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @summary Checks that iconified internal frame follows
  *          the main frame borders properly.
  * @author Mikhail Lapshin
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main bug6647340
  */
--- a/test/jdk/javax/swing/JInternalFrame/6725409/bug6725409.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JInternalFrame/6725409/bug6725409.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Checks that JInternalFrame's system menu
  *          can be localized during run-time
  * @author Mikhail Lapshin
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @modules java.desktop/com.sun.java.swing.plaf.windows
  * @build ExtendedRobot
  * @run main bug6725409
--- a/test/jdk/javax/swing/JLayer/6824395/bug6824395.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JLayer/6824395/bug6824395.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @key headful
  * @summary Checks that JLayer inside JViewport works is correctly laid out
  * @author Alexander Potochkin
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main bug6824395
  */
--- a/test/jdk/javax/swing/JMenu/4417601/bug4417601.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JMenu/4417601/bug4417601.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @bug 4417601
  * @summary JMenus with no items paint a tiny menu.
  * @author Alexander Potochkin
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug4417601
  */
--- a/test/jdk/javax/swing/JMenu/6359669/bug6359669.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JMenu/6359669/bug6359669.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @bug 6359669
  * @summary REGRESSION: Submenu does not work if populated in PopupMenuListener.popupMenuWillBecomeVisible
  * @author Alexander Potochkin
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug6359669
  */
--- a/test/jdk/javax/swing/JMenu/6538132/bug6538132.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JMenu/6538132/bug6538132.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary Regression: Pressing Escape key don't close the menu items from jdk7.0 b07 onwards
  * @author Alexander Potochkin
  * @requires (os.family == "windows")
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug6538132
  */
--- a/test/jdk/javax/swing/JMenuItem/6249972/bug6249972.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JMenuItem/6249972/bug6249972.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @key headful
  * @bug 6249972
  * @summary Tests that JMenuItem(String,int) handles lower-case mnemonics properly.
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @author Mikhail Lapshin
  * @run main bug6249972
--- a/test/jdk/javax/swing/JOptionPane/6428694/bug6428694.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JOptionPane/6428694/bug6428694.java	Tue Nov 13 07:11:50 2018 -0800
@@ -25,7 +25,7 @@
  * @key headful
  * @bug 6428694
  * @summary Checks that double click closes JOptionPane's input dialog.
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @author Mikhail Lapshin
  * @run main bug6428694
--- a/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JPopupMenu/4634626/bug4634626.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @bug 4634626
  * @summary Implement context popup menus for components
  * @author Alexander Zuev
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run applet bug4634626.html
  */
--- a/test/jdk/javax/swing/JPopupMenu/6217905/bug6217905.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JPopupMenu/6217905/bug6217905.java	Tue Nov 13 07:11:50 2018 -0800
@@ -28,7 +28,7 @@
  * @summary JPopupMenu keyboard navigation stops working
  * @author Alexander Potochkin
  * @requires (os.family == "windows")
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug6217905
  */
--- a/test/jdk/javax/swing/JPopupMenu/6415145/bug6415145.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JPopupMenu/6415145/bug6415145.java	Tue Nov 13 07:11:50 2018 -0800
@@ -25,7 +25,7 @@
  * @key headful
  * @bug 6415145
  * @summary REGRESSION: Selected item is not being updated while dragging above popup menu
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @author Mikhail Lapshin
  * @run main bug6415145
--- a/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JPopupMenu/6515446/bug6515446.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @bug 6515446
  * @summary JMenuItems in JPopupMenus not receiving ActionEvents - incompat with 1.5
  * @author Alexander Potochkin
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug6515446
  */
--- a/test/jdk/javax/swing/JPopupMenu/6544309/bug6544309.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JPopupMenu/6544309/bug6544309.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
    @summary Checks that 'Select Input Method' popup menu allows to select
             items with keyboard.
    @author Mikhail Lapshin
-   @library ../../../../lib/testlibrary
+   @library /lib/client
    @build ExtendedRobot
    @run main bug6544309
 */
--- a/test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @bug 6580930 7184956
  * @summary Swing Popups should overlap taskbar
  * @author Alexander Potochkin
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main bug6580930
  */
--- a/test/jdk/javax/swing/JSlider/6401380/bug6401380.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JSlider/6401380/bug6401380.java	Tue Nov 13 07:11:50 2018 -0800
@@ -26,7 +26,7 @@
  * @key headful
  * @bug 6401380
  * @summary JSlider - mouse click ont the left side of the knob is ignored.
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @author Alexander Potochkin
  * @run main bug6401380
--- a/test/jdk/javax/swing/JTabbedPane/7024235/Test7024235.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JTabbedPane/7024235/Test7024235.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  * @key headful
  * @bug 7024235
  * @summary Tests JFrame.pack() with the JTabbedPane
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @author Sergey Malenkov
  * @run main Test7024235
--- a/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JTabbedPane/7170310/bug7170310.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  * @bug 7170310
  * @author Alexey Ivanov
  * @summary Selected tab should be scrolled into view.
- * @library ../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main bug7170310
  */
--- a/test/jdk/javax/swing/JTree/8003400/Test8003400.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JTree/8003400/Test8003400.java	Tue Nov 13 07:11:50 2018 -0800
@@ -27,7 +27,7 @@
  * @bug 8003400
  * @summary Tests that JTree shows the last row
  * @author Sergey Malenkov
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main/othervm Test8003400
  * @run main/othervm Test8003400 reverse
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucent.java	Tue Nov 13 07:11:50 2018 -0800
@@ -40,7 +40,7 @@
  *      window should appear with the translucency. Only window background
  *      should be translucent, all the controls should be opaque.
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main PerPixelTranslucent
  * @run main/othervm -Dsun.java2d.uiScale=1.5 PerPixelTranslucent
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @key headful
  * @summary Check if a per-pixel translucent window shows up with correct translucency
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main PerPixelTranslucentCanvas
  * @run main/othervm -Dsun.java2d.uiScale=1.5 PerPixelTranslucentCanvas
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentGradient.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  *      the window should appear as specified with the translucency. Only window
  *      background should be translucent, all the controls should be opaque.
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main PerPixelTranslucentGradient
  * @run main/othervm -Dsun.java2d.uiScale=1.5 PerPixelTranslucentGradient
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java	Tue Nov 13 07:11:50 2018 -0800
@@ -38,7 +38,7 @@
  * Expected Result: Only the components present in the window must be shown. Other
  *      areas of the window must be transparent so that the background shows
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main PerPixelTranslucentSwing
  * @run main/othervm -Dsun.java2d.uiScale=1.5 PerPixelTranslucentSwing
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java	Tue Nov 13 07:11:50 2018 -0800
@@ -47,7 +47,7 @@
  *      on clipped region should deliver the event to the background (it should be
  *      another Window behind the test window)
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main SetShapeAndClickSwing
  */
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java	Tue Nov 13 07:11:50 2018 -0800
@@ -45,7 +45,7 @@
  *      translucent gradient in parts that are not clipped by shape, all the
  *      controls should be opaque.
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main ShapedPerPixelTranslucentGradient
  * @run main/othervm -Dsun.java2d.uiScale=1.5 ShapedPerPixelTranslucentGradient
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedTranslucentPerPixelTranslucentGradient.java	Tue Nov 13 07:11:50 2018 -0800
@@ -46,7 +46,7 @@
  *      translucent gradient in parts that are not clipped by shape, all the
  *      controls should be equally translucent.
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main ShapedTranslucentPerPixelTranslucentGradient
  * @run main/othervm -Dsun.java2d.uiScale=1.5 ShapedTranslucentPerPixelTranslucentGradient
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java	Tue Nov 13 07:11:50 2018 -0800
@@ -36,7 +36,7 @@
  * Expected Result: If TRANSLUCENT Translucency type is supported, the drop down
  *      should appear translucent.
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main TranslucentJComboBox
  */
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentPerPixelTranslucentGradient.java	Tue Nov 13 07:11:50 2018 -0800
@@ -43,7 +43,7 @@
  *      Both window background and all the controls should be translucent but
  *      background should have a gradient in translucency while controls - not.
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main TranslucentPerPixelTranslucentGradient
  * @run main/othervm -Dsun.java2d.uiScale=1.5 TranslucentPerPixelTranslucentGradient
--- a/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java	Tue Nov 13 07:11:50 2018 -0800
@@ -39,7 +39,7 @@
  *      should appear translucent showing the background. They should trigger events
  *      correctly
  * @author mrkam
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build Common ExtendedRobot
  * @run main TranslucentWindowClickSwing
  */
--- a/test/jdk/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/dnd/8139050/NativeErrorsInTableDnD.java	Tue Nov 13 07:11:50 2018 -0800
@@ -41,7 +41,7 @@
  * @test
  * @bug 8139050 8153871
  * @key headful
- * @library ../../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main/othervm/timeout=360 -Xcheck:jni NativeErrorsInTableDnD
  */
--- a/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/reliability/TaskUndJFrameProperties.java	Tue Nov 13 07:11:50 2018 -0800
@@ -30,7 +30,7 @@
  * @summary Construct a Undecorated JFrame, try to change the properties
  *          using setVisible() method.
  * @author Aruna Samji
- * @library ../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main TaskUndJFrameProperties
  */
--- a/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/reliability/TaskZoomJFrameChangeState.java	Tue Nov 13 07:11:50 2018 -0800
@@ -33,7 +33,7 @@
  *          check the zoomed size is same as the screen size. Check the
  *          location of the jframe after restoration from zoom or icon.
  * @author Aruna Samji
- * @library ../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main TaskZoomJFrameChangeState
  */
--- a/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/reliability/TaskZoomJFrameRepaint.java	Tue Nov 13 07:11:50 2018 -0800
@@ -29,7 +29,7 @@
  * @key headful
  * @summary Construct a jframe with some components and zoom the frame and bring it back to normal state.
  * @author Aruna Samji
- * @library ../../../lib/testlibrary
+ * @library /lib/client
  * @build ExtendedRobot
  * @run main TaskZoomJFrameRepaint
  */
--- a/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java	Tue Nov 13 09:39:57 2018 +0530
+++ b/test/jdk/javax/swing/text/AbstractDocument/6968363/Test6968363.java	Tue Nov 13 07:11:50 2018 -0800
@@ -46,7 +46,7 @@
  * @bug 6968363
  * @summary Ensures that a custom document may not extend AbstractDocument
  * @author Sergey Malenkov
- * @library ../../../../../lib/testlibrary/
+ * @library /lib/client/
  * @build ExtendedRobot
  * @run main Test6968363
  */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/lib/client/ExtendedRobot.java	Tue Nov 13 07:11:50 2018 -0800
@@ -0,0 +1,408 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.AWTException;
+import java.awt.Robot;
+import java.awt.GraphicsDevice;
+import java.awt.Toolkit;
+import java.awt.Point;
+import java.awt.MouseInfo;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+/**
+ * ExtendedRobot is a subclass of {@link java.awt.Robot}. It provides some convenience methods that are
+ * ought to be moved to {@link java.awt.Robot} class.
+ * <p>
+ * ExtendedRobot uses delay {@link #getSyncDelay()} to make syncing threads with {@link #waitForIdle()}
+ * more stable. This delay can be set once on creating object and could not be changed throughout object
+ * lifecycle. Constructor reads vm integer property {@code java.awt.robotdelay} and sets the delay value
+ * equal to the property value. If the property was not set 500 milliseconds default value is used.
+ * <p>
+ * When using jtreg you would include this class via something like:
+ * <pre>
+ * {@literal @}library ../../../../lib/testlibrary
+ * {@literal @}build ExtendedRobot
+ * </pre>
+ *
+ * @author      Dmitriy Ermashov
+ * @since       9
+ */
+
+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;
+
+    //TODO: uncomment three lines below after moving functionality to java.awt.Robot
+    //{
+    //    syncDelay = AccessController.doPrivileged(new GetIntegerAction("java.awt.robotdelay", DEFAULT_SYNC_DELAY));
+    //}
+
+    /**
+     * Constructs an ExtendedRobot object in the coordinate system of the primary screen.
+     *
+     * @throws  AWTException if the platform configuration does not allow low-level input
+     *          control. This exception is always thrown when
+     *          GraphicsEnvironment.isHeadless() returns true
+     * @throws  SecurityException if {@code createRobot} permission is not granted
+     *
+     * @see     java.awt.GraphicsEnvironment#isHeadless
+     * @see     SecurityManager#checkPermission
+     * @see     java.awt.AWTPermission
+     */
+    public ExtendedRobot() throws AWTException {
+        super();
+    }
+
+    /**
+     * Creates an ExtendedRobot for the given screen device. Coordinates passed
+     * to ExtendedRobot method calls like mouseMove and createScreenCapture will
+     * be interpreted as being in the same coordinate system as the specified screen.
+     * Note that depending on the platform configuration, multiple screens may either:
+     * <ul>
+     * <li>share the same coordinate system to form a combined virtual screen</li>
+     * <li>use different coordinate systems to act as independent screens</li>
+     * </ul>
+     * This constructor is meant for the latter case.
+     * <p>
+     * If screen devices are reconfigured such that the coordinate system is
+     * affected, the behavior of existing ExtendedRobot objects is undefined.
+     *
+     * @param   screen  A screen GraphicsDevice indicating the coordinate
+     *                  system the Robot will operate in.
+     * @throws  AWTException if the platform configuration does not allow low-level input
+     *          control. This exception is always thrown when
+     *          GraphicsEnvironment.isHeadless() returns true.
+     * @throws  IllegalArgumentException if {@code screen} is not a screen
+     *          GraphicsDevice.
+     * @throws  SecurityException if {@code createRobot} permission is not granted
+     *
+     * @see     java.awt.GraphicsEnvironment#isHeadless
+     * @see     GraphicsDevice
+     * @see     SecurityManager#checkPermission
+     * @see     java.awt.AWTPermission
+     */
+    public ExtendedRobot(GraphicsDevice screen) throws AWTException {
+        super(screen);
+    }
+
+    /**
+     * Returns delay length for {@link #waitForIdle()} method
+     *
+     * @return  Current delay value
+     *
+     * @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);
+    }
+
+    /**
+     * Moves mouse pointer to given screen coordinates.
+     *
+     * @param   position    Target position
+     *
+     * @see     java.awt.Robot#mouseMove(int, int)
+     */
+    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
+     * ({@code fromX}, {@code fromY}), presses mouse button 1, drag mouse to
+     * point with coordinates ({@code toX}, {@code toY}) and releases mouse
+     * button 1 at last.
+     *
+     * @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     #mousePress(int)
+     * @see     #glide(int, int, int, int)
+     */
+    public void dragAndDrop(int fromX, int fromY, int toX, int toY){
+        mouseMove(fromX, fromY);
+        mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        waitForIdle();
+        glide(toX, toY);
+        mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        waitForIdle();
+    }
+
+    /**
+     * Emulate native drag and drop process using {@code InputEvent.BUTTON1_DOWN_MASK}.
+     * The method successively moves mouse cursor to point {@code from},
+     * presses mouse button 1, drag mouse to point {@code to} and releases
+     * mouse button 1 at last.
+     *
+     * @param   from    Source point
+     * @param   to      Destination point
+     *
+     * @see     #mousePress(int)
+     * @see     #glide(int, int, int, int)
+     * @see     #dragAndDrop(int, int, int, int)
+     */
+    public void dragAndDrop(Point from, Point to){
+        dragAndDrop(from.x, from.y, to.x, to.y);
+    }
+
+    /**
+     * Successively presses and releases a given key.
+     * <p>
+     * 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());
+    }
+}
--- a/test/jdk/lib/testlibrary/ExtendedRobot.java	Tue Nov 13 09:39:57 2018 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.awt.AWTException;
-import java.awt.Robot;
-import java.awt.GraphicsDevice;
-import java.awt.Toolkit;
-import java.awt.Point;
-import java.awt.MouseInfo;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-
-/**
- * ExtendedRobot is a subclass of {@link java.awt.Robot}. It provides some convenience methods that are
- * ought to be moved to {@link java.awt.Robot} class.
- * <p>
- * ExtendedRobot uses delay {@link #getSyncDelay()} to make syncing threads with {@link #waitForIdle()}
- * more stable. This delay can be set once on creating object and could not be changed throughout object
- * lifecycle. Constructor reads vm integer property {@code java.awt.robotdelay} and sets the delay value
- * equal to the property value. If the property was not set 500 milliseconds default value is used.
- * <p>
- * When using jtreg you would include this class via something like:
- * <pre>
- * {@literal @}library ../../../../lib/testlibrary
- * {@literal @}build ExtendedRobot
- * </pre>
- *
- * @author      Dmitriy Ermashov
- * @since       9
- */
-
-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;
-
-    //TODO: uncomment three lines below after moving functionality to java.awt.Robot
-    //{
-    //    syncDelay = AccessController.doPrivileged(new GetIntegerAction("java.awt.robotdelay", DEFAULT_SYNC_DELAY));
-    //}
-
-    /**
-     * Constructs an ExtendedRobot object in the coordinate system of the primary screen.
-     *
-     * @throws  AWTException if the platform configuration does not allow low-level input
-     *          control. This exception is always thrown when
-     *          GraphicsEnvironment.isHeadless() returns true
-     * @throws  SecurityException if {@code createRobot} permission is not granted
-     *
-     * @see     java.awt.GraphicsEnvironment#isHeadless
-     * @see     SecurityManager#checkPermission
-     * @see     java.awt.AWTPermission
-     */
-    public ExtendedRobot() throws AWTException {
-        super();
-    }
-
-    /**
-     * Creates an ExtendedRobot for the given screen device. Coordinates passed
-     * to ExtendedRobot method calls like mouseMove and createScreenCapture will
-     * be interpreted as being in the same coordinate system as the specified screen.
-     * Note that depending on the platform configuration, multiple screens may either:
-     * <ul>
-     * <li>share the same coordinate system to form a combined virtual screen</li>
-     * <li>use different coordinate systems to act as independent screens</li>
-     * </ul>
-     * This constructor is meant for the latter case.
-     * <p>
-     * If screen devices are reconfigured such that the coordinate system is
-     * affected, the behavior of existing ExtendedRobot objects is undefined.
-     *
-     * @param   screen  A screen GraphicsDevice indicating the coordinate
-     *                  system the Robot will operate in.
-     * @throws  AWTException if the platform configuration does not allow low-level input
-     *          control. This exception is always thrown when
-     *          GraphicsEnvironment.isHeadless() returns true.
-     * @throws  IllegalArgumentException if {@code screen} is not a screen
-     *          GraphicsDevice.
-     * @throws  SecurityException if {@code createRobot} permission is not granted
-     *
-     * @see     java.awt.GraphicsEnvironment#isHeadless
-     * @see     GraphicsDevice
-     * @see     SecurityManager#checkPermission
-     * @see     java.awt.AWTPermission
-     */
-    public ExtendedRobot(GraphicsDevice screen) throws AWTException {
-        super(screen);
-    }
-
-    /**
-     * Returns delay length for {@link #waitForIdle()} method
-     *
-     * @return  Current delay value
-     *
-     * @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);
-    }
-
-    /**
-     * Moves mouse pointer to given screen coordinates.
-     *
-     * @param   position    Target position
-     *
-     * @see     java.awt.Robot#mouseMove(int, int)
-     */
-    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
-     * ({@code fromX}, {@code fromY}), presses mouse button 1, drag mouse to
-     * point with coordinates ({@code toX}, {@code toY}) and releases mouse
-     * button 1 at last.
-     *
-     * @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     #mousePress(int)
-     * @see     #glide(int, int, int, int)
-     */
-    public void dragAndDrop(int fromX, int fromY, int toX, int toY){
-        mouseMove(fromX, fromY);
-        mousePress(InputEvent.BUTTON1_DOWN_MASK);
-        waitForIdle();
-        glide(toX, toY);
-        mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
-        waitForIdle();
-    }
-
-    /**
-     * Emulate native drag and drop process using {@code InputEvent.BUTTON1_DOWN_MASK}.
-     * The method successively moves mouse cursor to point {@code from},
-     * presses mouse button 1, drag mouse to point {@code to} and releases
-     * mouse button 1 at last.
-     *
-     * @param   from    Source point
-     * @param   to      Destination point
-     *
-     * @see     #mousePress(int)
-     * @see     #glide(int, int, int, int)
-     * @see     #dragAndDrop(int, int, int, int)
-     */
-    public void dragAndDrop(Point from, Point to){
-        dragAndDrop(from.x, from.y, to.x, to.y);
-    }
-
-    /**
-     * Successively presses and releases a given key.
-     * <p>
-     * 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());
-    }
-}