Merge PR #135

Yubico · Aug 7, 2024 · ffcd85b · ffcd85b
2 parents b9e6c16 + 8ce0fde
commit ffcd85b
Show file tree

Hide file tree

Showing 78 changed files with 251 additions and 202 deletions.
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/IYubiKeyDeviceInfo.cs b/Yubico.YubiKey/src/Yubico/YubiKey/IYubiKeyDeviceInfo.cs
@@ -56,6 +56,7 @@ public interface IYubiKeyDeviceInfo
 
         /// <summary>
         /// The serial number of the YubiKey, if one is present.
+        /// <remarks>Security Keys don't have serial numbers</remarks>
         /// </summary>
         public int? SerialNumber { get; }
 

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Cryptography/RsaOaepTimingTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Cryptography/RsaOaepTimingTests.cs
@@ -21,7 +21,7 @@
 
 namespace Yubico.YubiKey.Cryptography
 {
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public class RsaOaepTimingTests
     {
         private const int IterationCount1024 = 200000;

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Cryptography/RsaP1TimingTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Cryptography/RsaP1TimingTests.cs
@@ -21,7 +21,7 @@
 
 namespace Yubico.YubiKey.Cryptography
 {
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public class RsaP1TimingTests
     {
         private const int IterationCount1024 = 10000000;

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs
@@ -21,7 +21,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class BioEnrollTests : SimpleIntegrationTestConnection
     {
         // Set to 0 meaning don't cancel.

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/BioEnrollmentCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/BioEnrollmentCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class BioEnrollmentCommandTests : NeedPinToken
     {
         public BioEnrollmentCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/ConfigCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/ConfigCommandTests.cs
@@ -18,7 +18,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class ConfigCommandTests : NeedPinToken
     {
         public ConfigCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/DeleteCredCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/DeleteCredCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class DeleteCredCommandTests : SimpleIntegrationTestConnection
     {
         public DeleteCredCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/EnumCredsCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/EnumCredsCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "FirmwareOrHardwareMissmatch")]
+    [Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
     public class EnumCredsCommandTests : SimpleIntegrationTestConnection
     {
         public EnumCredsCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/EnumRpsCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/EnumRpsCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "FirmwareOrHardwareMissmatch")]
+    [Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
     public class EnumRpsCommandTests : SimpleIntegrationTestConnection
     {
         public EnumRpsCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/GetAssertionCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/GetAssertionCommandTests.cs
@@ -18,7 +18,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class GetAssertionCommandTests : NeedPinToken
     {
         public GetAssertionCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/GetKeyAgreeCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/GetKeyAgreeCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class GetKeyAgreeCommandTests : SimpleIntegrationTestConnection
     {
         public GetKeyAgreeCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/HmacSecretTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/HmacSecretTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class HmacSecretTests : SimpleIntegrationTestConnection
     {
         private readonly byte[] _pin;

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeCredBlobTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeCredBlobTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class MakeCredBlobTests : NeedPinToken
     {
         private readonly byte[] _clientDataHash = {

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class MakeCredentialCommandTests : NeedPinToken
     {
         public MakeCredentialCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeLargeBlobTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeLargeBlobTests.cs
@@ -21,7 +21,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class MakeLargeBlobTests : NeedPinToken
     {
         public MakeLargeBlobTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/SetPinCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/SetPinCommandTests.cs
@@ -21,7 +21,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class SetPinCommandTests : SimpleIntegrationTestConnection
     {
         private const int Fido2AuthPin = 1;

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/UpdateUserInfoCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/UpdateUserInfoCommandTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
-    [Trait("Category", "FirmwareOrHardwareMissmatch")]
+    [Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
     public class UpdateUserInfoCommandTests : SimpleIntegrationTestConnection
     {
         public UpdateUserInfoCommandTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs
@@ -20,7 +20,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public class ConfigTests : SimpleIntegrationTestConnection
     {
         public ConfigTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs
@@ -20,7 +20,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class CredMgmtTests : IClassFixture<BioFido2Fixture>
     {
         private readonly BioFido2Fixture _bioFido2Fixture;

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/GetAuthenticatorInfoTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/GetAuthenticatorInfoTests.cs
@@ -14,13 +14,14 @@
 
 using System.Linq;
 using Xunit;
+using Yubico.YubiKey.TestUtilities;
 
 namespace Yubico.YubiKey.Fido2
 {
     public class GetAuthenticatorInfoTests
     {
         [Fact]
-        [Trait("Category", "Simple")]
+        [Trait(TraitTypes.Category, TestCategories.Simple)]
         public void GetAuthenticator_Succeeds()
         {
             IYubiKeyDevice yubiKey = YubiKeyDevice.FindAll().First();

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs
@@ -20,7 +20,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class LargeBlobTests
     {
         static readonly byte[] _clientDataHash = {

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs
@@ -25,7 +25,7 @@ public class MakeCredentialBlobTests
         [Fact]
         public void CredBlobExtension_Correct()
         {
-            IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevices()[0];
+            IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevice();
             IYubiKeyConnection connection = yubiKeyDevice.Connect(YubiKeyApplication.Fido2);
 
             var getInfoCmd = new GetInfoCommand();

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs
@@ -31,7 +31,7 @@ public class MakeCredentialGetAssertionTests
         static readonly RelyingParty _rp = new RelyingParty("relyingparty1");
 
         // This test requires user to touch the device.
-        [Fact, Trait("Category", "RequiresTouch")]
+        [Fact, Trait(TraitTypes.Category, TestCategories.RequiresTouch)]
         public void MakeCredential_NonDiscoverable_GetAssertion_Succeeds()
         {
             IYubiKeyDevice yubiKeyDevice = YubiKeyDevice.FindByTransport(Transport.HidFido).First();
@@ -85,7 +85,7 @@ public void MakeCredential_NonDiscoverable_GetAssertion_Succeeds()
         }
 
         // This test requires user to touch the device.
-        [Fact, Trait("Category", "RequiresTouch")]
+        [Fact, Trait(TraitTypes.Category, TestCategories.RequiresTouch)]
         public void MakeCredential_NoName_GetAssertion_Succeeds()
         {
             IYubiKeyDevice yubiKeyDevice = YubiKeyDevice.FindByTransport(Transport.HidFido).First();
@@ -124,7 +124,7 @@ public void MakeCredential_NoName_GetAssertion_Succeeds()
         }
 
         // This test requires user to touch the device.
-        [Fact, Trait("Category", "RequiresTouch")]
+        [Fact, Trait(TraitTypes.Category, TestCategories.RequiresTouch)]
         public void MakeCredential_MultipleCredentials_GetAssertion_ReturnsMultipleAssertions()
         {
             IYubiKeyDevice yubiKeyDevice = YubiKeyDevice.FindByTransport(Transport.HidFido).First();

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs
@@ -42,7 +42,7 @@ public MinPinLenTests()
         }
 
         [Fact]
-        [Trait("Category", "Simple")]
+        [Trait(TraitTypes.Category, TestCategories.Simple)]
         public void GetMinPinFromCredential_Succeeds()
         {
             using (var fido2Session = new Fido2Session(Device))

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/NoSerialNumberTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/NoSerialNumberTests.cs
diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs
@@ -17,13 +17,14 @@
 using System.Text;
 using Xunit;
 using Yubico.YubiKey.Fido2.Commands;
+using Yubico.YubiKey.TestUtilities;
 
 namespace Yubico.YubiKey.Fido2
 {
     public class PinCollectionTests
     {
         [Fact]
-        [Trait("Category", "RequiresSetup")]
+        [Trait(TraitTypes.Category, TestCategories.RequiresSetup)]
         public void PinOperations_Succeed()
         {
             // Assumption - the YubiKey returned has a new or reset FIDO2 application with no PIN set.
@@ -83,7 +84,7 @@ public void PinOperations_Succeed()
         }
 
         [Fact]
-        [Trait("Category", "RequiresSetup")]
+        [Trait(TraitTypes.Category, TestCategories.RequiresSetup)]
         public void UvOperations_Succeed()
         {
             // Test assumptions: PIN is already set to 123456 (UTF-8 chars, not the number `123456`)
@@ -99,7 +100,7 @@ public void UvOperations_Succeed()
         }
 
         [Fact]
-        [Trait("Category", "RequiresSetup")]
+        [Trait(TraitTypes.Category, TestCategories.RequiresSetup)]
         public void InvalidPinFollowedByValidPin_Succeeds()
         {
             // Test assumption: PIN is already set to 123456 (UTF-8 chars, not the number `123456`)

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/SimpleCredMgmtTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/SimpleCredMgmtTests.cs
@@ -20,7 +20,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait("Category", "FirmwareOrHardwareMissmatch")]
+    [Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
     public class SimpleCredMgmtTests : SimpleIntegrationTestConnection
     {
         public SimpleCredMgmtTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs
@@ -20,7 +20,7 @@
 
 namespace Yubico.YubiKey.Fido2
 {
-    [Trait("Category", "RequiresBio")]
+    [Trait(TraitTypes.Category, TestCategories.RequiresBio)]
     public class VerifyFpTests : SimpleIntegrationTestConnection
     {
         public VerifyFpTests()

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/HasFidoFeatureTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/HasFidoFeatureTests.cs
@@ -33,7 +33,7 @@ public void HasFeature_ApplicationOTP_Correct()
         [Fact]
         public void HasFeature_ApplicationU2F_Correct()
         {
-            IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevices().First();
+            IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevice();
             bool expectedResult = true;
 
             //Can this be removed?
@@ -50,7 +50,7 @@ public void HasFeature_ApplicationU2F_Correct()
         [Fact]
         public void HasFeature_ApplicationFido2_Correct()
         {
-            IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevices().First();
+            IYubiKeyDevice yubiKeyDevice = IntegrationTestDeviceEnumeration.GetTestDevice();
             bool expectedResult = true;
             if (!yubiKeyDevice.IsSkySeries && yubiKeyDevice.FirmwareVersion.Major < 5)
             {

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Management/SetDeviceInfoCommandTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Management/SetDeviceInfoCommandTests.cs
@@ -18,7 +18,7 @@
 
 namespace Yubico.YubiKey.Management
 {
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public class SetDeviceInfoCommandTests
     {
         [SkippableTheory(typeof(DeviceNotFoundException))]

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/CredentialTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/CredentialTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Oath
 {
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     [TestCaseOrderer(PriorityOrderer.TypeName, PriorityOrderer.AssembyName)]
     public class CredentialTests : IClassFixture<CredentialFixture>
     {

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/GetLargeData.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/GetLargeData.cs
@@ -24,7 +24,7 @@ namespace Yubico.YubiKey.Oath
     // retrieve large amounts of data that spans more
     // than one APDU. For more information, see
     // Pipelines.ResponseChainingTransform.
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public sealed class GetLargeData
     {
         private static readonly Random random = new Random();

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/NoCollectorPasswordTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/NoCollectorPasswordTests.cs
@@ -19,7 +19,7 @@
 
 namespace Yubico.YubiKey.Oath
 {
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public sealed class NoCollectorPasswordTests
     {
         [Fact]

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/OathSessionCredentialTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/OathSessionCredentialTests.cs
@@ -20,7 +20,7 @@
 namespace Yubico.YubiKey.Oath
 {
     [TestCaseOrderer(PriorityOrderer.TypeName, PriorityOrderer.AssembyName)]
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public sealed class OathSessionCredentialTests : IClassFixture<CredentialFixture>
     {
         // Shared object instance across tests.

diff --git a/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/OathSessionPasswordTests.cs b/Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/OathSessionPasswordTests.cs
@@ -18,7 +18,7 @@
 namespace Yubico.YubiKey.Oath
 {
     [TestCaseOrderer(PriorityOrderer.TypeName, PriorityOrderer.AssembyName)]
-    [Trait("Category", "Simple")]
+    [Trait(TraitTypes.Category, TestCategories.Simple)]
     public sealed class OathSessionPasswordTests
     {
         [Theory, TestPriority(0)]