8355366: Fix the wrong usage of PassFailJFrame.forcePass() in some manual tests

Backport-of: 2785570f5620db08c0d31cd29839f92ffabd58b2

Author: GoeLin

test/jdk/java/awt/Desktop/BrowseTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,8 +25,8 @@
  * @test
  * @bug 6255196
  * @summary  Verifies the function of method browse(java.net.URI uri).
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
  * @run main/manual BrowseTest
  */
 
@@ -36,6 +36,8 @@
 import java.net.URI;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
 public class BrowseTest extends JPanel {
     static final String INSTRUCTIONS = """
             This test could launch default file manager to open user's home
@@ -47,12 +49,6 @@ public class BrowseTest extends JPanel {
             """;
 
     public BrowseTest() {
-        if (!Desktop.isDesktopSupported()) {
-            PassFailJFrame.log("Class java.awt.Desktop is not supported on " +
-                    "current platform. Farther testing will not be performed");
-            PassFailJFrame.forcePass();
-        }
-
         Desktop desktop = Desktop.getDesktop();
 
         URI dirURI = new File(System.getProperty("user.home")).toURI();
@@ -77,6 +73,11 @@ public BrowseTest() {
 
     public static void main(String[] args) throws InterruptedException,
             InvocationTargetException {
+        if (!Desktop.isDesktopSupported()) {
+            throw new SkippedException("Class java.awt.Desktop is not supported " +
+                    "on current platform. Further testing will not be performed");
+        }
+
         PassFailJFrame.builder()
                 .title("Browser Test")
                 .splitUI(BrowseTest::new)

test/jdk/java/awt/Desktop/EditAndPrintTest/EditAndPrintTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,8 +27,8 @@
  * @bug 6255196
  * @summary  Verifies the function of methods edit(java.io.File file) and
  *           print(java.io.File file)
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
  * @run main/manual EditAndPrintTest
  */
 
@@ -40,6 +40,8 @@
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
 public class EditAndPrintTest extends JPanel {
 
     static final String INSTRUCTIONS = """
@@ -49,20 +51,9 @@ public class EditAndPrintTest extends JPanel {
             If you see any EXCEPTION messages in the output press FAIL.
             """;
 
-    public EditAndPrintTest() {
-        if (!Desktop.isDesktopSupported()) {
-            PassFailJFrame.log("Class java.awt.Desktop is not supported on " +
-                    "current platform. Further testing will not be performed");
-            PassFailJFrame.forcePass();
-        }
-
-        Desktop desktop = Desktop.getDesktop();
-
-        if (!desktop.isSupported(Action.PRINT) && !desktop.isSupported(Action.EDIT)) {
-            PassFailJFrame.log("Neither EDIT nor PRINT actions are supported. Nothing to test.");
-            PassFailJFrame.forcePass();
-        }
+    static Desktop desktop;
 
+    public EditAndPrintTest() {
         /*
          * Part 1: print or edit a directory, which should throw an IOException.
          */
@@ -111,7 +102,7 @@ public EditAndPrintTest() {
             writer.write("This is a temp file used to test print() method of Desktop.");
             writer.flush();
             writer.close();
-        } catch (java.io.IOException ioe){
+        } catch (IOException ioe){
             PassFailJFrame.log("EXCEPTION: " + ioe.getMessage());
             PassFailJFrame.forceFail("Failed to create temp file for testing.");
         }
@@ -139,6 +130,16 @@ public EditAndPrintTest() {
 
     public static void main(String args[]) throws InterruptedException,
             InvocationTargetException {
+        if (!Desktop.isDesktopSupported()) {
+            throw new SkippedException("Class java.awt.Desktop is not supported " +
+                    "on current platform. Further testing will not be performed");
+        }
+
+        desktop = Desktop.getDesktop();
+        if (!desktop.isSupported(Action.PRINT) && !desktop.isSupported(Action.EDIT)) {
+            throw new SkippedException("Neither EDIT nor PRINT actions are supported. Nothing to test.");
+        }
+
         PassFailJFrame.builder()
                 .title("Edit and Print test")
                 .splitUI(EditAndPrintTest::new)

test/jdk/java/awt/Desktop/OpenTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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,8 +25,8 @@
  * @test
  * @bug 6255196
  * @summary Verifies the function of method open(java.io.File file).
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
  * @run main/manual/othervm OpenTest
  */
 
@@ -36,6 +36,8 @@
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
 public class OpenTest extends JPanel {
 
     static final String INSTRUCTIONS = """
@@ -48,12 +50,6 @@ public class OpenTest extends JPanel {
             """;
 
     public OpenTest() {
-        if (!Desktop.isDesktopSupported()) {
-            PassFailJFrame.log("Class java.awt.Desktop is not supported on " +
-                    "current platform. Further testing will not be performed");
-            PassFailJFrame.forcePass();
-        }
-
         Desktop desktop = Desktop.getDesktop();
 
         /*
@@ -85,7 +81,7 @@ public OpenTest() {
             testFile = File.createTempFile("JDIC-test", ".txt",
                     new File(System.getProperty("java.io.tmpdir")));
             testFile.deleteOnExit();
-        } catch (java.io.IOException ioe) {
+        } catch (IOException ioe) {
             PassFailJFrame.log("EXCEPTION: " + ioe.getMessage());
             PassFailJFrame.log("Failed to create test file");
         }
@@ -101,6 +97,11 @@ public OpenTest() {
 
     public static void main(String[] args) throws InterruptedException,
             InvocationTargetException {
+        if (!Desktop.isDesktopSupported()) {
+            throw new SkippedException("Class java.awt.Desktop is not supported " +
+                    "on current platform. Further testing will not be performed");
+        }
+
         PassFailJFrame.builder()
                 .title("Mail Test")
                 .splitUI(OpenTest::new)