8355332: Fix failing semi-manual test EDT issue

Reviewed-by: azvegint

Author: Damon Nguyen

test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/HorizScrollers.java

@@ -161,8 +161,9 @@ private void showFinalReminderIfNeeded(boolean isFailure) {
             if (scrollAmount != 3) {
                 JOptionPane.showMessageDialog(
                         ConfigPanel.this.getTopLevelAncestor(),
-                        ("Test %s. please make sure you have restored " +
-                                "the original speed value blah blah")
+                        ("Test %s. Please make sure you have restored " +
+                                "the original scrolling speed in the " +
+                                "Mouse settings.")
                                 .formatted(isFailure
                                         ? "failed"
                                         : "passed"),
@@ -231,4 +232,4 @@ public void mouseWheelMoved(MouseWheelEvent e) {
             }
         }
     }
-}
+}

test/jdk/javax/swing/JScrollPane/AcceleratedWheelScrolling/RTLScrollers.java

@@ -265,22 +265,21 @@ public static boolean runTest(int scrollAmount)
             }
         }
 
+        robot.delay(1000);
         SwingUtilities.invokeAndWait(() -> {
             rtl = new RTLScrollers(scrollAmount);
             rtl.setVisible(true);
         });
         robot.delay(100);
 
-        SwingUtilities.invokeAndWait(() -> {
-            try {
-                retVal = rtl.runTests(scrollAmount);
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
+        try {
+            retVal = rtl.runTests(scrollAmount);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
                 rtl.setVisible(false);
                 rtl.dispose();
-            }
-        });
+            });
+        }
 
         robot.delay(100);
         System.out.println("RTLS.runTest(): " + retVal);
@@ -312,9 +311,8 @@ private boolean runTests(int scrollAmount)
         System.out.println("Testing List");
         testComp(list, scrollAmount);
 
-        SwingUtilities.invokeAndWait(() -> {
-            applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
-        });
+        SwingUtilities.invokeAndWait(() ->
+                applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT));
         robot.delay(100);
 
         System.out.println("Testing RTL Table");
@@ -467,9 +465,7 @@ public boolean testComp(TestTools comp, int scrollAmount)
         // Test acceleration for max scrolling
         // (this part should still work for RTL JList)
         if (scrollAmount == 30) {
-            SwingUtilities.invokeAndWait(() -> {
-                hsb.setValue(hsb.getMinimum());
-            });
+            SwingUtilities.invokeAndWait(() -> hsb.setValue(hsb.getMinimum()));
             robot.delay(100);
             robot.mouseWheel(2);
             robot.mouseWheel(2);