From ac4349b48e990daa68d1cea3ebc1fed84c8ad3ce Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Mon, 21 Jul 2025 11:45:18 +0100
Subject: [PATCH 1/2] JDK-8360562: sun/security/tools/keytool/i18n.java add an
 ability to add comment for failures

---
 test/jdk/sun/security/tools/keytool/i18n.java | 53 +++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/test/jdk/sun/security/tools/keytool/i18n.java b/test/jdk/sun/security/tools/keytool/i18n.java
index 4ba8c7830b72f..e3140d85d06b1 100644
--- a/test/jdk/sun/security/tools/keytool/i18n.java
+++ b/test/jdk/sun/security/tools/keytool/i18n.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -63,11 +63,21 @@
 
 import jdk.test.lib.UIBuilder;
 
-import javax.swing.*;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import javax.swing.JTextArea;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JFrame;
+import java.awt.FlowLayout;
+import java.awt.BorderLayout;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Locale;
 
+import static javax.swing.BorderFactory.createEmptyBorder;
+
 public class i18n {
     private static final String[][] TABLE = new String[][]{
             {"-help", "All the output in this test should be in ${LANG}. "
@@ -238,11 +248,12 @@ public class i18n {
                     "Output in ${LANG}. Check keytool error: java.lang"
                             + ".IllegalArgumentException: if -protected is "
                             + "specified, then -storepass, -keypass, and -new "
-                            + "must not be specified."},
+                            + "must not be specified."}
     };
     private static String TEST_SRC = System.getProperty("test.src");
     private static int TIMEOUT_MS = 120000;
     private volatile boolean failed = false;
+    private volatile String failureReason = "";
     private volatile boolean aborted = false;
     private Thread currentThread = null;
 
@@ -334,6 +345,7 @@ public boolean validate(String command, String instruction, String message) {
 
             if (failed) {
                 System.out.println(command + ": TEST FAILED");
+                System.out.println("REASON: " + failureReason);
                 System.out.println(message);
             } else {
                 System.out.println(command + ": TEST PASSED");
@@ -352,6 +364,7 @@ public void pass() {
 
     public void fail() {
         failed = true;
+        failureReason = requestFailDescription();
         currentThread.interrupt();
     }
 
@@ -359,4 +372,38 @@ public void abort() {
         aborted = true;
         currentThread.interrupt();
     }
+
+    /**
+     * Opens a prompt to enter a failure reason to be filled by the tester
+     */
+     public static String requestFailDescription() {
+
+        final JDialog dialogWindow = new JDialog(new JFrame(), "Failure Description", true);
+        final JTextArea reasonTextArea = new JTextArea(5, 20);
+
+        final JButton okButton = new JButton("OK");
+        okButton.addActionListener(_ -> dialogWindow.setVisible(false));
+
+        final JPanel okayBtnPanel = new JPanel(
+                new FlowLayout(FlowLayout.CENTER,
+                        4,
+                        0));
+        okayBtnPanel.setBorder(createEmptyBorder(4,
+                0,
+                0,
+                0));
+        okayBtnPanel.add(okButton);
+
+        final JPanel mainPanel = new JPanel(new BorderLayout());
+        mainPanel.add(new JScrollPane(reasonTextArea), BorderLayout.CENTER);
+        mainPanel.add(okayBtnPanel, BorderLayout.SOUTH);
+
+        dialogWindow.add(mainPanel);
+        dialogWindow.pack();
+        dialogWindow.setVisible(true);
+
+        dialogWindow.dispose();
+
+        return reasonTextArea.getText();
+    }
 }

From 9f8f1a48a9b737b48a033e44cdb05e5797d9ff28 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Mon, 21 Jul 2025 12:56:19 +0100
Subject: [PATCH 2/2] Matthew's style comments

---
 test/jdk/sun/security/tools/keytool/i18n.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/jdk/sun/security/tools/keytool/i18n.java b/test/jdk/sun/security/tools/keytool/i18n.java
index e3140d85d06b1..9b44ad08ab00d 100644
--- a/test/jdk/sun/security/tools/keytool/i18n.java
+++ b/test/jdk/sun/security/tools/keytool/i18n.java
@@ -385,13 +385,8 @@ public static String requestFailDescription() {
         okButton.addActionListener(_ -> dialogWindow.setVisible(false));
 
         final JPanel okayBtnPanel = new JPanel(
-                new FlowLayout(FlowLayout.CENTER,
-                        4,
-                        0));
-        okayBtnPanel.setBorder(createEmptyBorder(4,
-                0,
-                0,
-                0));
+                new FlowLayout(FlowLayout.CENTER, 4, 0));
+        okayBtnPanel.setBorder(createEmptyBorder(4, 0, 0, 0));
         okayBtnPanel.add(okButton);
 
         final JPanel mainPanel = new JPanel(new BorderLayout());