From bb50695ff999bfe9b7fd0534bce9e07b69c67e59 Mon Sep 17 00:00:00 2001 From: Hamlin Li Date: Wed, 28 Nov 2018 15:34:43 +0800 Subject: [PATCH] 8211975: move testlibrary/jdk/testlibrary/OptimalCapacity.java to top-level library Reviewed-by: igerasim --- .../java/lang/Character/UnicodeBlock/OptimalMapSize.java | 6 +++--- .../java/lang/Enum/ConstantDirectoryOptimalCapacity.java | 6 +++--- .../lang/invoke/VarHandle/AccessMode/OptimalMapSize.java | 6 +++--- .../jdk/test/lib/util}/OptimalCapacity.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename test/{jdk/lib/testlibrary/jdk/testlibrary => lib/jdk/test/lib/util}/OptimalCapacity.java (99%) diff --git a/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java b/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java index abff5a4ebbc..fcfe51ff0ce 100644 --- a/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java +++ b/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java @@ -25,14 +25,14 @@ * @test * @bug 8080535 8191410 * @summary Expected size of Character.UnicodeBlock.map is not optimal - * @library /lib/testlibrary + * @library /test/lib * @modules java.base/java.lang:open * java.base/java.util:open - * @build jdk.testlibrary.OptimalCapacity + * @build jdk.test.lib.util.OptimalCapacity * @run main OptimalMapSize */ -import jdk.testlibrary.OptimalCapacity; +import jdk.test.lib.util.OptimalCapacity; // What will be the number of the Unicode blocks in the future. // diff --git a/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java b/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java index a7072046ac7..63f020c0aa9 100644 --- a/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java +++ b/test/jdk/java/lang/Enum/ConstantDirectoryOptimalCapacity.java @@ -25,14 +25,14 @@ * @test * @bug 8200696 * @summary Initial capacity of Class.enumConstantDirectory is not optimal - * @library /lib/testlibrary + * @library /test/lib * @modules java.base/java.lang:open * java.base/java.util:open - * @build jdk.testlibrary.OptimalCapacity + * @build jdk.test.lib.util.OptimalCapacity * @run main ConstantDirectoryOptimalCapacity */ -import jdk.testlibrary.OptimalCapacity; +import jdk.test.lib.util.OptimalCapacity; public class ConstantDirectoryOptimalCapacity { diff --git a/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java b/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java index dfcfd2cd37b..6b12203c8cb 100644 --- a/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java +++ b/test/jdk/java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java @@ -25,15 +25,15 @@ * @test * @bug 8200788 * @summary Optimal initial capacity of AccessMode.methodNameToAccessMode - * @library /lib/testlibrary + * @library /test/lib * @modules java.base/java.lang.invoke:open * java.base/java.util:open - * @build jdk.testlibrary.OptimalCapacity + * @build jdk.test.lib.util.OptimalCapacity * @run main OptimalMapSize */ import java.lang.invoke.VarHandle.AccessMode; -import jdk.testlibrary.OptimalCapacity; +import jdk.test.lib.util.OptimalCapacity; public class OptimalMapSize { public static void main(String[] args) throws Throwable { diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java b/test/lib/jdk/test/lib/util/OptimalCapacity.java similarity index 99% rename from test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java rename to test/lib/jdk/test/lib/util/OptimalCapacity.java index ab74cc26dda..e0f4bb0091e 100644 --- a/test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java +++ b/test/lib/jdk/test/lib/util/OptimalCapacity.java @@ -21,7 +21,7 @@ * questions. */ -package jdk.testlibrary; +package jdk.test.lib.util; import java.lang.reflect.Field; import java.util.ArrayList;