tests: added ability to select usbcbio

Author: DennisDyallo

Yubico.YubiKey/tests/utilities/Yubico/YubiKey/TestUtilities/IntegrationTestDeviceEnumeration.cs

@@ -116,7 +116,9 @@ public static IList<IYubiKeyDevice> GetTestDevices(
                 .FindByTransport(transport)
                 .Where(IsAllowedKey)
                 .ToList();
-return devices;
+            
+            return devices;
+            
             static bool IsAllowedKey(
                 IYubiKeyDevice key)
                 => key.SerialNumber == null ||

Yubico.YubiKey/tests/utilities/Yubico/YubiKey/TestUtilities/TestDeviceSelection.cs

@@ -89,22 +89,21 @@ public static IYubiKeyDevice SelectByStandardTestDevice(
                 StandardTestDevice.Fw4Fips => SelectDevice(4, isFipsSeries: true),
                 StandardTestDevice.Fw5 => SelectDevice(5),
                 StandardTestDevice.Fw5Fips => SelectDevice(5, isFipsSeries: true),
-                StandardTestDevice.Fw5Bio => SelectDevice(5, formFactor: FormFactor.UsbABiometricKeychain),
+                StandardTestDevice.Fw5Bio => SelectDevice(5,  [FormFactor.UsbCBiometricKeychain, FormFactor.UsbABiometricKeychain]),
                 _ => throw new ArgumentException("Invalid test device value.", nameof(testDeviceType)),
             };
 
             IYubiKeyDevice SelectDevice(
                 int majorVersion,
-                FormFactor? formFactor = null,
+                IEnumerable<FormFactor>? formFactors = null,
                 bool isFipsSeries = false)
             {
                 IYubiKeyDevice device = null!;
                 try
                 {
-                    bool MatchingDeviceSelector(
-                        IYubiKeyDevice d) =>
+                    bool MatchingDeviceSelector(IYubiKeyDevice d) =>
                         d.FirmwareVersion.Major == majorVersion &&
-                        (formFactor is null || d.FormFactor == formFactor) &&
+                        (formFactors is null || formFactors.Contains(d.FormFactor)) &&
                         d.IsFipsSeries == isFipsSeries;
 
                     device = devicesVersionFiltered.First(MatchingDeviceSelector);