batter category names

Yubico · Jul 16, 2024 · 90bb1a2 · 90bb1a2
1 parent 2d16a22
commit 90bb1a2
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 23 deletions.
diff --git a/testing-android/src/androidTest/java/com/yubico/yubikit/testing/FastDeviceTests.java b/testing-android/src/androidTest/java/com/yubico/yubikit/testing/FastDeviceTests.java
@@ -24,10 +24,16 @@
  * These tests are here to make testing a bit faster and exclude following:
  * <ul>
  *     <li>{@link SlowTest}</li>
+ *     <li>{@link PinUvAuthProtocolV1Test}</li>
+ *     <li>{@link AlwaysManualTest}</li>
  * </ul>
  */
 @RunWith(Categories.class)
 @Suite.SuiteClasses(DeviceTests.class)
-@Categories.ExcludeCategory(SlowTest.class)
+@Categories.ExcludeCategory({
+        SlowTest.class,
+        PinUvAuthProtocolV1Test.class,
+        AlwaysManualTest.class
+})
 public class FastDeviceTests {
 }
diff --git a/...ndroidTest/java/com/yubico/yubikit/testing/fido/BasicWebAuthnClientInstrumentedTests.java b/...ndroidTest/java/com/yubico/yubikit/testing/fido/BasicWebAuthnClientInstrumentedTests.java
@@ -18,7 +18,7 @@
 
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocol;
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocolV1;
-import com.yubico.yubikit.testing.PinUvAuthProtocolV1Category;
+import com.yubico.yubikit.testing.PinUvAuthProtocolV1Test;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -74,7 +74,7 @@ public void testClientCredentialManagement() throws Throwable {
         }
     }
 
