tests: refactor cert import tests

Author: DennisDyallo

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/ImportTests.cs

@@ -99,15 +99,10 @@ public void KeyAndCertImport(
             var testDevice = IntegrationTestDeviceEnumeration.GetTestDevice(testDeviceType);
             Assert.True(testDevice.EnabledUsbCapabilities.HasFlag(YubiKeyCapabilities.Piv));
 
-            using var pivSession = new PivSession(testDevice);
-            var isValid = PivSupport.ResetPiv(pivSession);
-            Assert.True(isValid);
-
-            var collectorObj = new Simple39KeyCollector();
-            pivSession.KeyCollector = collectorObj.Simple39KeyCollectorDelegate;
+            using var pivSession = GetSession(testDevice);
 
             var testPrivateKey = TestKeys.GetTestPrivateKey(keyType);
-            var testCert =TestKeys.GetTestCertificate(keyType);
+            var testCert = TestKeys.GetTestCertificate(keyType);
             var privateKey = AsnPrivateKeyDecoder.CreatePrivateKey(testPrivateKey.EncodedKey);
 
             pivSession.ImportPrivateKey(0x90, privateKey);
@@ -129,17 +124,14 @@ public void CertImport(
             var testDevice = IntegrationTestDeviceEnumeration.GetTestDevice(testDeviceType);
             Assert.True(testDevice.EnabledUsbCapabilities.HasFlag(YubiKeyCapabilities.Piv));
 
-            var isValid = SampleKeyPairs.GetMatchingKeyAndCert(keyType, out var cert, out var _);
-            Assert.True(isValid);
-
-            using var pivSession = new PivSession(testDevice);
-            var collectorObj = new Simple39KeyCollector();
-            pivSession.KeyCollector = collectorObj.Simple39KeyCollectorDelegate;
+            var testCertificate = TestKeys.GetTestCertificate(keyType);
+            var testX509Certificate = testCertificate.AsX509Certificate2();
 
-            pivSession.ImportCertificate(0x90, cert!);
+            using var pivSession = GetSession(testDevice);
+            pivSession.ImportCertificate(0x90, testX509Certificate);
 
-            var getCert = pivSession.GetCertificate(0x90);
-            Assert.True(getCert.Equals(cert));
+            var resultCert = pivSession.GetCertificate(0x90);
+            Assert.True(resultCert.Equals(testX509Certificate));
         }
 
         [SkippableTheory(typeof(NotSupportedException), typeof(DeviceNotFoundException))]
@@ -155,19 +147,16 @@ public void ImportCompressedCert(KeyType keyType, StandardTestDevice testDeviceT
             var testDevice = IntegrationTestDeviceEnumeration.GetTestDevice(testDeviceType);
             Assert.True(testDevice.EnabledUsbCapabilities.HasFlag(YubiKeyCapabilities.Piv));
 
-            var isValid = SampleKeyPairs.GetMatchingKeyAndCert(keyType, out var cert, out var _);
-            Assert.True(isValid);
-
-            using var pivSession = new PivSession(testDevice);
-            var collectorObj = new Simple39KeyCollector();
-            pivSession.KeyCollector = collectorObj.Simple39KeyCollectorDelegate;
+            var testCertificate = TestKeys.GetTestCertificate(keyType);
+            var testX509Certificate = testCertificate.AsX509Certificate2();
 
-            pivSession.ImportCertificate(0x91, cert!, true);
+            using var pivSession = GetSession(testDevice);
+            pivSession.ImportCertificate(0x91, testX509Certificate, true);
 
-            var getCert = pivSession.GetCertificate(0x91);
-            Assert.True(getCert.Equals(cert));
+            var resultCert = pivSession.GetCertificate(0x91);
+            Assert.True(resultCert.Equals(testX509Certificate));
         }
-
+        
         private static PivSession GetSession(
             IYubiKeyDevice testDevice)
         {