JDK-8365608: Test is skipped without skip exception /test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ValidatePathWithParams.java

Author: myankelev

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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,6 +25,7 @@
  * @test
  * @bug 8245654 8256895
  * @summary Interoperability tests with Certigna Root CAs from Dhimyotis
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=certpath CertignaCA OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath CertignaCA CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -26,6 +26,7 @@
  * @bug 8189131
  * @summary Interoperability tests with "D-Trust Root Class 3 CA 2 2009" and
  *          "D-Trust Root Class 3 CA 2 EV 2009" CAs
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=certpath DTrustCA OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath DTrustCA CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/DigicertCSRootG5.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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,6 +25,7 @@
  * @test
  * @bug 8318759
  * @summary Interoperability tests with Digicert CS Root G5 certificates
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=ocsp,certpath DigicertCSRootG5 OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath DigicertCSRootG5 CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/EmSignRootG2CA.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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,6 +25,7 @@
  * @test
  * @bug 8319187
  * @summary Interoperability tests with eMudhra emSign Root CA G2 CS root
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath EmSignRootG2CA CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8256421
  * @summary Interoperability tests with Harica CAs
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=certpath HaricaCA OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath HaricaCA CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 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,6 +25,7 @@
  * @test
  * @bug 8232019 8256895
  * @summary Interoperability tests with LuxTrust Global Root 2 CA
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=certpath LuxTrustCA OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath LuxTrustCA CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/SectigoCSRootCAs.java

@@ -25,6 +25,7 @@
  * @test
  * @bug 8359170
  * @summary Interoperability tests with Sectigo Public Code Signing Root CAs
+ * @library /test/lib/
  * @build ValidatePathWithParams
  * @run main/othervm/manual -Djava.security.debug=ocsp,certpath SectigoCSRootCAs OCSP
  * @run main/othervm/manual -Djava.security.debug=certpath SectigoCSRootCAs CRL

test/jdk/security/infra/java/security/cert/CertPathValidator/certification/ValidatePathWithParams.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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,6 +21,8 @@
  * questions.
  */
 
+import jtreg.SkippedException;
+
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -144,22 +146,19 @@ public void validate(String[] certsToValidate,
         } catch (IOException ioe) {
             // Some machines don't have network setup correctly to be able to
             // reach outside world, skip such failures
-            out.println("WARNING: Network setup issue, skip this test");
             ioe.printStackTrace(System.err);
-            return;
+            throw new SkippedException("WARNING: Network setup issue, skip this test");
         } catch (CertPathValidatorException cpve) {
             out.println("Received exception: " + cpve);
 
             if (cpve.getCause() instanceof IOException) {
-                out.println("WARNING: CertPathValidatorException caused by IO"
+                throw new SkippedException("WARNING: CertPathValidatorException caused by IO"
                         + " error, skip this test");
-                return;
             }
 
             if (cpve.getReason() == CertPathValidatorException.BasicReason.ALGORITHM_CONSTRAINED) {
-                out.println("WARNING: CertPathValidatorException caused by"
+                throw new SkippedException("WARNING: CertPathValidatorException caused by"
                         + " restricted algorithm, skip this test");
-                return;
             }
 
             if (cpve.getReason() == CertPathValidatorException.BasicReason.REVOKED
@@ -185,8 +184,7 @@ public void validate(String[] certsToValidate,
         // Don't want test to fail in case certificate is expired when not expected
         // Simply skip the test.
         if (expectedStatus != Status.EXPIRED && certStatus == Status.EXPIRED) {
-            out.println("WARNING: Certificate expired, skip the test");
-            return;
+            throw new SkippedException("WARNING: Certificate expired, skip the test");
         }
 
         if (certStatus != expectedStatus) {