--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java	Fri Sep 21 14:50:06 2018 -0700
@@ -25,7 +25,7 @@
 /**
  * @test
  * @requires vm.cds
- * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
@@ -39,7 +39,7 @@
 import java.nio.file.Paths;
 
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.testlibrary.Asserts;
+import jdk.test.lib.Asserts;
 
 public class AddReads {
 

--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java	Fri Sep 21 14:50:06 2018 -0700
@@ -25,7 +25,7 @@
 /**
  * @test
  * @requires vm.cds
- * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
@@ -40,7 +40,7 @@
 
 import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.testlibrary.Asserts;
+import jdk.test.lib.Asserts;
 
 public class ExportModule {
 

--- a/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import jdk.testlibrary.Asserts;
+import jdk.test.lib.Asserts;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -30,7 +30,7 @@
 /**
  * @test
  * @bug 8051408
- * @library /lib/testlibrary
+ * @library /test/lib
  * @summary testing HmacSHA512/224 and HmacSHA512/256.
  */
 public class HmacSHA512 {

--- a/test/jdk/com/sun/jdi/NoLaunchOptionTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/com/sun/jdi/NoLaunchOptionTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static jdk.testlibrary.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertFalse;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -31,11 +31,10 @@
  * @summary    Test for -Xrunjdwp:[onthrow,onuncaught] suboptions require launch suboption
  * @author     Tim Bell
  *
- * @library /lib/testlibrary
  * @library /test/lib
  *
  * @run compile -g NoLaunchOptionTest.java
- * @build jdk.testlibrary.* VMConnection
+ * @build VMConnection
  * @run driver NoLaunchOptionTest
  */
 public class NoLaunchOptionTest extends Object {

--- a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Fri Sep 21 14:50:06 2018 -0700
@@ -21,8 +21,8 @@
  * questions.
  */
 
-import static jdk.testlibrary.Asserts.assertTrue;
-import static jdk.testlibrary.Asserts.fail;
+import static jdk.test.lib.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.fail;
 
 import java.io.File;
 import java.lang.management.*;
@@ -37,9 +37,7 @@
  * @test
  * @bug 6455258
  * @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap method
- * @library /lib/testlibrary
  * @library /test/lib
- * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.model.*
  * @build jdk.test.lib.hprof.parser.*

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -29,7 +29,8 @@
  * @bug 8054359 7186009
  * @summary Check whether a FileDialog set to document modality behaves as expected.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -29,7 +29,8 @@
  * @bug 8054359
  * @summary Check whether a modeless FileDialog behaves as expected.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a null Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a null Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a hidden Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a hidden Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a visible Frame constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          created with a visible Dialog constructor. Also check if other
  *          windows are blocked by the FileDialog too.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -29,7 +29,8 @@
  * @bug 8054359 7186009
  * @summary Check whether a FileDialog set to toolkit modality behaves as expected.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -30,7 +30,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -22,7 +22,7 @@
  */
 
 import java.awt.*;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 // DD: Dialog -> Dialog
 

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Dialog.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -23,7 +23,7 @@
 
 
 import java.awt.*;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 // DF: Dialog -> Frame

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events. Check also if the other windows
  *          receive mouse and key events.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -23,7 +23,7 @@
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 // DFW: Dialog -> Frame -> Window
 

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -23,7 +23,7 @@
 
 
 import java.awt.*;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 /*
@@ -34,7 +34,8 @@
  *          whether all the windows lying down the document root
  *          (Frame) get blocked.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -22,7 +22,7 @@
  */
 
 import java.awt.*;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 // FD: Frame -> Dialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events. Check also the correctness
  *          of the blocking behavior for the parent Frame.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -30,7 +30,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Check also the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -23,7 +23,7 @@
 
 
 import java.awt.*;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 // FDW: Frame -> Dialog -> Window

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -24,7 +24,7 @@
 
 import java.awt.*;
 import java.awt.event.KeyEvent;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 import java.util.List;
 import java.util.ArrayList;

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 import java.awt.*;
 import java.util.List;

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -32,7 +32,8 @@
  *          and respond to key events, when there are other windows shown.
  *          Also check the correctness of blocking behavior for other windows shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -30,7 +30,8 @@
  * @summary Check whether an application modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -30,7 +30,8 @@
  * @summary Check whether a document modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -30,7 +30,8 @@
  * @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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -29,7 +29,8 @@
  * @summary Check whether a non-modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -29,7 +29,8 @@
  * @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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -22,7 +22,7 @@
  */
 
 import java.awt.*;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 public class UnblockedDialogTest {

--- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -30,7 +30,8 @@
  * @summary Check whether a toolkit modal Dialog receives focus; check
  *          if its components receive focus and respond to key events
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -25,7 +25,7 @@
 import java.awt.event.*;
 import java.awt.print.*;
 
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 public class ExcludeDialogTest implements AWTEventListener {

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -25,7 +25,7 @@
 import java.awt.event.*;
 import java.awt.print.*;
 
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 
 public class ExcludeFrameTest implements AWTEventListener {

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          (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/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          happens: an application modal dialog (D) having null frame owner is shown;
  *          a window having D as owner is shown; a frame is shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          following happens: a document modal dialog (D) having null frame owner is shown;
  *          a window having D as owner is shown; a frame is shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog

--- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java	Fri Sep 21 21:35:12 2018 +0200
+++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java	Fri Sep 21 14:50:06 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -31,7 +31,8 @@
  *          following happens: a modeless dialog (D) having null frame owner is shown;
  *          a window having D as owner is shown; a frame is shown.
  *
- * @library ../helpers ../../../../lib/testlibrary/
+ * @library ../helpers /lib/testlibrary/
+ * @library /test/lib
  * @build ExtendedRobot
  * @build Flag
  * @build TestDialog