8350013: Add a test for JDK-8150442

test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java

@@ -22,15 +22,12 @@
  */
 package jdk.jpackage.test;
 
-import static java.util.stream.Collectors.toMap;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
@@ -404,7 +401,7 @@ void configureInstallVerifiers(PackageTest test, Consumer<Verifiable> verifiable
         }
 
         void configureUninstallVerifiers(PackageTest test, Consumer<Verifiable> verifiableAccumulator) {
-            for (final var verifier  : uninstallVerifiers) {
+            for (final var verifier : uninstallVerifiers) {
                 verifiableAccumulator.accept(verifier);
                 test.addUninstallVerifier(verifier);
             }

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java

@@ -25,7 +25,6 @@
 
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java

@@ -502,7 +502,7 @@
             }
 
             switch (action) {
-                case UNPACK: {
+                case UNPACK -> {
                     cmd.setUnpackedPackageLocation(null);
                     final var unpackRootDir = TKit.createTempDirectory(
                             String.format("unpacked-%s", type.getName()));
@@ -511,40 +511,37 @@
                         state.deleteUnpackDirs.add(unpackDir);
                     }
                     cmd.setUnpackedPackageLocation(unpackDir);
-                    break;
                 }
 
-                case INSTALL: {
+                case INSTALL -> {
                     cmd.setUnpackedPackageLocation(null);
                     final int installExitCode = packageHandlers.install(cmd);
                     TKit.assertEquals(expectedInstallExitCode, installExitCode,
                             String.format("Check installer exited with %d code", expectedInstallExitCode));
-                    break;
                 }
 
-                case UNINSTALL: {
+                case UNINSTALL -> {
                     cmd.setUnpackedPackageLocation(null);
                     packageHandlers.uninstall(cmd);
-                    break;
                 }
 
-                case CREATE:
+                case CREATE -> {
                     cmd.setUnpackedPackageLocation(null);
                     handler.processAction(action, cmd, expectedJPackageExitCode);
-                    break;
+                }
 
-                case INITIALIZE:
+                case INITIALIZE -> {
                     handler.processAction(action, cmd, expectedJPackageExitCode);
-                    break;
+                }
 
-                case FINALIZE:
+                case FINALIZE -> {
                     state.deleteUnpackDirs.forEach(TKit::deleteDirectoryRecursive);
                     state.deleteUnpackDirs.clear();
-                    break;
+                }
 
-                default:
+                default -> {
                     handler.processAction(action, cmd.createImmutableCopy(), expectedJPackageExitCode);
-                    break;
+                }
             }
         }
 
@@ -674,15 +671,15 @@
 
         public void processAction(Action action, JPackageCommand cmd, int expectedJPackageExitCode) {
             switch (action) {
-                case INITIALIZE:
+                case INITIALIZE -> {
                     initializers.forEach(v -> v.accept(cmd));
                     if (cmd.isImagePackageType()) {
                         throw new UnsupportedOperationException();
                     }
                     cmd.executePrerequisiteActions();
-                    break;
+                }
 
-                case CREATE:
+                case CREATE -> {
                     Executor.Result result = cmd.execute(expectedJPackageExitCode);
                     if (expectedJPackageExitCode == 0) {
                         TKit.assertFileExists(cmd.outputBundle());
@@ -692,28 +689,30 @@
                         });
                     }
                     verifyPackageBundle(cmd, result, expectedJPackageExitCode);
-                    break;
+                }
 
-                case VERIFY_INSTALL:
+                case VERIFY_INSTALL -> {
                     if (expectedJPackageExitCode == 0) {
                         verifyPackageInstalled(cmd);
                     }
-                    break;
+                }
 
-                case VERIFY_UNINSTALL:
+                case VERIFY_UNINSTALL -> {
                     if (expectedJPackageExitCode == 0) {
                         verifyPackageUninstalled(cmd);
                     }
-                    break;
+                }
 
-                case PURGE:
+                case PURGE -> {
                     var bundle = cmd.outputBundle();
                     if (toSupplier(() -> TKit.deleteIfExists(bundle)).get()) {
                         TKit.trace(String.format("Deleted [%s] package", bundle));
                     }
-                    break;
-
-                default: // NOP
+                }
+
+                default -> {
+                    // NOP
+                }
             }
         }
 

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java

@@ -26,7 +26,6 @@
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;