8366159: SkippedException is treated as a pass for pkcs11/KeyStore, pkcs11/SecretKeyFactory and pkcs11/SecureRandom

myankelev · wangweij · commit 166ef5e7b1c6 · 2025-09-08T14:37:25.000Z
Reviewed-by: weijun
diff --git a/test/jdk/sun/security/pkcs11/KeyStore/CertChainRemoval.java b/test/jdk/sun/security/pkcs11/KeyStore/CertChainRemoval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -28,15 +28,17 @@
  * @run testng/othervm CertChainRemoval
  */
 import jdk.test.lib.SecurityTools;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
 import java.nio.file.Path;
-import java.util.*;
 
 import java.security.Key;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.Provider;
 import java.security.cert.Certificate;
+import java.util.Arrays;
+import java.util.Enumeration;
 
 import jtreg.SkippedException;
 import org.testng.SkipException;
@@ -125,8 +127,7 @@ public void main(Provider p) throws Exception {
             p11ks.load(null, PKCS11KS.passwd);
             printKeyStore("Initial PKCS11 KeyStore: ", p11ks);
         } catch (Exception e) {
-            System.out.println("Skip test, due to " + e);
-            return;
+            throw new SkippedException("Skip test, due to " + e, e);
         }
 
         // get the necessary keys from the temp keystore
diff --git a/test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.java b/test/jdk/sun/security/pkcs11/KeyStore/ClientAuth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -260,8 +260,7 @@ public void main(Provider p) throws Exception {
         try {
             javax.crypto.Cipher.getInstance("RSA/ECB/PKCS1Padding", p);
         } catch (GeneralSecurityException e) {
-            System.out.println("Not supported by provider, skipping");
-            return;
+            throw new SkippedException("Not supported by provider, skipping");
         }
 
         this.provider = p;
diff --git a/test/jdk/sun/security/pkcs11/SecretKeyFactory/TestGeneral.java b/test/jdk/sun/security/pkcs11/SecretKeyFactory/TestGeneral.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 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
@@ -30,10 +30,14 @@
  * @run main/othervm TestGeneral
  */
 
+import jtreg.SkippedException;
+
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -57,8 +61,11 @@ private void test(String algorithm, SecretKey key, Provider p,
         try {
             skf = SecretKeyFactory.getInstance(algorithm, p);
         } catch (NoSuchAlgorithmException e) {
-            System.out.println("Not supported, skipping: " + e);
-            return;
+            throw new SkippedException("[algorithm: " + algorithm +
+                                       ", key: " + key.getAlgorithm() + "]" +
+                                       ", provider: " + p.getName() + "]" +
+                                       ", expectedTestResult: " + expected + "]" +
+                                       "Not supported, skipping: " + e);
         }
         try {
             SecretKey key2 = skf.translateKey(key);
@@ -99,21 +106,31 @@ public void main(Provider p) throws Exception {
         SecretKey bf_128Key = new SecretKeySpec(rawBytes, 0, 16, "Blowfish");
         SecretKey cc20Key = new SecretKeySpec(rawBytes, 0, 32, "ChaCha20");
 
-        // fixed key length
-        test("AES", aes_128Key, p, TestResult.PASS);
-        test("AES", aes_256Key, p, TestResult.PASS);
-        test("AES", cc20Key, p, TestResult.FAIL);
+        List<String> skippedList  = new ArrayList<>();
+        try {
+            // fixed key length
+            test("AES", aes_128Key, p, TestResult.PASS);
+            test("AES", aes_256Key, p, TestResult.PASS);
+            test("AES", cc20Key, p, TestResult.FAIL);
 
-        test("ChaCha20", aes_128Key, p, TestResult.FAIL);
-        test("ChaCha20", aes_256Key, p, TestResult.FAIL);
-        test("ChaCha20", cc20Key, p, TestResult.PASS);
+            test("ChaCha20", aes_128Key, p, TestResult.FAIL);
+            test("ChaCha20", aes_256Key, p, TestResult.FAIL);
+            test("ChaCha20", cc20Key, p, TestResult.PASS);
 
-        // variable key length
-        // Different PKCS11 impls may have different ranges
-        // of supported key sizes for variable-key-length
-        // algorithms.
-        test("Blowfish", aes_128Key, p, TestResult.FAIL);
-        test("Blowfish", cc20Key, p, TestResult.FAIL);
-        test("Blowfish", bf_128Key, p, TestResult.PASS);
+            // variable key length
+            // Different PKCS11 impls may have different ranges
+            // of supported key sizes for variable-key-length
+            // algorithms.
+            test("Blowfish", aes_128Key, p, TestResult.FAIL);
+            test("Blowfish", cc20Key, p, TestResult.FAIL);
+            test("Blowfish", bf_128Key, p, TestResult.PASS);
+        } catch (SkippedException skippedException){
+            skippedException.printStackTrace();
+            skippedList.add(skippedException.getMessage());
+        }
+
+        if (!skippedList.isEmpty()) {
+            throw new SkippedException("One or more tests skipped " + skippedList);
+        }
     }
 }
diff --git a/test/jdk/sun/security/pkcs11/SecureRandom/Basic.java b/test/jdk/sun/security/pkcs11/SecureRandom/Basic.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
@@ -32,6 +32,8 @@
  * @run main/othervm Basic
  */
 
+import jtreg.SkippedException;
+
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import java.security.SecureRandom;
@@ -44,9 +46,8 @@ public void main(Provider p) throws Exception {
         try {
             random = SecureRandom.getInstance("PKCS11");
         } catch (NoSuchAlgorithmException e) {
-            System.out.println("Provider " + p + " does not support SecureRandom, skipping");
             e.printStackTrace();
-            return;
+            throw new SkippedException("Provider " + p + " does not support SecureRandom, skipping", e);
         }
         byte[] b = new byte[32];
         random.nextBytes(b);
diff --git a/test/jdk/sun/security/pkcs11/SecureRandom/TestDeserialization.java b/test/jdk/sun/security/pkcs11/SecureRandom/TestDeserialization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -29,6 +29,8 @@
  * @modules jdk.crypto.cryptoki
  */
 
+import jtreg.SkippedException;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
@@ -43,18 +45,16 @@ public class TestDeserialization extends PKCS11Test {
     public void main(Provider p) throws Exception {
         // Skip this test for providers not found by java.security.Security
         if (Security.getProvider(p.getName()) != p) {
-            System.out.println("Skip test for provider " + p.getName());
-            return;
+            throw new SkippedException("Skip test for provider " + p.getName());
         }
         SecureRandom r;
         try {
             r = SecureRandom.getInstance("PKCS11", p);
             System.out.println("SecureRandom instance " + r);
         } catch (NoSuchAlgorithmException e) {
-            System.out.println("Provider " + p +
-                               " does not support SecureRandom, skipping");
             e.printStackTrace();
-            return;
+            throw new SkippedException("Provider " + p +
+                               " does not support SecureRandom, skipping");
         }
         r.setSeed(System.currentTimeMillis());
         byte[] buf = new byte[16];
