Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor tests #135

Merged
merged 9 commits into from
Aug 7, 2024
Merged

Refactor tests #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d865db2
Using constants names for test categories
DennisDyallo Aug 7, 2024
db005cf
Adding DeviceNotFoundHelper.cs and SkipAttributes
DennisDyallo Aug 7, 2024
c9d7fda
Removed unused classes
DennisDyallo Aug 7, 2024
532c235
Added remark on null serial numbers
DennisDyallo Aug 7, 2024
791814e
Restored these classes
DennisDyallo Aug 7, 2024
5a75c05
Now using GetTestDevice() for HsmTests
DennisDyallo Aug 7, 2024
e21f98e
Refactor and add get by serial method
DennisDyallo Aug 7, 2024
7db54c5
Use new method
DennisDyallo Aug 7, 2024
8ce0fde
Collect device selecting logic
DennisDyallo Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Yubico.YubiKey/src/Yubico/YubiKey/IYubiKeyDeviceInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Cryptography/RsaOaepTimingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

namespace Yubico.YubiKey.Cryptography
{
[Trait("Category", "Simple")]
[Trait(TraitTypes.Category, TestCategories.Simple)]
public class RsaOaepTimingTests
{
private const int IterationCount1024 = 200000;
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Cryptography/RsaP1TimingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

namespace Yubico.YubiKey.Cryptography
{
[Trait("Category", "Simple")]
[Trait(TraitTypes.Category, TestCategories.Simple)]
public class RsaP1TimingTests
{
private const int IterationCount1024 = 10000000;
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/BioEnrollTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/BioEnrollmentCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class BioEnrollmentCommandTests : NeedPinToken
{
public BioEnrollmentCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/ConfigCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class ConfigCommandTests : NeedPinToken
{
public ConfigCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/DeleteCredCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class DeleteCredCommandTests : SimpleIntegrationTestConnection
{
public DeleteCredCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/EnumCredsCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "FirmwareOrHardwareMissmatch")]
[Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
public class EnumCredsCommandTests : SimpleIntegrationTestConnection
{
public EnumCredsCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/EnumRpsCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "FirmwareOrHardwareMissmatch")]
[Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
public class EnumRpsCommandTests : SimpleIntegrationTestConnection
{
public EnumRpsCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/GetAssertionCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class GetAssertionCommandTests : NeedPinToken
{
public GetAssertionCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/GetKeyAgreeCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class GetKeyAgreeCommandTests : SimpleIntegrationTestConnection
{
public GetKeyAgreeCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/HmacSecretTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeCredBlobTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class MakeCredentialCommandTests : NeedPinToken
{
public MakeCredentialCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/MakeLargeBlobTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class MakeLargeBlobTests : NeedPinToken
{
public MakeLargeBlobTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/SetPinCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/Commands/UpdateUserInfoCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Fido2.Commands
{
[Trait("Category", "FirmwareOrHardwareMissmatch")]
[Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
public class UpdateUserInfoCommandTests : SimpleIntegrationTestConnection
{
public UpdateUserInfoCommandTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/ConfigTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Yubico.YubiKey.Fido2
{
[Trait("Category", "Simple")]
[Trait(TraitTypes.Category, TestCategories.Simple)]
public class ConfigTests : SimpleIntegrationTestConnection
{
public ConfigTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/CredMgmtTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/GetAuthenticatorInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/LargeBlobTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Yubico.YubiKey.Fido2
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class LargeBlobTests
{
static readonly byte[] _clientDataHash = {
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialBlobTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MakeCredentialGetAssertionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/MinPinLenTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
35 changes: 0 additions & 35 deletions Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/NoSerialNumberTests.cs
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/PinCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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`)
Expand All @@ -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`)
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/SimpleCredMgmtTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Yubico.YubiKey.Fido2
{
[Trait("Category", "FirmwareOrHardwareMissmatch")]
[Trait(TraitTypes.Category, TestCategories.FirmwareOrHardwareMismatch)]
public class SimpleCredMgmtTests : SimpleIntegrationTestConnection
{
public SimpleCredMgmtTests()
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Fido2/VerifyFpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

namespace Yubico.YubiKey.Fido2
{
[Trait("Category", "RequiresBio")]
[Trait(TraitTypes.Category, TestCategories.RequiresBio)]
public class VerifyFpTests : SimpleIntegrationTestConnection
{
public VerifyFpTests()
Expand Down
4 changes: 2 additions & 2 deletions Yubico.YubiKey/tests/integration/Yubico/YubiKey/HasFidoFeatureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Management/SetDeviceInfoCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace Yubico.YubiKey.Management
{
[Trait("Category", "Simple")]
[Trait(TraitTypes.Category, TestCategories.Simple)]
public class SetDeviceInfoCommandTests
{
[SkippableTheory(typeof(DeviceNotFoundException))]
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/CredentialTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
{
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/GetLargeData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/NoCollectorPasswordTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

namespace Yubico.YubiKey.Oath
{
[Trait("Category", "Simple")]
[Trait(TraitTypes.Category, TestCategories.Simple)]
public sealed class NoCollectorPasswordTests
{
[Fact]
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/OathSessionCredentialTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Yubico.YubiKey/tests/integration/Yubico/YubiKey/Oath/OathSessionPasswordTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Loading
Loading