Use @MethodSource("argumentProvider")

Author: cYKatherine

src/test/java/com/uid2/shared/secure/AzureCCCoreAttestationServiceTest.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -20,6 +22,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -62,7 +65,7 @@ public void setup() throws AttestationException {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"azure-cc", "azure-cc-aks"})
+    @MethodSource("argumentProvider")
     public void testHappyPath(String azureProtocol) throws AttestationException {
         var provider = new AzureCCCoreAttestationService(alwaysPassTokenValidator, alwaysPassPolicyValidator, azureProtocol);
         provider.registerEnclave(ENCLAVE_ID);
@@ -73,7 +76,7 @@ public void testHappyPath(String azureProtocol) throws AttestationException {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"azure-cc", "azure-cc-aks"})
+    @MethodSource("argumentProvider")
     public void testSignatureCheckFailed_ClientError(String azureProtocol) throws AttestationException {
         var errorStr = "token signature validation failed";
         when(alwaysFailTokenValidator.validate(any(), any())).thenThrow(new AttestationClientException(errorStr, AttestationFailure.BAD_PAYLOAD));
@@ -87,7 +90,7 @@ public void testSignatureCheckFailed_ClientError(String azureProtocol) throws At
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"azure-cc", "azure-cc-aks"})
+    @MethodSource("argumentProvider")
     public void testSignatureCheckFailed_ServerError(String azureProtocol) throws AttestationException {
         when(alwaysFailTokenValidator.validate(any(), any())).thenThrow(new AttestationException("unknown server error"));
         var provider = new AzureCCCoreAttestationService(alwaysFailTokenValidator, alwaysPassPolicyValidator, azureProtocol);
@@ -99,7 +102,7 @@ public void testSignatureCheckFailed_ServerError(String azureProtocol) throws At
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"azure-cc", "azure-cc-aks"})
+    @MethodSource("argumentProvider")
     public void testPolicyCheckSuccess_ClientError(String azureProtocol) throws AttestationException {
         var errorStr = "policy validation failed";
         when(alwaysFailPolicyValidator.validate(any(), any())).thenThrow(new AttestationClientException(errorStr, AttestationFailure.BAD_PAYLOAD));
@@ -113,7 +116,7 @@ public void testPolicyCheckSuccess_ClientError(String azureProtocol) throws Atte
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"azure-cc", "azure-cc-aks"})
+    @MethodSource("argumentProvider")
     public void testPolicyCheckFailed_ServerError(String azureProtocol) throws AttestationException {
         when(alwaysFailPolicyValidator.validate(any(), any())).thenThrow(new AttestationException("unknown server error"));
         var provider = new AzureCCCoreAttestationService(alwaysFailTokenValidator, alwaysFailPolicyValidator, azureProtocol);
@@ -125,7 +128,7 @@ public void testPolicyCheckFailed_ServerError(String azureProtocol) throws Attes
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"azure-cc", "azure-cc-aks"})
+    @MethodSource("argumentProvider")
     public void testEnclaveNotRegistered(String azureProtocol) throws AttestationException {
         var provider = new AzureCCCoreAttestationService(alwaysFailTokenValidator, alwaysPassPolicyValidator, azureProtocol);
         attest(provider, ar -> {
@@ -141,4 +144,11 @@ private static void attest(ICoreAttestationService provider, Handler<AsyncResult
                 PUBLIC_KEY.getBytes(StandardCharsets.UTF_8),
                 handler);
     }
+
+    static Stream<Arguments> argumentProvider() {
+        return Stream.of(
+                Arguments.of("azure-cc"),
+                Arguments.of("azure-cc-aks")
+        );
+    }
 }