Fix NFC timeout for tests, add test suites

testing-android/src/androidTest/java/com/yubico/yubikit/testing/DeviceTests.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 Yubico.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yubico.yubikit.testing;
+
+import com.yubico.yubikit.testing.openpgp.OpenPgpTests;
+import com.yubico.yubikit.testing.piv.PivTests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * All integration tests.
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        PivTests.class,
+        OpenPgpTests.class,
+})
+public class DeviceTests {
+}

testing-android/src/androidTest/java/com/yubico/yubikit/testing/FastDeviceTests.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 Yubico.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yubico.yubikit.testing;
+
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * All device tests excluding tests considered too slow.
+ */
+@RunWith(Categories.class)
+@Categories.ExcludeCategory(SlowTest.class)
+@Suite.SuiteClasses({
+        DeviceTests.class
+})
+public class FastDeviceTests {
+}

testing-android/src/androidTest/java/com/yubico/yubikit/testing/openpgp/OpenPgpTests.java

@@ -19,9 +19,11 @@
 import androidx.annotation.Nullable;
 
 import com.yubico.yubikit.core.smartcard.scp.ScpKid;
+import com.yubico.yubikit.testing.SlowTest;
 import com.yubico.yubikit.testing.framework.OpenPgpInstrumentedTests;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -73,6 +75,7 @@ public void testSetPinAttempts() throws Throwable {
         }
 
         @Test
+        @Category(SlowTest.class)
         public void testGenerateRsaKeys() throws Throwable {
             withOpenPgpSession(OpenPgpDeviceTests::testGenerateRsaKeys);
         }

testing-android/src/androidTest/java/com/yubico/yubikit/testing/piv/PivJcaProviderTests.java

@@ -20,21 +20,25 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.yubico.yubikit.core.smartcard.scp.ScpKid;
+import com.yubico.yubikit.testing.SlowTest;
 import com.yubico.yubikit.testing.framework.PivInstrumentedTests;
 
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class PivJcaProviderTests {
 
     public static class NoScpTests extends PivInstrumentedTests {
         @Test
+        @Category(SlowTest.class)
         public void testGenerateKeys() throws Throwable {
             withPivSession(PivJcaDeviceTests::testGenerateKeys);
         }
 
         @Test
+        @Category(SlowTest.class)
         public void testGenerateKeysPreferBC() throws Throwable {
             withPivSession(PivJcaDeviceTests::testGenerateKeysPreferBC);
         }
@@ -45,11 +49,13 @@ public void testImportKeys() throws Throwable {
         }
 
         @Test
+        @Category(SlowTest.class)
         public void testSigning() throws Throwable {
             withPivSession(PivJcaSigningTests::testSign);
         }
 
         @Test
+        @Category(SlowTest.class)
         public void testDecrypt() throws Throwable {
             withPivSession(PivJcaDecryptTests::testDecrypt);
         }

testing-android/src/main/java/com/yubico/yubikit/testing/SlowTest.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2024 Yubico.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yubico.yubikit.testing;
+
+public interface SlowTest {
+}

testing-android/src/main/java/com/yubico/yubikit/testing/TestActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Yubico.
+ * Copyright (C) 2022-2024 Yubico.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onResume() {
         super.onResume();
         try {
-            yubiKitManager.startNfcDiscovery(new NfcConfiguration().timeout(15000), this, sessionQueue::add);
+            yubiKitManager.startNfcDiscovery(new NfcConfiguration().timeout(1000 * 60 * 5), this, sessionQueue::add);
         } catch (NfcNotAvailable e) {
             if (e.isDisabled()) {
                 logger.error("NFC is disabled", e);
@@ -139,7 +139,17 @@ public synchronized void returnSession(YubiKeyDevice device) throws InterruptedE
             setBusy(false);
         });
         if (device instanceof NfcYubiKeyDevice) {
-            ((NfcYubiKeyDevice) device).remove(lock::release);
+            // TODO make waitForRemoval configurable from a test case
+            final boolean waitForRemoval = false;
+
+            //noinspection ConstantValue
+            if (waitForRemoval) {
+                // this causes the app to wait for removal of NFC key from the NFC sensor
+                ((NfcYubiKeyDevice) device).remove(lock::release);
+            } else {
+                lock.release();
+            }
+
             lock.acquire();
         }
     }