backport 23d6f747824ee3d750e2148a2be9d8e1dedbde40

Author: GoeLin

test/jdk/java/net/UnixDomainSocketAddress/AddressTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /**
  * @test
  * @bug 8231358
- * @compile ../../nio/file/spi/TestProvider.java AddressTest.java
+ * @compile ../../nio/file/spi/testfsp/testfsp/TestProvider.java AddressTest.java
  * @run testng/othervm AddressTest
  */
 
@@ -51,8 +51,8 @@ public class AddressTest {
 
     @Test
     public static void runTest() throws Exception {
-        TestProvider prov = new TestProvider(FileSystems.getDefault().provider());
-        Path path = prov.getPath(URI.create("file:/"));
+        var fsp = new testfsp.TestProvider(FileSystems.getDefault().provider());
+        Path path = fsp.getPath(URI.create("file:/"));
         assertThrows(IAE, () -> UnixDomainSocketAddress.of(path));
     }
 }

test/jdk/java/nio/file/spi/SetDefaultProvider.java

@@ -21,13 +21,13 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 4313887 7006126 8142968 8178380 8183320 8210112 8266345 8263940
- * @modules jdk.jartool
+ * @modules jdk.jartool jdk.jlink
  * @library /test/lib
- * @build SetDefaultProvider TestProvider m/* jdk.test.lib.process.ProcessTools
- * @run testng/othervm SetDefaultProvider
+ * @build testfsp/* testapp/*
+ * @run junit SetDefaultProvider
  * @summary Runs tests with -Djava.nio.file.spi.DefaultFileSystemProvider set on
  *          the command line to override the default file system provider
  */

test/jdk/java/nio/file/spi/TestDelegation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -41,8 +41,8 @@
  * @test
  * @summary Verifies that a FileSystemProvider's implementation of the exists
  * and readAttributesIfExists methods are invoked
- * @build TestDelegation TestProvider
- * @run testng/othervm  TestDelegation
+ * @compile testfsp/testfsp/TestProvider.java
+ * @run testng TestDelegation
  */
 public class TestDelegation {
 
@@ -55,7 +55,6 @@ public class TestDelegation {
     // The FileSystemProvider used by the test
     private MyProvider myProvider;
 
-
     /**
      * Create the FileSystemProvider, the FileSystem and
      * Path's used by the test.
@@ -182,7 +181,7 @@ public void testIsRegularFile(Path p, boolean isFile) {
     /**
      * The FileSystemProvider implementation used by the test
      */
-    static class MyProvider extends TestProvider {
+    static class MyProvider extends testfsp.TestProvider {
         private final Map<String, List<Path>> calls = new HashMap<>();
 
         private MyProvider() {

…jdk/java/nio/file/spi/m/module-info.java …va/nio/file/spi/testapp/module-info.javatest/jdk/java/nio/file/spi/m/module-info.java renamed to test/jdk/java/nio/file/spi/testapp/module-info.java test/jdk/java/nio/file/spi/m/module-info.java renamed to test/jdk/java/nio/file/spi/testapp/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, 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
@@ -20,5 +20,5 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-module m {
+module testapp {
 }

test/jdk/java/nio/file/spi/m/p/Main.java …a/nio/file/spi/testapp/testapp/Main.javatest/jdk/java/nio/file/spi/m/p/Main.java renamed to test/jdk/java/nio/file/spi/testapp/testapp/Main.java test/jdk/java/nio/file/spi/m/p/Main.java renamed to test/jdk/java/nio/file/spi/testapp/testapp/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-package p;
+package testapp;
 
 import java.io.File;
 import java.nio.file.FileSystem;

test/jdk/java/nio/file/spi/testfsp/module-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024, 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.
+ */
+
+module testfsp {
+    exports testfsp to java.base;
+}

…/jdk/java/nio/file/spi/TestProvider.java …le/spi/testfsp/testfsp/TestProvider.javatest/jdk/java/nio/file/spi/TestProvider.java renamed to test/jdk/java/nio/file/spi/testfsp/testfsp/TestProvider.java test/jdk/java/nio/file/spi/TestProvider.java renamed to test/jdk/java/nio/file/spi/testfsp/testfsp/TestProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,6 +21,8 @@
  * questions.
  */
 
+package testfsp;
+
 import java.io.File;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;