-    @Category(PinUvAuthProtocolV1Category.class)
+    @Category(PinUvAuthProtocolV1Test.class)
     public static class PinUvAuthV1Test extends PinUvAuthV2Test {
         @Override
         protected PinUvAuthProtocol getPinUvAuthProtocol() {

diff --git a/...src/androidTest/java/com/yubico/yubikit/testing/fido/Ctap2ClientPinInstrumentedTests.java b/...src/androidTest/java/com/yubico/yubikit/testing/fido/Ctap2ClientPinInstrumentedTests.java
@@ -18,7 +18,7 @@
 
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocol;
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocolV1;
-import com.yubico.yubikit.testing.PinUvAuthProtocolV1Category;
+import com.yubico.yubikit.testing.PinUvAuthProtocolV1Test;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -39,7 +39,7 @@ public void testClientPin() throws Throwable {
         }
     }
 
-    @Category(PinUvAuthProtocolV1Category.class)
+    @Category(PinUvAuthProtocolV1Test.class)
     public static class PinUvAuthV1Test extends PinUvAuthV2Test {
         @Override
         protected PinUvAuthProtocol getPinUvAuthProtocol() {

diff --git a/...id/src/androidTest/java/com/yubico/yubikit/testing/fido/Ctap2ConfigInstrumentedTests.java b/...id/src/androidTest/java/com/yubico/yubikit/testing/fido/Ctap2ConfigInstrumentedTests.java
@@ -16,7 +16,7 @@
 
 package com.yubico.yubikit.testing.fido;
 
-import com.yubico.yubikit.testing.AlwaysManualTestCategory;
+import com.yubico.yubikit.testing.AlwaysManualTest;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -35,7 +35,7 @@
  */
 @RunWith(Categories.class)
 @Suite.SuiteClasses(Ctap2ConfigInstrumentedTests.ConfigTests.class)
-@Categories.ExcludeCategory(AlwaysManualTestCategory.class)
+@Categories.ExcludeCategory(AlwaysManualTest.class)
 public class Ctap2ConfigInstrumentedTests {
 
     public static class ConfigTests extends FidoInstrumentedTests {
@@ -51,7 +51,7 @@ public void testReadWriteEnterpriseAttestation() throws Throwable {
          * @throws Throwable if an error occurs
          */
         @Test
-        @Category(AlwaysManualTestCategory.class)
+        @Category(AlwaysManualTest.class)
         public void testToggleAlwaysUv() throws Throwable {
             withCtap2Session(Ctap2ConfigTests::testToggleAlwaysUv);
         }
@@ -74,7 +74,7 @@ public void testSetForcePinChange() throws Throwable {
          * @throws Throwable if an error occurs
          */
         @Test
-        @Category(AlwaysManualTestCategory.class)
+        @Category(AlwaysManualTest.class)
         public void testSetMinPinLength() throws Throwable {
             withCtap2Session(Ctap2ConfigTests::testSetMinPinLength);
         }

diff --git a/...Test/java/com/yubico/yubikit/testing/fido/Ctap2CredentialManagementInstrumentedTests.java b/...Test/java/com/yubico/yubikit/testing/fido/Ctap2CredentialManagementInstrumentedTests.java
@@ -18,7 +18,7 @@
 
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocol;
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocolV1;
-import com.yubico.yubikit.testing.PinUvAuthProtocolV1Category;
+import com.yubico.yubikit.testing.PinUvAuthProtocolV1Test;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -44,7 +44,7 @@ public void testManagement() throws Throwable {
         }
     }
 
-    @Category(PinUvAuthProtocolV1Category.class)
+    @Category(PinUvAuthProtocolV1Test.class)
     public static class PinUvAuthV1Test extends PinUvAuthV2Test {
         @Override
         protected PinUvAuthProtocol getPinUvAuthProtocol() {

diff --git a/...d/src/androidTest/java/com/yubico/yubikit/testing/fido/Ctap2SessionInstrumentedTests.java b/...d/src/androidTest/java/com/yubico/yubikit/testing/fido/Ctap2SessionInstrumentedTests.java
@@ -18,7 +18,7 @@
 
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocol;
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocolV1;
-import com.yubico.yubikit.testing.PinUvAuthProtocolV1Category;
+import com.yubico.yubikit.testing.PinUvAuthProtocolV1Test;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -49,7 +49,7 @@ public void testCancelCborCommandAfterDelay() throws Throwable {
         }
     }
 
-    @Category(PinUvAuthProtocolV1Category.class)
+    @Category(PinUvAuthProtocolV1Test.class)
     public static class PinUvAuthV1Test extends PinUvAuthV2Test {
         @Override
         protected PinUvAuthProtocol getPinUvAuthProtocol() {

diff --git a/.../androidTest/java/com/yubico/yubikit/testing/fido/Ctap2SessionResetInstrumentedTests.java b/.../androidTest/java/com/yubico/yubikit/testing/fido/Ctap2SessionResetInstrumentedTests.java
@@ -16,7 +16,7 @@
 
 package com.yubico.yubikit.testing.fido;
 
-import com.yubico.yubikit.testing.AlwaysManualTestCategory;
+import com.yubico.yubikit.testing.AlwaysManualTest;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -33,7 +33,7 @@
  */
 public class Ctap2SessionResetInstrumentedTests extends FidoInstrumentedTests {
     @Test
-    @Category(AlwaysManualTestCategory.class)
+    @Category(AlwaysManualTest.class)
     public void testReset() throws Throwable {
         withCtap2Session(Ctap2SessionTests::testReset);
     }

diff --git a/...roidTest/java/com/yubico/yubikit/testing/fido/EnterpriseAttestationInstrumentedTests.java b/...roidTest/java/com/yubico/yubikit/testing/fido/EnterpriseAttestationInstrumentedTests.java
@@ -18,7 +18,7 @@
 
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocol;
 import com.yubico.yubikit.fido.ctap.PinUvAuthProtocolV1;
-import com.yubico.yubikit.testing.PinUvAuthProtocolV1Category;
+import com.yubico.yubikit.testing.PinUvAuthProtocolV1Test;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -54,7 +54,7 @@ public void testVendorFacilitatedEA() throws Throwable {
         }
     }
 
-    @Category(PinUvAuthProtocolV1Category.class)
+    @Category(PinUvAuthProtocolV1Test.class)
     public static class PinUvAuthV1Test extends PinUvAuthV2Test {
         @Override
         protected PinUvAuthProtocol getPinUvAuthProtocol() {

diff --git a/testing-android/src/androidTest/java/com/yubico/yubikit/testing/fido/FidoTests.java b/testing-android/src/androidTest/java/com/yubico/yubikit/testing/fido/FidoTests.java
@@ -16,7 +16,7 @@
 
 package com.yubico.yubikit.testing.fido;
 
-import com.yubico.yubikit.testing.AlwaysManualTestCategory;
+import com.yubico.yubikit.testing.AlwaysManualTest;
 
 import org.junit.experimental.categories.Categories;
 import org.junit.runner.RunWith;
@@ -41,6 +41,6 @@
         Ctap2BioEnrollmentInstrumentedTests.class,
         Ctap2SessionResetInstrumentedTests.class,
 })
-@Categories.ExcludeCategory(AlwaysManualTestCategory.class)
+@Categories.ExcludeCategory(AlwaysManualTest.class)
 public class FidoTests {
 }
diff --git a/.../src/androidTest/java/com/yubico/yubikit/testing/fido/UvDiscouragedInstrumentedTests.java b/.../src/androidTest/java/com/yubico/yubikit/testing/fido/UvDiscouragedInstrumentedTests.java
@@ -17,7 +17,7 @@
 package com.yubico.yubikit.testing.fido;
 
 import com.yubico.yubikit.fido.client.PinRequiredClientError;
-import com.yubico.yubikit.testing.AlwaysManualTestCategory;
+import com.yubico.yubikit.testing.AlwaysManualTest;
 import com.yubico.yubikit.testing.framework.FidoInstrumentedTests;
 
 import org.junit.Test;
@@ -33,7 +33,7 @@ public class UvDiscouragedInstrumentedTests extends FidoInstrumentedTests {
      * Skipped on FIPS approved devices.
      */
     @Test
-    @Category(AlwaysManualTestCategory.class)
+    @Category(AlwaysManualTest.class)
     public void testMakeCredentialGetAssertion() throws Throwable {
         withCtap2Session(BasicWebAuthnClientTests::testUvDiscouragedMcGa_noPin, false);
     }

diff --git a/...kit/testing/AlwaysManualTestCategory.java → ...ico/yubikit/testing/AlwaysManualTest.java b/...kit/testing/AlwaysManualTestCategory.java → ...ico/yubikit/testing/AlwaysManualTest.java
@@ -16,5 +16,5 @@
 
 package com.yubico.yubikit.testing;
 
-public interface AlwaysManualTestCategory {
+public interface AlwaysManualTest {
 }
diff --git a/.../testing/PinUvAuthProtocolV1Category.java → ...ikit/testing/PinUvAuthProtocolV1Test.java b/.../testing/PinUvAuthProtocolV1Category.java → ...ikit/testing/PinUvAuthProtocolV1Test.java
@@ -16,5 +16,5 @@
 
 package com.yubico.yubikit.testing;
 
-public interface PinUvAuthProtocolV1Category {
+public interface PinUvAuthProtocolV1Test {
 }