From 8a87b49f40c12a74cf3449c8fc3be16d36c94d9d Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Wed, 5 Feb 2025 18:15:39 -0500 Subject: [PATCH] Move shared junit tests from "junit" to "junit/share" folder in preparation for adding platform-specific junit tests --- test/jdk/tools/jpackage/junit/TEST.properties | 9 +++++++-- .../jdk/jpackage/internal/AppImageFileTest.java | 0 .../jdk/jpackage/internal/ApplicationLayoutTest.java | 0 .../jdk/jpackage/internal/DeployParamsTest.java | 0 .../jdk/jpackage/internal/DottedVersionTest.java | 0 .../jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java | 0 .../jdk/jpackage/internal/OverridableResourceTest.java | 0 .../jdk/jpackage/internal/PathGroupTest.java | 0 .../jdk/jpackage/internal/PlatformVersionTest.java | 0 .../jdk/jpackage/internal/ToolValidatorTest.java | 0 10 files changed, 7 insertions(+), 2 deletions(-) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java (100%) rename test/jdk/tools/jpackage/junit/{ => share}/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java (100%) diff --git a/test/jdk/tools/jpackage/junit/TEST.properties b/test/jdk/tools/jpackage/junit/TEST.properties index 12c38c2f5a5a1..931ff3c2d9ad4 100644 --- a/test/jdk/tools/jpackage/junit/TEST.properties +++ b/test/jdk/tools/jpackage/junit/TEST.properties @@ -1,2 +1,7 @@ -JUnit.dirs = . -modules = jdk.jpackage +JUnit.dirs = share + +modules=jdk.jpackage/jdk.jpackage.internal:+open \ + jdk.jpackage/jdk.jpackage.internal.util:+open \ + jdk.jpackage/jdk.jpackage.internal.util.function:+open \ + java.base/jdk.internal.util \ + jdk.jlink/jdk.tools.jlink.internal diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/AppImageFileTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ApplicationLayoutTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DeployParamsTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/EnquoterTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/OverridableResourceTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PathGroupTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/PlatformVersionTest.java diff --git a/test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java similarity index 100% rename from test/jdk/tools/jpackage/junit/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java rename to test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/ToolValidatorTest.java