Make capability in --help human readable

Author: jerboaa

src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java

@@ -592,9 +592,16 @@ public void showHelp(String progName, boolean linkableRuntimeEnabled) {
 
             log.println(bundleHelper.getMessage("main.command.files"));
             // If the JDK build has the run-time image capability show it
-            // in the help output
-            log.println(bundleHelper.getMessage("main.runtime.image.linking.capability",
-                                                linkableRuntimeEnabled ? "+" : "-"));
+            // in the help output in human readable form.
+            String qualifier = null;
+            if (linkableRuntimeEnabled) {
+                qualifier = bundleHelper.getMessage("main.runtime.image.linking.cap.enabled");
+            } else {
+                qualifier = bundleHelper.getMessage("main.runtime.image.linking.cap.disabled");
+            }
+            log.println(bundleHelper.getMessage("main.runtime.image.linking.cap.sect.header"));
+            log.println(bundleHelper.getMessage("main.runtime.image.linking.cap.msg",
+                                                qualifier));
         }
 
         public void listPlugins() {

src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties

@@ -111,7 +111,10 @@ main.extended.help.footer=\
 \              used, one pattern per line\n\
 \n\
 
-main.runtime.image.linking.capability=Capabilities: {0}run-time-image
+main.runtime.image.linking.cap.enabled=enabled
+main.runtime.image.linking.cap.disabled=disabled
+main.runtime.image.linking.cap.sect.header=Capabilities:
+main.runtime.image.linking.cap.msg=\      Linking from run-time image {0}
 
 error.prefix=Error:
 warn.prefix=Warning:

test/jdk/tools/jlink/JLinkHelpCapabilityTest.java

@@ -29,14 +29,14 @@
  * @test id=run-time-image-cap-yes
  * @summary Test jlink --help for capability output (true)
  * @requires (vm.compMode != "Xcomp" & jlink.runtime.linkable)
- * @run main/othervm JLinkHelpCapabilityTest true
+ * @run main/othervm -Duser.language=en JLinkHelpCapabilityTest true
  */
 
 /*
  * @test id=run-time-image-cap-no
  * @summary Test jlink --help for capability output (false)
  * @requires (vm.compMode != "Xcomp" & !jlink.runtime.linkable)
- * @run main/othervm JLinkHelpCapabilityTest false
+ * @run main/othervm -Duser.language=en JLinkHelpCapabilityTest false
  */
 public class JLinkHelpCapabilityTest {
     static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink")
@@ -46,18 +46,36 @@ public class JLinkHelpCapabilityTest {
 
     public static void main(String[] args) throws Exception {
         boolean runtimeLinkCap = Boolean.parseBoolean(args[0]);
-        String capabilities = String.format("Capabilities: %srun-time-image",
-                                            runtimeLinkCap ? "+" : "-");
+        String capabilities = String.format("Linking from run-time image %s",
+                                            runtimeLinkCap ? "enabled" : "disabled");
         {
             // Verify capability in --help output
             StringWriter writer = new StringWriter();
             PrintWriter pw = new PrintWriter(writer);
             JLINK_TOOL.run(pw, pw, "--help");
             String output = writer.toString().trim();
             String lines[] = output.split("\n");
-            if (!capabilities.equals(lines[lines.length - 1])) {
+            String capabilitiesMsg = null;
+            boolean seenCap = false;
+            for (int i = 0; i < lines.length; i++) {
+                if (lines[i].startsWith("Capabilities:")) {
+                    seenCap = true;
+                    continue; // skip 'Capabilities:'
+                }
+                if (!seenCap) {
+                    continue;
+                } else {
+                    // Line after capabilities is the message we care about
+                    capabilitiesMsg = lines[i].trim();
+                    break;
+                }
+            }
+            System.out.println("DEBUG: Capabilities:");
+            System.out.println("DEBUG:   " + capabilitiesMsg);
+            if (!capabilities.equals(capabilitiesMsg)) {
                 System.err.println(output);
-                throw new AssertionError("'--help': Capabilities mismatch. Expected: '" + capabilities +"'");
+                throw new AssertionError("'--help': Capabilities mismatch. Expected: '" +
+                                         capabilities +"' but got '" + capabilitiesMsg + "'");
             }
         }
     }