tests: rename class

Author: DennisDyallo

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Scp/ScpTestUtilities.cs renamed to Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/FipsTestUtilities.cs

@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Xunit;
-using Yubico.YubiKey.Piv;
+using Yubico.YubiKey.Scp;
 
-namespace Yubico.YubiKey.Scp
+namespace Yubico.YubiKey.Piv
 {
-    public static class ScpTestUtilities
+    public static class FipsTestUtilities
     {
         public static readonly byte[] FipsPin = {
             0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88
@@ -39,9 +38,9 @@ public static void SetFipsApprovedCredentials(PivSession session)
             session.ResetApplication();
             session.KeyCollector = new Simple39KeyCollector().Simple39KeyCollectorDelegate;
 
-            session.TryChangePin(Simple39KeyCollector.CollectPin(), FipsPin, out _);
-            session.TryChangePuk(Simple39KeyCollector.CollectPuk(), FipsPuk, out _);
-            session.TryChangeManagementKey(Simple39KeyCollector.CollectMgmtKey(), FipsManagementKey, PivTouchPolicy.Always);
+            session.TryChangePin(PivSessionIntegrationTestBase.DefaultPin, FipsPin, out _);
+            session.TryChangePuk(PivSessionIntegrationTestBase.DefaultPuk, FipsPuk, out _);
+            session.TryChangeManagementKey(PivSessionIntegrationTestBase.DefaultManagementKey, FipsManagementKey, PivTouchPolicy.Always);
             Assert.True(session.TryVerifyPin(FipsPin, out _));
         }
 

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Scp/Scp03Tests.cs

@@ -388,9 +388,9 @@ public void Scp03_PivSession_TryVerifyPinAndGetMetaData_Succeeds(
 
             if (desiredDeviceType == StandardTestDevice.Fw5Fips)
             {
-                ScpTestUtilities.SetFipsApprovedCredentials(pivSession);
+                FipsTestUtilities.SetFipsApprovedCredentials(pivSession);
 
-                var isVerified = pivSession.TryVerifyPin(ScpTestUtilities.FipsPin, out _);
+                var isVerified = pivSession.TryVerifyPin(FipsTestUtilities.FipsPin, out _);
                 Assert.True(isVerified);
             }
             else
@@ -536,8 +536,8 @@ private byte[] GetValidPin(
             byte[] pin;
             if (desiredDeviceType == StandardTestDevice.Fw5Fips)
             {
-                ScpTestUtilities.SetFipsApprovedCredentials(testDevice, keyParams);
-                pin = ScpTestUtilities.FipsPin;
+                FipsTestUtilities.SetFipsApprovedCredentials(testDevice, keyParams);
+                pin = FipsTestUtilities.FipsPin;
             }
             else
             {

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Scp/Scp11Tests.cs

@@ -77,7 +77,7 @@ public void Scp11b_App_PivSession_Operations_Succeeds(
             session.KeyCollector = new Simple39KeyCollector().Simple39KeyCollectorDelegate;
             if (desiredDeviceType == StandardTestDevice.Fw5Fips)
             {
-                ScpTestUtilities.SetFipsApprovedCredentials(session);
+                FipsTestUtilities.SetFipsApprovedCredentials(session);
             }
 
             var result = session.GenerateKeyPair(PivSlot.Retired12, KeyType.ECP256, PivPinPolicy.Always);