8346434: Add test for non-automatic service binding

Reviewed-by: almatvee

Author: Alexey Semenyuk

test/jdk/tools/jpackage/apps/PrintEnv.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, 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,8 +21,12 @@
  * questions.
  */
 
-import java.util.List;
+import java.lang.module.ModuleDescriptor;
+import java.lang.module.ModuleFinder;
+import java.lang.module.ModuleReference;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class PrintEnv {
 
@@ -41,6 +45,11 @@ private static List<String> printArgs(String[] args) {
             } else if (arg.startsWith(PRINT_SYS_PROP)) {
                 String name = arg.substring(PRINT_SYS_PROP.length());
                 lines.add(name + "=" + System.getProperty(name));
+            } else if (arg.startsWith(PRINT_MODULES)) {
+                lines.add(ModuleFinder.ofSystem().findAll().stream()
+                        .map(ModuleReference::descriptor)
+                        .map(ModuleDescriptor::name)
+                        .collect(Collectors.joining(",")));
             } else {
                 throw new IllegalArgumentException();
             }
@@ -51,4 +60,5 @@ private static List<String> printArgs(String[] args) {
 
     private final static String PRINT_ENV_VAR = "--print-env-var=";
     private final static String PRINT_SYS_PROP = "--print-sys-prop=";
+    private final static String PRINT_MODULES = "--print-modules";
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -25,9 +25,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-record Comm<T>(Set<T> common, Set<T> unique1, Set<T> unique2) {
+public record Comm<T>(Set<T> common, Set<T> unique1, Set<T> unique2) {
 
-    static <T> Comm<T> compare(Set<T> a, Set<T> b) {
+    public static <T> Comm<T> compare(Set<T> a, Set<T> b) {
         Set<T> common = new HashSet<>(a);
         common.retainAll(b);
         Set<T> unique1 = new HashSet<>(a);

test/jdk/tools/jpackage/share/JLinkOptionsTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, 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
@@ -22,10 +22,16 @@
  */
 
 
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
-import jdk.jpackage.test.Annotations.Parameters;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Comm;
+import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.TKit;
 
@@ -41,7 +47,6 @@
 
 public final class JLinkOptionsTest {
 
-    @Parameters
     public static Collection input() {
         return List.of(new Object[][]{
             // default but with strip-native-commands removed
@@ -111,17 +116,11 @@ public static Collection input() {
         });
     }
 
-    public JLinkOptionsTest(String javaAppDesc, String[] jpackageArgs, String[] required, String[] prohibited) {
-        this.required = required;
-        this.prohibited = prohibited;
-        cmd = JPackageCommand
-                .helloAppImage(javaAppDesc)
-                .ignoreDefaultRuntime(true)
-                .addArguments(jpackageArgs);
-    }
-
     @Test
-    public void test() {
+    @ParameterSupplier("input")
+    public void test(String javaAppDesc, String[] jpackageArgs, String[] required, String[] prohibited) {
+        final var cmd = createJPackageCommand(javaAppDesc).addArguments(jpackageArgs);
+
         cmd.executeAndAssertHelloAppImageCreated();
 
         List<String> release = cmd.readRuntimeReleaseFile();
@@ -138,7 +137,37 @@ public void test() {
         }
     }
 
-    private final String[] required;
-    private final String[] prohibited;
-    private final JPackageCommand cmd;
+    @Test
+    public void testNoBindServicesByDefault() {
+        final var defaultModules = getModulesInRuntime();
+        final var modulesWithBindServices = getModulesInRuntime("--bind-services");
+
+        final var moduleComm = Comm.compare(defaultModules, modulesWithBindServices);
+
+        TKit.assertStringListEquals(List.of(), moduleComm.unique1().stream().toList(),
+                "Check '--bind-services' option doesn't remove modules");
+        TKit.assertNotEquals("", moduleComm.unique2().stream().sorted().collect(Collectors.joining(",")),
+                "Check '--bind-services' option adds modules");
+    }
+
+    private final JPackageCommand createJPackageCommand(String javaAppDesc) {
+        return JPackageCommand.helloAppImage(javaAppDesc).ignoreDefaultRuntime(true);
+    }
+
+    private final Set<String> getModulesInRuntime(String ... jlinkOptions) {
+        final var cmd = createJPackageCommand(PRINT_ENV_APP + "*");
+        if (jlinkOptions.length != 0) {
+            cmd.addArguments("--jlink-options");
+            cmd.addArguments(jlinkOptions);
+        }
+
+        cmd.executeAndAssertImageCreated();
+
+        final var output = HelloApp.assertApp(cmd.appLauncherPath())
+                .saveOutput(true).execute("--print-modules").getFirstLineOfOutput();
+
+        return Stream.of(output.split(",")).collect(Collectors.toSet());
+    }
+
+    private static final Path PRINT_ENV_APP = TKit.TEST_SRC_ROOT.resolve("apps/PrintEnv.java");
 }