From fdc4f2f73e3d80bed9f24f2225a97fdc139fb16e Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Wed, 29 Jan 2025 15:03:46 +0100
Subject: [PATCH] improve always manual device tests

---
 .../yubico/yubikit/testing/piv/PivBioMultiProtocolTests.java   | 3 +++
 .../java/com/yubico/yubikit/testing/piv/PivTests.java          | 3 ++-
 .../yubikit/testing/desktop/piv/PivBioMultiProtocolTests.java  | 3 +++
 .../java/com/yubico/yubikit/testing/desktop/piv/PivTests.java  | 3 ++-
 .../main/java/com/yubico/yubikit/testing/piv/PivTestState.java | 3 ---
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivBioMultiProtocolTests.java b/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivBioMultiProtocolTests.java
index c0a811d8..db6d1825 100644
--- a/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivBioMultiProtocolTests.java
+++ b/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivBioMultiProtocolTests.java
@@ -16,12 +16,15 @@
 
 package com.yubico.yubikit.testing.piv;
 
+import com.yubico.yubikit.testing.AlwaysManualTest;
 import com.yubico.yubikit.testing.framework.PivInstrumentedTests;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 public class PivBioMultiProtocolTests extends PivInstrumentedTests {
 
   @Test
+  @Category(AlwaysManualTest.class)
   public void testAuthenticate() throws Throwable {
     withPivSession(PivBioMultiProtocolDeviceTests::testAuthenticate);
   }
diff --git a/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivTests.java b/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivTests.java
index 5eb15caa..011bf913 100644
--- a/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivTests.java
+++ b/testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivTests.java
@@ -30,7 +30,8 @@
   PivTests.NoScpTests.class,
   PivTests.Scp11bTests.class,
   PivJcaProviderTests.NoScpTests.class,
-  PivJcaProviderTests.Scp11bTests.class
+  PivJcaProviderTests.Scp11bTests.class,
+  PivBioMultiProtocolTests.class
 })
 public class PivTests {
   public static class NoScpTests extends PivInstrumentedTests {
diff --git a/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivBioMultiProtocolTests.java b/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivBioMultiProtocolTests.java
index 762752ef..faefa366 100644
--- a/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivBioMultiProtocolTests.java
+++ b/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivBioMultiProtocolTests.java
@@ -15,13 +15,16 @@
  */
 package com.yubico.yubikit.testing.desktop.piv;
 
+import com.yubico.yubikit.testing.desktop.AlwaysManualTest;
 import com.yubico.yubikit.testing.desktop.framework.PivInstrumentedTests;
 import com.yubico.yubikit.testing.piv.PivBioMultiProtocolDeviceTests;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 public class PivBioMultiProtocolTests extends PivInstrumentedTests {
 
   @Test
+  @Category(AlwaysManualTest.class)
   public void testAuthenticate() throws Throwable {
     withPivSession(PivBioMultiProtocolDeviceTests::testAuthenticate);
   }
diff --git a/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivTests.java b/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivTests.java
index a8dfe216..b7d13ec1 100644
--- a/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivTests.java
+++ b/testing-desktop/src/integrationTest/java/com/yubico/yubikit/testing/desktop/piv/PivTests.java
@@ -32,7 +32,8 @@
   PivTests.NoScpTests.class,
   PivTests.Scp11bTests.class,
   PivJcaProviderTests.NoScpTests.class,
-  PivJcaProviderTests.Scp11bTests.class
+  PivJcaProviderTests.Scp11bTests.class,
+  PivBioMultiProtocolTests.class
 })
 public class PivTests {
   public static class NoScpTests extends PivInstrumentedTests {
diff --git a/testing/src/main/java/com/yubico/yubikit/testing/piv/PivTestState.java b/testing/src/main/java/com/yubico/yubikit/testing/piv/PivTestState.java
index 529c8f37..5ab308f9 100644
--- a/testing/src/main/java/com/yubico/yubikit/testing/piv/PivTestState.java
+++ b/testing/src/main/java/com/yubico/yubikit/testing/piv/PivTestState.java
@@ -88,9 +88,6 @@ protected PivTestState(Builder builder) throws Throwable {
 
     DeviceInfo deviceInfo = getDeviceInfo();
 
-    // skip MPE devices
-    assumeFalse("Ignoring MPE device", isMpe(deviceInfo));
-
     boolean isPivFipsCapable = isFipsCapable(deviceInfo, Capability.PIV);
     boolean hasPinComplexity = deviceInfo != null && deviceInfo.getPinComplexity();