Merge pull request #1927 from aws/salande/revert-test

Revert "Replacing @theory annotated test case to @parameterized test …

Author: cenedhryn

http-clients/aws-crt-client/pom.xml

@@ -187,7 +187,7 @@
                             <value>false</value>
                         </property>
                     </properties>
-                    <threadCount>1</threadCount>
+                    <threadCountClasses>1</threadCountClasses>
                 </configuration>
                 <dependencies>
                     <dependency>

http-clients/aws-crt-client/src/it/java/software/amazon/awssdk/http/crt/AwsCrtClientCallingPatternIntegrationTest.java

@@ -18,20 +18,19 @@
 import static software.amazon.awssdk.testutils.service.AwsTestBase.CREDENTIALS_PROVIDER_CHAIN;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
 import org.junit.Assert;
-import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.FromDataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
@@ -41,9 +40,11 @@
 import software.amazon.awssdk.services.kms.model.GenerateRandomResponse;
 import software.amazon.awssdk.utils.AttributeMap;
 
+
 /**
  * Test many possible different calling patterns that users might do, and make sure everything works.
  */
+@RunWith(Theories.class)
 public class AwsCrtClientCallingPatternIntegrationTest {
     private final static String KEY_ALIAS = "alias/aws-sdk-java-v2-integ-test";
     private final static Region REGION = Region.US_EAST_1;
@@ -108,31 +109,38 @@ private boolean testWithNewClient(int eventLoopSize, int numberOfRequests) {
         }
     }
 
-    static Integer[] eventLoopValues = {1, 4};
-    /* Don't use 1 connection Pool of size 1, otherwise test takes too long */
-    static Integer[] connectionsValues = {10, 100};
-    static Integer[] requestValues = {1, 25, 250};
-    static Integer[] parallelClientValues = {1, 2, 8};
-    static Boolean[] sharedClientValue = {true, false};
-
-    private static Stream<Arguments> permutationsOfCrtCallParameters() {
-        return Arrays.stream(eventLoopValues).flatMap(
-            eventLoops -> Arrays.stream(connectionsValues).flatMap(
-                connections -> Arrays.stream(requestValues).flatMap(
-                    requests -> Arrays.stream(parallelClientValues).flatMap(
-                        parallelClients -> Arrays.stream(sharedClientValue).map(
-                            sharedClients -> Arguments.of(eventLoops, connections, requests, parallelClients, sharedClients))))));
+    @DataPoints("EventLoop")
+    public static int[] eventLoopValues(){
+        return new int[]{1, 4};
+    }
+
+    @DataPoints("ConnectionPool")
+    public static int[] connectionsValues(){
+        /* Don't use 1 connection Pool of size 1, otherwise test takes too long */
+        return new int[]{10, 100};
+    }
+
+    @DataPoints("NumRequests")
+    public static int[] requestValues(){
+        return new int[]{1, 25, 250};
+    }
+
+    @DataPoints("ParallelClients")
+    public static int[] parallelClientValues(){
+        return new int[]{1, 2, 8};
+    }
+
+    @DataPoints("SharedClient")
+    public static boolean[] sharedClientValue(){
+        return new boolean[]{true, false};
     }
 
-    // Timeout set to 4 times of Avg execution of this test 4*150
-    @Timeout(600)
-    @ParameterizedTest
-    @MethodSource("permutationsOfCrtCallParameters")
-    public void checkAllCombinations(int eventLoopSize,
-                                     int connectionPoolSize,
-                                     int numberOfRequests,
-                                     int numberOfParallelClients,
-                                     boolean useSharedClient) {
+    @Theory
+    public void checkAllCombinations(@FromDataPoints("EventLoop") int eventLoopSize,
+                                     @FromDataPoints("ConnectionPool") int connectionPoolSize,
+                                     @FromDataPoints("NumRequests") int numberOfRequests,
+                                     @FromDataPoints("ParallelClients") int numberOfParallelClients,
+                                     @FromDataPoints("SharedClient") boolean useSharedClient) throws Exception {
 
         try {