# HG changeset patch # User iignatyev # Date 1537309973 25200 # Tue Sep 18 15:32:53 2018 -0700 # Node ID 9af71591a960260eb8456a38dac612c3c2d26655 # Parent c0f9161f591e88739feac327f5725ab3ece5a082 [mq]: asserts diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java +++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java @@ -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 { diff --git a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java --- a/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java +++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java @@ -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 { diff --git a/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java b/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java --- a/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java +++ b/test/jdk/com/sun/crypto/provider/Mac/HmacSHA512.java @@ -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 { diff --git a/test/jdk/com/sun/jdi/NoLaunchOptionTest.java b/test/jdk/com/sun/jdi/NoLaunchOptionTest.java --- a/test/jdk/com/sun/jdi/NoLaunchOptionTest.java +++ b/test/jdk/com/sun/jdi/NoLaunchOptionTest.java @@ -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 { diff --git a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java --- a/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java +++ b/test/jdk/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java @@ -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.* diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java --- a/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java +++ b/test/jdk/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDTest.java @@ -22,7 +22,7 @@ */ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // DD: Dialog -> Dialog diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // DF: Dialog -> Frame diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDFWTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDTest.java @@ -22,7 +22,7 @@ */ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // FD: Frame -> Dialog diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingFDWTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // FDW: Frame -> Dialog -> Window diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModalTest.java @@ -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; diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsTest.java @@ -21,7 +21,7 @@ * questions. */ -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import java.awt.*; import java.util.List; diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogTest.java @@ -22,7 +22,7 @@ */ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; public class UnblockedDialogTest { diff --git a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java --- a/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java +++ b/test/jdk/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeDialogTest.java @@ -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 { diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ExcludeFrameTest.java @@ -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 { diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java --- a/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java +++ b/test/jdk/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java @@ -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 diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java @@ -31,7 +31,8 @@ * happens: a non-modal dialog (D) having null frame owner is shown; a window having D * as owner is shown; a frame is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // DWF: Dialog -> Window -> Frame public class FocusTransferDWFTest { diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java @@ -32,7 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java @@ -32,7 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java @@ -32,7 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java @@ -32,7 +32,8 @@ * frame owner is shown; a dialog (D2) having D1 owner is shown; a dialog * with a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java @@ -31,7 +31,8 @@ * the following happens: a frame is shown; an application modal dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java @@ -31,7 +31,8 @@ * the following happens: a frame is shown; a document modal dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java @@ -31,7 +31,8 @@ * the following happens: a frame is shown; a modeless dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java @@ -31,7 +31,8 @@ * the following happens: a frame is shown; a non-modal dialog (D) * having a null frame owner is shown; a window having D as owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a hidden dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a null dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having * a null frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a hidden dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a null dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having * a null frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a hidden dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a null dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having * a null frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a hidden dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a hidden frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a null dialog owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java @@ -31,7 +31,8 @@ * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having * a null frame owner is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // FWD: Frame -> Window -> Dialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * an application modal dialog having a frame (F) owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java @@ -32,7 +32,8 @@ * an application modal dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java @@ -32,7 +32,8 @@ * an application modal dialog having F owner is shown; F is shown. * * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * a document modal dialog with a frame (F) owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java @@ -32,7 +32,8 @@ * a document modal dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a frame (F) owner is shown; * a document modal dialog having F owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * a modeless dialog having a frame (F) owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java @@ -32,7 +32,8 @@ * a modeless dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a frame (F) owner is shown; * a modeless dialog having F owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a hidden frame owner is shown; * a non-modal dialog having a frame (F) owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java @@ -32,7 +32,8 @@ * a non-modal dialog having a null dialog owner is shown; * a frame is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java @@ -31,7 +31,8 @@ * the following happens: a window having a frame (F) owner is shown; * a non-modal dialog having F owner is shown; F is shown. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java --- a/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java +++ b/test/jdk/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // WDF: Window -> Dialog -> Frame public class FocusTransferWDFTest { diff --git a/test/jdk/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java b/test/jdk/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java --- a/test/jdk/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java +++ b/test/jdk/java/awt/Modal/ModalitySettingsTest/ModalitySettingsTest.java @@ -22,7 +22,7 @@ */ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; /* * @test @@ -30,7 +30,7 @@ * @bug 8047367 * @summary Check modality settings for Window and Dialog. * - * @library ../../../../lib/testlibrary/ + * @library /test/lib * @run main ModalitySettingsTest */ diff --git a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java --- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java +++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java @@ -29,7 +29,8 @@ * parent has a proper modal blocking behavior. Also show a document modal * dialog and check if it blocks the document properly. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java --- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java +++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java @@ -29,7 +29,8 @@ * parent has a proper modal blocking behavior. Also show a document modal * dialog and check if it blocks the document properly. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java --- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java +++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java @@ -28,7 +28,8 @@ * @summary Check correctness of modal blocking behavior for a chain of Dialogs * having different modality types with a Frame as a document root. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog @@ -38,7 +39,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import java.util.ArrayList; import java.util.List; import java.util.Collections; diff --git a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java --- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java +++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java @@ -29,7 +29,8 @@ * work properly. Also check whether the blocking dialogs are * opening on top of the windows they block. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog @@ -39,7 +40,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; public class MultipleDialogs4Test { diff --git a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java --- a/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java +++ b/test/jdk/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java @@ -28,7 +28,8 @@ * @summary This is a simple check if a chain of dialogs having different * modality types block each other properly. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog @@ -39,7 +40,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; public class MultipleDialogs5Test { diff --git a/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java b/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java --- a/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java +++ b/test/jdk/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java @@ -24,7 +24,7 @@ import java.awt.*; import java.awt.event.KeyEvent; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; /* @@ -34,7 +34,8 @@ * @summary Check whether a Dialog set with null modality type * behaves like a modeless dialog * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal1Test.java @@ -30,7 +30,8 @@ * @summary Check whether an application modal Dialog created with null Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal2Test.java @@ -30,7 +30,8 @@ * @summary Check whether an application modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal3Test.java @@ -30,7 +30,8 @@ * @summary Check whether an application modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal4Test.java @@ -30,7 +30,8 @@ * @summary Check whether an application modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal5Test.java @@ -30,7 +30,8 @@ * @summary Check whether an application modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopAppModal6Test.java @@ -30,7 +30,8 @@ * @summary Check whether an application modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java b/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDDFTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // DDF: Dialog - Dialog - Frame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal1Test.java @@ -30,7 +30,8 @@ * @summary Check whether a document modal Dialog created with null Frame * constructor follows normal Z order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal2Test.java @@ -30,7 +30,8 @@ * @summary Check whether a document modal Dialog created with null Dialog * constructor follows normal Z order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal3Test.java @@ -30,7 +30,8 @@ * @summary Check whether a document modal Dialog created with hidden Frame * constructor follows normal Z order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal4Test.java @@ -30,7 +30,8 @@ * @summary Check whether a document modal Dialog created with hidden Dialog * constructor follows normal Z order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal5Test.java @@ -30,7 +30,8 @@ * @summary Check whether a document modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopDocModal6Test.java @@ -30,7 +30,8 @@ * @summary Check whether a document modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java b/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopFDFTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // FDF: Frame - Dialog - Frame diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal1Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modal Dialog created with null Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal2Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal3Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal4Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal5Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModal6Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modal Dialog created with visible Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless1Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless Dialog created with a * null Frame constructor follows normal Z Order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless2Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless Dialog created with a * null Dialog constructor follows normal Z Order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless3Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless Dialog created with a * hidden Frame constructor follows normal Z Order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless4Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless Dialog created with a * hidden Dialog constructor follows normal Z Order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless5Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless Dialog created with a * visible Frame constructor follows normal Z Order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopModeless6Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless Dialog created with a visible Dialog * constructor follows a normal Z order. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal1Test.java @@ -30,7 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with null Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal2Test.java @@ -30,7 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal3Test.java @@ -30,7 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal4Test.java @@ -30,7 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal5Test.java @@ -30,7 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java --- a/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java +++ b/test/jdk/java/awt/Modal/OnTop/OnTopTKModal6Test.java @@ -30,7 +30,8 @@ * @summary Check whether a toolkit modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal1Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal2Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal3Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal4Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal5Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackAppModal6Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java b/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDDFTest.java @@ -22,7 +22,7 @@ */ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // DDF: Dialog->Dialog->Frame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal1Test.java @@ -30,7 +30,8 @@ * @summary Check if toBack method works correctly for * a document modal dialog with null Frame parent. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal2Test.java @@ -30,7 +30,8 @@ * @summary Check if toBack method works correctly for * a document modal dialog with null Dialog parent. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal3Test.java @@ -30,7 +30,8 @@ * @summary Check if toBack method works correctly for * a document modal dialog with hidden Frame parent. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal4Test.java @@ -30,7 +30,8 @@ * @summary Check if toBack method works correctly for * a document modal dialog with hidden Dialog parent. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal5Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackDocModal6Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java b/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackFDFTest.java @@ -23,7 +23,7 @@ import java.awt.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; // FDF: Frame->Dialog->Frame diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal1Test.java @@ -30,7 +30,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal2Test.java @@ -30,7 +30,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal3Test.java @@ -30,7 +30,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal4Test.java @@ -30,7 +30,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal5Test.java @@ -30,7 +30,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModal6Test.java @@ -30,7 +30,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless1Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless dialog having a null Frame constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless2Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless dialog having a null Dialog constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless3Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless dialog having a hidden Frame constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless4Test.java @@ -30,7 +30,8 @@ * @summary Check whether a modeless dialog having a hidden Dialog constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless5Test.java @@ -30,7 +30,8 @@ * @summary Check if toBack method works correctly for a modeless dialog * having a visible Frame constructor. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackModeless6Test.java @@ -30,7 +30,8 @@ * @summary Check if toBack method works correctly for a modeless dialog * having a visible Dialog constructor. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal1Test.java @@ -29,7 +29,8 @@ * @summary Check whether a non-modal dialog having a null Frame constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal2Test.java @@ -29,7 +29,8 @@ * @summary Check whether a non-modal dialog having a null Dialog constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal3Test.java @@ -29,7 +29,8 @@ * @summary Check whether a non-modal dialog having a hidden Frame constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal4Test.java @@ -29,7 +29,8 @@ * @summary Check whether a non-modal dialog having a hidden Dialog constructor * goes behind other windows when toBack is called for it. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal5Test.java @@ -29,7 +29,8 @@ * @summary Check if toBack method works correctly for a non-modal dialog * having a visible Frame constructor. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackNonModal6Test.java @@ -29,7 +29,8 @@ * @summary Check if toBack method works correctly for a non-modal dialog * having a visible Dialog constructor. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal1Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal2Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal3Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal4Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal5Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java --- a/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java +++ b/test/jdk/java/awt/Modal/ToBack/ToBackTKModal6Test.java @@ -31,7 +31,8 @@ * constructor still stays on top of the blocked windows even * after calling toBack for the dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java @@ -31,7 +31,8 @@ * blocking application modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java @@ -31,7 +31,8 @@ * blocking document modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModalTest.java @@ -29,7 +29,8 @@ * blocking modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java @@ -28,7 +28,8 @@ * @summary Check that calling toFront method does not bring a dialog to the top * of a child modeless dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java @@ -28,7 +28,8 @@ * @summary Check that calling toFront method does not bring a dialog to the top * of a non-modal child dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java b/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java --- a/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java @@ -31,7 +31,8 @@ * blocking toolkit modal dialog does not bring it to the top * of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java @@ -31,7 +31,8 @@ * blocking application modal dialog having a null Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java @@ -31,7 +31,8 @@ * blocking application modal dialog having a null Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java @@ -31,7 +31,8 @@ * blocking application modal dialog having a hidden Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java @@ -31,7 +31,8 @@ * blocking application modal dialog having a hidden Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java @@ -31,7 +31,8 @@ * blocking application modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java @@ -31,7 +31,8 @@ * blocking document modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java @@ -29,7 +29,8 @@ * @bug 8050885 * @summary Check if toFront method works correctly for a document modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal1Test.java @@ -30,7 +30,8 @@ * blocking modal dialog having a null Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal2Test.java @@ -30,7 +30,8 @@ * blocking modal dialog having a null Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal3Test.java @@ -30,7 +30,8 @@ * blocking modal dialog having a hidden Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal4Test.java @@ -30,7 +30,8 @@ * blocking modal dialog having a hidden Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModal5Test.java @@ -30,7 +30,8 @@ * blocking modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java @@ -29,7 +29,8 @@ * @summary Check that calling toFront method does not bring a frame to the top of * a modeless child dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java @@ -29,7 +29,8 @@ * @summary Check that calling toFront method does not bring a frame to the top * of a non-modal child dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java @@ -31,7 +31,8 @@ * blocking modal toolkit dialog having a null Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java @@ -31,7 +31,8 @@ * blocking toolkit modal dialog having a null Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java @@ -31,7 +31,8 @@ * blocking toolkit modal dialog having a hidden Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java @@ -31,7 +31,8 @@ * blocking toolkit modal dialog having a hidden Dialog parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java --- a/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java +++ b/test/jdk/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java @@ -31,7 +31,8 @@ * blocking toolkit modal dialog having a visible Frame parent * does not bring the frame to the top of the modal dialog. * - * @library ../helpers ../../../../lib/testlibrary/ + * @library ../helpers /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @build Flag * @build TestDialog diff --git a/test/jdk/java/awt/Modal/helpers/TestDialog.java b/test/jdk/java/awt/Modal/helpers/TestDialog.java --- a/test/jdk/java/awt/Modal/helpers/TestDialog.java +++ b/test/jdk/java/awt/Modal/helpers/TestDialog.java @@ -25,7 +25,7 @@ import java.awt.*; import java.awt.event.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; diff --git a/test/jdk/java/awt/Modal/helpers/TestFrame.java b/test/jdk/java/awt/Modal/helpers/TestFrame.java --- a/test/jdk/java/awt/Modal/helpers/TestFrame.java +++ b/test/jdk/java/awt/Modal/helpers/TestFrame.java @@ -24,7 +24,7 @@ import java.awt.*; import java.awt.event.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; diff --git a/test/jdk/java/awt/Modal/helpers/TestWindow.java b/test/jdk/java/awt/Modal/helpers/TestWindow.java --- a/test/jdk/java/awt/Modal/helpers/TestWindow.java +++ b/test/jdk/java/awt/Modal/helpers/TestWindow.java @@ -24,7 +24,7 @@ import java.awt.*; import java.awt.event.*; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; diff --git a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java --- a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java +++ b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java @@ -32,7 +32,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import static jdk.testlibrary.Asserts.assertTrue; +import static jdk.test.lib.Asserts.assertTrue; /* * NOTE: this is no intentionally a manual test (i.e. has no test tag) because @@ -53,7 +53,8 @@ * * @summary Make sure that modifier key mask is set when robot press * some key with one or more modifiers. - * @library ../../../../lib/testlibrary/ + * @library /lib/testlibrary/ + * @library /test/lib * @build ExtendedRobot * @key headful * @run main/timeout=600 ModifierRobotEnhancedKeyTest diff --git a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java --- a/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java +++ b/test/jdk/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java @@ -32,8 +32,8 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import static jdk.testlibrary.Asserts.assertNull; -import static jdk.testlibrary.Asserts.assertTrue; +import static jdk.test.lib.Asserts.assertNull; +import static jdk.test.lib.Asserts.assertTrue; /* * @test @@ -41,7 +41,8 @@ * @key headful * @summary Make sure that modifier key mask is set when robot press * some key with one or more modifiers. - * @library ../../../../lib/testlibrary/ + * @library /lib/testlibrary + * @library /test/lib * @build ExtendedRobot * @run main ModifierRobotKeyTest */ diff --git a/test/jdk/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java b/test/jdk/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java --- a/test/jdk/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java +++ b/test/jdk/java/awt/dnd/DragSourceListenerSerializationTest/DragSourceListenerSerializationTest.java @@ -27,8 +27,8 @@ @bug 4422345 8039083 @summary tests serialization of DragSourceListeners @author das@sparc.spb.su area=dnd - @library ../../../../lib/testlibrary - @build jdk.testlibrary.Asserts + @library /test/lib + @build jdk.test.lib.Asserts @run main/othervm DragSourceListenerSerializationTest */ @@ -58,7 +58,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static jdk.testlibrary.Asserts.assertEquals; +import static jdk.test.lib.Asserts.assertEquals; public class DragSourceListenerSerializationTest { public static void main(String[] args) throws Exception { diff --git a/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java b/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java --- a/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java +++ b/test/jdk/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java @@ -32,7 +32,8 @@ * 2. InputEvent.getModifiersExText() returns * correct extended modifier keys description * - * @library ../../../../../lib/testlibrary/ ../../helpers/lwcomponents/ + * @library ../../helpers/lwcomponents/ + * @library /test/lib * @build LWComponent * @build LWButton * @build LWList @@ -54,7 +55,7 @@ import java.awt.event.KeyListener; import java.util.ArrayList; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import test.java.awt.event.helpers.lwcomponents.LWButton; import test.java.awt.event.helpers.lwcomponents.LWList; diff --git a/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java b/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java --- a/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java +++ b/test/jdk/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java @@ -29,7 +29,8 @@ * @summary Check whether KeyEvent.getModifiers() returns correct modifiers * when Ctrl, Alt or Shift keys are pressed. * - * @library ../../../../../lib/testlibrary/ ../../helpers/lwcomponents/ + * @library ../../helpers/lwcomponents/ + * @library /test/lib * @build LWComponent * @build LWButton * @build LWList @@ -46,7 +47,7 @@ import java.util.ArrayList; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import test.java.awt.event.helpers.lwcomponents.LWButton; import test.java.awt.event.helpers.lwcomponents.LWList; diff --git a/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java b/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java --- a/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java @@ -31,7 +31,7 @@ import java.awt.event.MouseListener; import java.util.ArrayList; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import test.java.awt.event.helpers.lwcomponents.LWButton; @@ -46,7 +46,8 @@ * and KeyEvent.getModifiers() return correct modifiers when pressing * keys Ctrl, Alt, Shift, Meta and mouse buttons sequentially * - * @library ../../../../../lib/testlibrary/ ../../helpers/lwcomponents/ + * @library ../../helpers/lwcomponents/ + * @library /test/lib * @build LWComponent * @build LWButton * @build LWList diff --git a/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java b/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java --- a/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java @@ -34,7 +34,7 @@ import java.util.ArrayList; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; /* * @test @@ -44,7 +44,8 @@ * number when the mouse buttons are pressed and getModifiers() * returns correct modifiers * - * @library ../../../../../lib/testlibrary/ ../../helpers/lwcomponents/ + * @library ../../helpers/lwcomponents/ + * @library /test/lib * @build LWComponent * @build LWButton * @build LWList diff --git a/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java b/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java --- a/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java +++ b/test/jdk/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java @@ -28,7 +28,7 @@ import test.java.awt.event.helpers.lwcomponents.LWButton; import test.java.awt.event.helpers.lwcomponents.LWList; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; /* * @test @@ -37,7 +37,8 @@ * @summary Check whether correct modifiers set when multiple mouse buttons were pressed; * check number of received events. * - * @library ../../../../../lib/testlibrary/ ../../helpers/lwcomponents/ + * @library ../../helpers/lwcomponents/ + * @library /test/lib * @build LWComponent * @build LWButton * @build LWList diff --git a/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java b/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java --- a/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java +++ b/test/jdk/java/lang/annotation/repeatingAnnotations/CustomRepeatingWithSecurityManager.java @@ -26,8 +26,8 @@ * @bug 8073056 * @summary Repeating annotations throws java.security.AccessControlException with a SecurityManager * - * @library /lib/testlibrary - * @build jdk.testlibrary.Asserts + * @library /test/lib + * @build jdk.test.lib.Asserts * @run main CustomRepeatingWithSecurityManager * @run main/othervm CustomRepeatingWithSecurityManager "withSM" */ @@ -35,7 +35,7 @@ import java.lang.annotation.*; import java.lang.reflect.*; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; public class CustomRepeatingWithSecurityManager { public static void main(String[] args) throws Exception { diff --git a/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java b/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java --- a/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java +++ b/test/jdk/java/lang/annotation/repeatingAnnotations/RepeatingWithSecurityManager.java @@ -26,8 +26,8 @@ * @bug 8073056 * @summary Repeating annotations throws java.security.AccessControlException with a SecurityManager * - * @library /lib/testlibrary - * @build jdk.testlibrary.Asserts + * @library /test/lib + * @build jdk.test.lib.Asserts * @run main RepeatingWithSecurityManager * @run main/othervm RepeatingWithSecurityManager "withSM" */ @@ -35,7 +35,7 @@ import java.lang.annotation.*; import java.util.*; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; public class RepeatingWithSecurityManager { public static void main(String[] args) throws Exception { diff --git a/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java b/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java --- a/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java +++ b/test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedOwnerType.java @@ -26,15 +26,15 @@ * @bug 8058595 * @summary Test that AnnotatedType.getAnnotatedOwnerType() works as expected * - * @library /lib/testlibrary - * @build jdk.testlibrary.Asserts + * @library /test/lib + * @build jdk.test.lib.Asserts * @run main GetAnnotatedOwnerType */ import java.lang.annotation.*; import java.lang.reflect.*; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; public class GetAnnotatedOwnerType { public @TA("generic") GetAnnotatedOwnerType . @TB("generic") Nested genericField; diff --git a/test/jdk/java/lang/invoke/ExplicitCastArgumentsTest.java b/test/jdk/java/lang/invoke/ExplicitCastArgumentsTest.java --- a/test/jdk/java/lang/invoke/ExplicitCastArgumentsTest.java +++ b/test/jdk/java/lang/invoke/ExplicitCastArgumentsTest.java @@ -38,7 +38,7 @@ * @test * @bug 8060483 8066746 * @key randomness - * @library /lib/testlibrary /java/lang/invoke/common + * @library /test/lib /java/lang/invoke/common * @modules java.base/sun.invoke.util * @summary unit tests for MethodHandles.explicitCastArguments() * @run main ExplicitCastArgumentsTest diff --git a/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java b/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java --- a/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java +++ b/test/jdk/java/lang/invoke/MethodHandles/CatchExceptionTest.java @@ -24,7 +24,7 @@ package test.java.lang.invoke.MethodHandles; import jdk.test.lib.TimeLimitedRunner; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import jdk.test.lib.Utils; import test.java.lang.invoke.lib.CodeCacheOverflowProcessor; import test.java.lang.invoke.lib.Helper; @@ -43,7 +43,7 @@ import java.util.function.Supplier; /* @test - * @library /lib/testlibrary /java/lang/invoke/common /test/lib + * @library /java/lang/invoke/common /test/lib * @build jdk.test.lib.TimeLimitedRunner * @compile CatchExceptionTest.java * @run main/othervm -esa test.java.lang.invoke.MethodHandles.CatchExceptionTest diff --git a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java --- a/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java +++ b/test/jdk/java/lang/invoke/common/test/java/lang/invoke/lib/Helper.java @@ -23,7 +23,7 @@ package test.java.lang.invoke.lib; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/test/jdk/java/security/SecureRandom/GetInstanceTest.java b/test/jdk/java/security/SecureRandom/GetInstanceTest.java --- a/test/jdk/java/security/SecureRandom/GetInstanceTest.java +++ b/test/jdk/java/security/SecureRandom/GetInstanceTest.java @@ -24,7 +24,7 @@ /* * @test * @bug 8141039 - * @library /lib/testlibrary + * @library /test/lib * @summary SecureRandom supports multiple getInstance method including * getInstanceStrong() method. This test verifies a set of possible * cases for getInstance with different SecureRandom mechanism @@ -39,7 +39,7 @@ import static java.security.DrbgParameters.Capability.*; import java.security.Security; import java.util.Arrays; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; public class GetInstanceTest { diff --git a/test/jdk/java/security/SecureRandom/SerializedSeedTest.java b/test/jdk/java/security/SecureRandom/SerializedSeedTest.java --- a/test/jdk/java/security/SecureRandom/SerializedSeedTest.java +++ b/test/jdk/java/security/SecureRandom/SerializedSeedTest.java @@ -24,7 +24,7 @@ /* * @test * @bug 8141039 - * @library /lib/testlibrary + * @library /test/lib * @summary When random number is generated through the a SecureRandom instance * as well from it's serialized instance in the same time then the * generated random numbers should be different when one or both are @@ -39,7 +39,7 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.Security; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; public class SerializedSeedTest { diff --git a/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java b/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java --- a/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java +++ b/test/jdk/java/util/logging/TestLoggerWeakRefLeak.java @@ -25,7 +25,7 @@ import java.io.InputStream; import java.io.InputStreamReader; -import static jdk.testlibrary.Asserts.assertGreaterThan; +import static jdk.test.lib.Asserts.assertGreaterThan; import jdk.test.lib.process.ProcessTools; import com.sun.tools.attach.AttachNotSupportedException; @@ -37,7 +37,6 @@ * @test * @bug 6942989 * @summary Check for WeakReference leak in Logger and anonymous Logger objects - * @library /lib/testlibrary * @library /test/lib * @modules jdk.attach/sun.tools.attach * java.logging diff --git a/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java b/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java --- a/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java +++ b/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java @@ -27,7 +27,7 @@ * @summary Tests new public methods at ConstantPool * @modules java.base/jdk.internal.misc * java.base/jdk.internal.reflect - * @library /lib/testlibrary + * @library /test/lib * @compile ConstantPoolTestDummy.jasm * @run main jdk.internal.reflect.constantPool.ConstantPoolTest */ @@ -37,7 +37,7 @@ import java.util.HashMap; import java.util.Map; import jdk.internal.misc.SharedSecrets; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import jdk.internal.reflect.ConstantPool; public class ConstantPoolTest { diff --git a/test/jdk/lib/testlibrary/AssertsTest.java b/test/jdk/lib/testlibrary/AssertsTest.java --- a/test/jdk/lib/testlibrary/AssertsTest.java +++ b/test/jdk/lib/testlibrary/AssertsTest.java @@ -23,7 +23,7 @@ import java.lang.SuppressWarnings; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; /* @test * @summary Tests the different assertions in the Assert class diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java b/test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java deleted file mode 100644 --- a/test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java +++ /dev/null @@ -1,566 +0,0 @@ -/* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package jdk.testlibrary; - -import java.util.Objects; - -/** - * Asserts that can be used for verifying assumptions in tests. - * - * An assertion will throw a {@link RuntimeException} if the assertion isn't true. - * All the asserts can be imported into a test by using a static import: - * - * 
- * {@code
- * import static jdk.testlibrary.Asserts.*;
- * }
- *
- * Always provide a message describing the assumption if the line number of the
- * failing assertion isn't enough to understand why the assumption failed. For
- * example, if the assertion is in a loop or in a method that is called
- * multiple times, then the line number won't provide enough context to
- * understand the failure.
- *
- * - * @deprecated This class is deprecated. Use the one from - * {@code /test/lib/jdk/test/lib} - */ -@Deprecated -public class Asserts { - - /** - * Shorthand for {@link #assertLessThan(Comparable, Comparable)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertLessThan(Comparable, Comparable) - */ - public static > void assertLT(T lhs, T rhs) { - assertLessThan(lhs, rhs); - } - - /** - * Shorthand for {@link #assertLessThan(Comparable, Comparable, String)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @see #assertLessThan(Comparable, Comparable, String) - */ - public static > void assertLT(T lhs, T rhs, String msg) { - assertLessThan(lhs, rhs, msg); - } - - /** - * Calls {@link #assertLessThan(Comparable, Comparable, String)} with a default message. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertLessThan(Comparable, Comparable, String) - */ - public static > void assertLessThan(T lhs, T rhs) { - assertLessThan(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is less than {@code rhs}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static >void assertLessThan(T lhs, T rhs, String msg) { - if (!(compare(lhs, rhs, msg) < 0)) { - msg = Objects.toString(msg, "assertLessThan") - + ": expected that " + Objects.toString(lhs) - + " < " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Shorthand for {@link #assertLessThanOrEqual(Comparable, Comparable)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertLessThanOrEqual(Comparable, Comparable) - */ - public static > void assertLTE(T lhs, T rhs) { - assertLessThanOrEqual(lhs, rhs); - } - - /** - * Shorthand for {@link #assertLessThanOrEqual(Comparable, Comparable, String)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @see #assertLessThanOrEqual(Comparable, Comparable, String) - */ - public static > void assertLTE(T lhs, T rhs, String msg) { - assertLessThanOrEqual(lhs, rhs, msg); - } - - /** - * Calls {@link #assertLessThanOrEqual(Comparable, Comparable, String)} with a default message. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertLessThanOrEqual(Comparable, Comparable, String) - */ - public static > void assertLessThanOrEqual(T lhs, T rhs) { - assertLessThanOrEqual(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is less than or equal to {@code rhs}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static > void assertLessThanOrEqual(T lhs, T rhs, String msg) { - if (!(compare(lhs, rhs, msg) <= 0)) { - msg = Objects.toString(msg, "assertLessThanOrEqual") - + ": expected that " + Objects.toString(lhs) - + " <= " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Shorthand for {@link #assertEquals(Object, Object)}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertEquals(Object, Object) - */ - public static void assertEQ(Object lhs, Object rhs) { - assertEquals(lhs, rhs); - } - - /** - * Shorthand for {@link #assertEquals(Object, Object, String)}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @see #assertEquals(Object, Object, String) - */ - public static void assertEQ(Object lhs, Object rhs, String msg) { - assertEquals(lhs, rhs, msg); - } - - /** - * Calls {@link #assertEquals(java.lang.Object, java.lang.Object, java.lang.String)} with a default message. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertEquals(Object, Object, String) - */ - public static void assertEquals(Object lhs, Object rhs) { - assertEquals(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is equal to {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertEquals(Object lhs, Object rhs, String msg) { - if ((lhs != rhs) && ((lhs == null) || !(lhs.equals(rhs)))) { - msg = Objects.toString(msg, "assertEquals") - + ": expected " + Objects.toString(lhs) - + " to equal " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Calls {@link #assertSame(java.lang.Object, java.lang.Object, java.lang.String)} with a default message. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertSame(Object, Object, String) - */ - public static void assertSame(Object lhs, Object rhs) { - assertSame(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is the same as {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertSame(Object lhs, Object rhs, String msg) { - if (lhs != rhs) { - msg = Objects.toString(msg, "assertSame") - + ": expected " + Objects.toString(lhs) - + " to equal " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Shorthand for {@link #assertGreaterThanOrEqual(Comparable, Comparable)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertGreaterThanOrEqual(Comparable, Comparable) - */ - public static > void assertGTE(T lhs, T rhs) { - assertGreaterThanOrEqual(lhs, rhs); - } - - /** - * Shorthand for {@link #assertGreaterThanOrEqual(Comparable, Comparable, String)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @see #assertGreaterThanOrEqual(Comparable, Comparable, String) - */ - public static > void assertGTE(T lhs, T rhs, String msg) { - assertGreaterThanOrEqual(lhs, rhs, msg); - } - - /** - * Calls {@link #assertGreaterThanOrEqual(Comparable, Comparable, String)} with a default message. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertGreaterThanOrEqual(Comparable, Comparable, String) - */ - public static > void assertGreaterThanOrEqual(T lhs, T rhs) { - assertGreaterThanOrEqual(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is greater than or equal to {@code rhs}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static > void assertGreaterThanOrEqual(T lhs, T rhs, String msg) { - if (!(compare(lhs, rhs, msg) >= 0)) { - msg = Objects.toString(msg, "assertGreaterThanOrEqual") - + ": expected " + Objects.toString(lhs) - + " >= " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Shorthand for {@link #assertGreaterThan(Comparable, Comparable)}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertGreaterThan(Comparable, Comparable) - */ - public static > void assertGT(T lhs, T rhs) { - assertGreaterThan(lhs, rhs); - } - - /** - * Shorthand for {@link #assertGreaterThan(Comparable, Comparable, String)}. - * - * @param a type - * @param lhs the left hand value - * @param rhs the right hand value - * @param msg A description of the assumption; {@code null} for a default message. - * @see #assertGreaterThan(Comparable, Comparable, String) - */ - public static > void assertGT(T lhs, T rhs, String msg) { - assertGreaterThan(lhs, rhs, msg); - } - - /** - * Calls {@link #assertGreaterThan(Comparable, Comparable, String)} with a default message. - * - * @param a type - * @param lhs the left hand value - * @param rhs the right hand value - * @see #assertGreaterThan(Comparable, Comparable, String) - */ - public static > void assertGreaterThan(T lhs, T rhs) { - assertGreaterThan(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is greater than {@code rhs}. - * - * @param a type - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static > void assertGreaterThan(T lhs, T rhs, String msg) { - if (!(compare(lhs, rhs, msg) > 0)) { - msg = Objects.toString(msg, "assertGreaterThan") - + ": expected " + Objects.toString(lhs) - + " > " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Shorthand for {@link #assertNotEquals(Object, Object)}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertNotEquals(Object, Object) - */ - public static void assertNE(Object lhs, Object rhs) { - assertNotEquals(lhs, rhs); - } - - /** - * Shorthand for {@link #assertNotEquals(Object, Object, String)}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @see #assertNotEquals(Object, Object, String) - */ - public static void assertNE(Object lhs, Object rhs, String msg) { - assertNotEquals(lhs, rhs, msg); - } - - /** - * Calls {@link #assertNotEquals(Object, Object, String)} with a default message. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @see #assertNotEquals(Object, Object, String) - */ - public static void assertNotEquals(Object lhs, Object rhs) { - assertNotEquals(lhs, rhs, null); - } - - /** - * Asserts that {@code lhs} is not equal to {@code rhs}. - * - * @param lhs The left hand side of the comparison. - * @param rhs The right hand side of the comparison. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertNotEquals(Object lhs, Object rhs, String msg) { - if ((lhs == rhs) || (lhs != null && lhs.equals(rhs))) { - msg = Objects.toString(msg, "assertNotEquals") - + ": expected " + Objects.toString(lhs) - + " to not equal " + Objects.toString(rhs); - fail(msg); - } - } - - /** - * Calls {@link #assertNull(Object, String)} with a default message. - * - * @param o The reference assumed to be null. - * @see #assertNull(Object, String) - */ - public static void assertNull(Object o) { - assertNull(o, null); - } - - /** - * Asserts that {@code o} is null. - * - * @param o The reference assumed to be null. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertNull(Object o, String msg) { - assertEquals(o, null, msg); - } - - /** - * Calls {@link #assertNotNull(Object, String)} with a default message. - * - * @param o The reference assumed not to be null, - * @see #assertNotNull(Object, String) - */ - public static void assertNotNull(Object o) { - assertNotNull(o, null); - } - - /** - * Asserts that {@code o} is not null. - * - * @param o The reference assumed not to be null, - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertNotNull(Object o, String msg) { - assertNotEquals(o, null, msg); - } - - /** - * Calls {@link #assertFalse(boolean, String)} with a default message. - * - * @param value The value assumed to be false. - * @see #assertFalse(boolean, String) - */ - public static void assertFalse(boolean value) { - assertFalse(value, null); - } - - /** - * Asserts that {@code value} is {@code false}. - * - * @param value The value assumed to be false. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertFalse(boolean value, String msg) { - if (value) { - msg = Objects.toString(msg, "assertFalse") - + ": expected false, was true"; - fail(msg); - } - } - - /** - * Calls {@link #assertTrue(boolean, String)} with a default message. - * - * @param value The value assumed to be true. - * @see #assertTrue(boolean, String) - */ - public static void assertTrue(boolean value) { - assertTrue(value, null); - } - - /** - * Asserts that {@code value} is {@code true}. - * - * @param value The value assumed to be true. - * @param msg A description of the assumption; {@code null} for a default message. - * @throws RuntimeException if the assertion is not true. - */ - public static void assertTrue(boolean value, String msg) { - if (!value) { - msg = Objects.toString(msg, "assertTrue") - + ": expected true, was false"; - fail(msg); - } - } - - private static > int compare(T lhs, T rhs, String msg) { - if (lhs == null || rhs == null) { - fail(lhs, rhs, msg + ": values must be non-null:", ","); - } - return lhs.compareTo(rhs); - } - - /** - * Returns a string formatted with a message and expected and actual values. - * @param lhs the actual value - * @param rhs the expected value - * @param message the actual value - * @param relation the asserted relationship between lhs and rhs - * @return a formatted string - */ - public static String format(Object lhs, Object rhs, String message, String relation) { - StringBuilder sb = new StringBuilder(80); - if (message != null) { - sb.append(message); - sb.append(' '); - } - sb.append("<"); - sb.append(Objects.toString(lhs)); - sb.append("> "); - sb.append(Objects.toString(relation, ",")); - sb.append(" <"); - sb.append(Objects.toString(rhs)); - sb.append(">"); - return sb.toString(); - } - - /** - * Fail reports a failure with message fail. - * - * @throws RuntimeException always - */ - public static void fail() { - fail("fail"); - } - - /** - * Fail reports a failure with a message. - * @param message for the failure - * @throws RuntimeException always - */ - public static void fail(String message) { - throw new RuntimeException(message); - } - - /** - * Fail reports a failure with a formatted message. - * - * @param lhs the actual value - * @param rhs the expected value - * @param message to be format before the expected and actual values - * @param relation the asserted relationship between lhs and rhs - * @throws RuntimeException always - */ - public static void fail(Object lhs, Object rhs, String message, String relation) { - throw new RuntimeException(format(lhs, rhs, message, relation)); - } - - /** - * Fail reports a failure with a message and a cause. - * @param message to be format before the expected and actual values - * @param cause the exception that caused this failure - * @throws RuntimeException always - */ - public static void fail(String message, Throwable cause) { - throw new RuntimeException(message, cause); - } - -} diff --git a/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java b/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java --- a/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java +++ b/test/jdk/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import jdk.test.lib.Utils; import jdk.test.lib.apps.LingeredApp; import sun.jvmstat.monitor.MonitorException; @@ -41,10 +41,8 @@ * @bug 6672135 * @summary setInterval() for local MonitoredHost and local MonitoredVm * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* * @build jdk.test.lib.apps.* * @run main TestPollingInterval */ diff --git a/test/jdk/sun/management/jdp/JdpDefaultsTest.java b/test/jdk/sun/management/jdp/JdpDefaultsTest.java --- a/test/jdk/sun/management/jdp/JdpDefaultsTest.java +++ b/test/jdk/sun/management/jdp/JdpDefaultsTest.java @@ -31,10 +31,9 @@ * @test JdpDefaultsTest * @summary Assert that we can read JDP packets from a multicast socket connection, on default IP and port. * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher + * @build ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main/othervm JdpDefaultsTest */ diff --git a/test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java b/test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java --- a/test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java +++ b/test/jdk/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java @@ -27,10 +27,9 @@ * @summary Verify a non-zero value is assigned to jmxremote.port * when VM is started with jmxremote.port=0. * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpJmxRemoteDynamicPortTestCase DynamicLauncher + * @build ClientConnection JdpTestUtil JdpTestCase JdpJmxRemoteDynamicPortTestCase DynamicLauncher * @run main/othervm JdpJmxRemoteDynamicPortTest */ diff --git a/test/jdk/sun/management/jdp/JdpOffTest.java b/test/jdk/sun/management/jdp/JdpOffTest.java --- a/test/jdk/sun/management/jdp/JdpOffTest.java +++ b/test/jdk/sun/management/jdp/JdpOffTest.java @@ -32,10 +32,9 @@ * @test JdpOffTest.java * @summary Assert that no JDP packets are sent to the default address and port. * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher + * @build ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher * @run main/othervm JdpOffTest */ diff --git a/test/jdk/sun/management/jdp/JdpOnTestCase.java b/test/jdk/sun/management/jdp/JdpOnTestCase.java --- a/test/jdk/sun/management/jdp/JdpOnTestCase.java +++ b/test/jdk/sun/management/jdp/JdpOnTestCase.java @@ -31,7 +31,7 @@ import java.net.SocketTimeoutException; import java.util.Map; -import static jdk.testlibrary.Asserts.assertNotEquals; +import static jdk.test.lib.Asserts.assertNotEquals; public class JdpOnTestCase extends JdpTestCase { diff --git a/test/jdk/sun/management/jdp/JdpSpecificAddressTest.java b/test/jdk/sun/management/jdp/JdpSpecificAddressTest.java --- a/test/jdk/sun/management/jdp/JdpSpecificAddressTest.java +++ b/test/jdk/sun/management/jdp/JdpSpecificAddressTest.java @@ -31,10 +31,9 @@ * @test JdpSpecificAddressTest * @summary Assert that we can read JDP packets from a multicast socket connection, on specific IP and port. * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher + * @build ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main/othervm JdpSpecificAddressTest */ diff --git a/test/jdk/sun/management/jdp/JdpTestUtilTest.java b/test/jdk/sun/management/jdp/JdpTestUtilTest.java --- a/test/jdk/sun/management/jdp/JdpTestUtilTest.java +++ b/test/jdk/sun/management/jdp/JdpTestUtilTest.java @@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingException; import java.util.Map; -import static jdk.testlibrary.Asserts.assertEquals; +import static jdk.test.lib.Asserts.assertEquals; /* diff --git a/test/jdk/sun/security/provider/MessageDigest/SHA512.java b/test/jdk/sun/security/provider/MessageDigest/SHA512.java --- a/test/jdk/sun/security/provider/MessageDigest/SHA512.java +++ b/test/jdk/sun/security/provider/MessageDigest/SHA512.java @@ -21,7 +21,7 @@ * questions. */ -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import java.security.MessageDigest; import java.util.Arrays; @@ -29,7 +29,7 @@ /** * @test * @bug 8051408 - * @library /lib/testlibrary + * @library /test/lib * @summary testing SHA-512/224 and SHA-512/256. */ public class SHA512 { diff --git a/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java --- a/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java +++ b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java @@ -21,7 +21,7 @@ * questions. */ -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import java.io.IOException; import java.nio.file.Files; @@ -38,10 +38,8 @@ * @summary Unit test for jcmd utility. Tests jcmd options which do not send * requests to a specific JVM process. * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* * @run main TestJcmdDefaults */ public class TestJcmdDefaults { diff --git a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java --- a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java +++ b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java @@ -21,7 +21,7 @@ * questions. */ -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import java.io.File; import java.io.IOException; @@ -40,10 +40,8 @@ * @summary Unit test for jcmd utility. The test will send different diagnostic * command requests to the current java process. * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* * @run main/othervm -XX:+UsePerfData TestJcmdSanity */ public class TestJcmdSanity { diff --git a/test/jdk/sun/tools/jhsdb/HeapDumpTest.java b/test/jdk/sun/tools/jhsdb/HeapDumpTest.java --- a/test/jdk/sun/tools/jhsdb/HeapDumpTest.java +++ b/test/jdk/sun/tools/jhsdb/HeapDumpTest.java @@ -27,12 +27,11 @@ * @summary Test hashing of extended characters in Serviceability Agent. * @requires vm.hasSAandCanAttach * @library /test/lib - * @library /lib/testlibrary * @compile -encoding utf8 HeapDumpTest.java * @run main/timeout=240 HeapDumpTest */ -import static jdk.testlibrary.Asserts.assertTrue; +import static jdk.test.lib.Asserts.assertTrue; import java.io.IOException; import java.io.File; diff --git a/test/jdk/sun/tools/jmap/BasicJMapTest.java b/test/jdk/sun/tools/jmap/BasicJMapTest.java --- a/test/jdk/sun/tools/jmap/BasicJMapTest.java +++ b/test/jdk/sun/tools/jmap/BasicJMapTest.java @@ -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.util.Arrays; @@ -36,9 +36,7 @@ * @test * @summary Unit test for jmap utility * @key intermittent - * @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.* diff --git a/test/jdk/sun/tools/jps/JpsHelper.java b/test/jdk/sun/tools/jps/JpsHelper.java --- a/test/jdk/sun/tools/jps/JpsHelper.java +++ b/test/jdk/sun/tools/jps/JpsHelper.java @@ -21,8 +21,8 @@ * questions. */ -import static jdk.testlibrary.Asserts.assertGreaterThan; -import static jdk.testlibrary.Asserts.assertTrue; +import static jdk.test.lib.Asserts.assertGreaterThan; +import static jdk.test.lib.Asserts.assertTrue; import java.io.BufferedWriter; import java.io.File; @@ -38,7 +38,7 @@ import jdk.test.lib.JDKToolLauncher; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import jdk.test.lib.Utils; /** diff --git a/test/jdk/sun/tools/jps/TestJps.java b/test/jdk/sun/tools/jps/TestJps.java --- a/test/jdk/sun/tools/jps/TestJps.java +++ b/test/jdk/sun/tools/jps/TestJps.java @@ -23,7 +23,7 @@ /* * @test - * @library /lib/testlibrary /test/lib + * @library /test/lib * @modules jdk.jartool/sun.tools.jar * @build LingeredAppForJps * @build LingeredApp diff --git a/test/jdk/sun/tools/jps/TestJpsSanity.java b/test/jdk/sun/tools/jps/TestJpsSanity.java --- a/test/jdk/sun/tools/jps/TestJpsSanity.java +++ b/test/jdk/sun/tools/jps/TestJpsSanity.java @@ -21,7 +21,7 @@ * questions. */ -import jdk.testlibrary.Asserts; +import jdk.test.lib.Asserts; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.apps.LingeredApp; @@ -29,11 +29,11 @@ * @test * @summary This test verifies jps usage and checks that appropriate error message is shown * when running jps with illegal arguments. - * @library /lib/testlibrary /test/lib + * @library /test/lib * @modules jdk.jartool/sun.tools.jar * java.management * java.base/jdk.internal.misc - * @build jdk.testlibrary.* jdk.test.lib.apps.* JpsHelper + * @build jdk.test.lib.apps.* JpsHelper * @run driver TestJpsSanity */ public class TestJpsSanity { diff --git a/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java b/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java --- a/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java +++ b/test/jdk/sun/tools/jstatd/JstatGCUtilParser.java @@ -22,10 +22,10 @@ */ import java.util.Arrays; +import java.text.NumberFormat; +import static jdk.test.lib.Asserts.*; import jdk.test.lib.Utils; -import static jdk.testlibrary.Asserts.*; -import java.text.NumberFormat; /** * The helper class for parsing following output from command 'jstat -gcutil': diff --git a/test/jdk/sun/tools/jstatd/JstatdTest.java b/test/jdk/sun/tools/jstatd/JstatdTest.java --- a/test/jdk/sun/tools/jstatd/JstatdTest.java +++ b/test/jdk/sun/tools/jstatd/JstatdTest.java @@ -28,12 +28,12 @@ import java.rmi.registry.Registry; import java.util.Arrays; -import jdk.test.lib.thread.ProcessThread; -import static jdk.testlibrary.Asserts.*; +import static jdk.test.lib.Asserts.*; import jdk.test.lib.Utils; import jdk.test.lib.JDKToolLauncher; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; +import jdk.test.lib.thread.ProcessThread; /** * The base class for tests of jstatd. diff --git a/test/jdk/sun/tools/jstatd/TestJstatdDefaults.java b/test/jdk/sun/tools/jstatd/TestJstatdDefaults.java --- a/test/jdk/sun/tools/jstatd/TestJstatdDefaults.java +++ b/test/jdk/sun/tools/jstatd/TestJstatdDefaults.java @@ -26,10 +26,9 @@ * @bug 4990825 * @key intermittent * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser + * @build JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdDefaults */ public class TestJstatdDefaults { diff --git a/test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java b/test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java --- a/test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java +++ b/test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java @@ -26,10 +26,9 @@ * @bug 4990825 7092186 * @key intermittent * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser + * @build JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdExternalRegistry */ public class TestJstatdExternalRegistry { diff --git a/test/jdk/sun/tools/jstatd/TestJstatdPort.java b/test/jdk/sun/tools/jstatd/TestJstatdPort.java --- a/test/jdk/sun/tools/jstatd/TestJstatdPort.java +++ b/test/jdk/sun/tools/jstatd/TestJstatdPort.java @@ -26,10 +26,9 @@ * @bug 4990825 * @key intermittent * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser + * @build JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPort */ public class TestJstatdPort { diff --git a/test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java b/test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java --- a/test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java +++ b/test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java @@ -26,10 +26,9 @@ * @bug 4990825 * @key intermittent * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser + * @build JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPortAndServer */ public class TestJstatdPortAndServer { diff --git a/test/jdk/sun/tools/jstatd/TestJstatdServer.java b/test/jdk/sun/tools/jstatd/TestJstatdServer.java --- a/test/jdk/sun/tools/jstatd/TestJstatdServer.java +++ b/test/jdk/sun/tools/jstatd/TestJstatdServer.java @@ -26,10 +26,9 @@ * @bug 4990825 * @key intermittent * - * @library /lib/testlibrary * @library /test/lib * - * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser + * @build JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdServer */ public class TestJstatdServer { diff --git a/test/lib/jdk/test/lib/Asserts.java b/test/lib/jdk/test/lib/Asserts.java --- a/test/lib/jdk/test/lib/Asserts.java +++ b/test/lib/jdk/test/lib/Asserts.java @@ -33,7 +33,7 @@ * * 
  * {@code
- * import static jdk.testlibrary.Asserts.*;
+ * import static jdk.test.lib.Asserts.*;
  * }
  *
  * Always provide a message describing the assumption if the line number of the