Ignore the smart card tests if CardTerminals.list() fails

ebourg · May 16, 2024 · 2308eb5 · 2308eb5
1 parent d668c2e
commit 2308eb5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/jsign-core/src/test/java/net/jsign/jca/OpenPGPCardTest.java b/jsign-core/src/test/java/net/jsign/jca/OpenPGPCardTest.java
@@ -20,6 +20,7 @@
 import java.security.PrivateKey;
 import java.util.Set;
 import javax.crypto.Cipher;
+import javax.smartcardio.CardException;
 
 import org.apache.commons.codec.binary.Hex;
 import org.junit.Test;
@@ -32,7 +33,11 @@
 public class OpenPGPCardTest {
 
     public static void assumeCardPresent() throws Exception {
-        assumeTrue("OpenPGP card not found", SmartCard.getTerminal("Nitrokey") != null);
+        try {
+            assumeTrue("OpenPGP card not found", SmartCard.getTerminal("Nitrokey") != null);
+        } catch (CardException e) {
+            assumeNoException("OpenPGP card not found", e);
+        }
     }
 
     @Test

diff --git a/jsign-core/src/test/java/net/jsign/jca/PIVCardTest.java b/jsign-core/src/test/java/net/jsign/jca/PIVCardTest.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Set;
 import javax.crypto.Cipher;
+import javax.smartcardio.CardException;
 
 import org.junit.Test;
 
@@ -34,7 +35,11 @@
 public class PIVCardTest {
 
     public static void assumeCardPresent() throws Exception {
-        assumeTrue("PIV card not found", SmartCard.getTerminal("Yubikey") != null);
+        try {
+            assumeTrue("PIV card not found", SmartCard.getTerminal("Yubikey") != null);
+        } catch (CardException e) {
+            assumeNoException("PIV card not found", e);
+        }
     }
 
     @Test