refactored ECJJava17IRTests to be parameterized

Author: jkhaliqi

cast/java/ecj/src/test/java/com/ibm/wala/cast/java/test/ECJJava17IRTest.java

@@ -34,7 +34,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class ECJJava17IRTest extends IRTests {
 
@@ -61,7 +64,7 @@ protected Iterable<Entrypoint> makeDefaultEntrypoints(IClassHierarchy cha) {
     return engine;
   }
 
-  private final IRAssertion checkBinaryLiterals =
+  private static final IRAssertion checkBinaryLiterals =
       new IRAssertion() {
         private final TypeReference testClass =
             TypeReference.findOrCreate(
@@ -107,18 +110,7 @@ public void check(CallGraph cg) {
         }
       };
 
-  @Test
-  public void testBinaryLiterals() throws IllegalArgumentException, CancelException, IOException {
-    runTest(
-        singlePkgTestSrc("javaonepointseven"),
-        rtJar,
-        simplePkgTestEntryPoint("javaonepointseven"),
-        Collections.singletonList(checkBinaryLiterals),
-        true,
-        null);
-  }
-
-  private final IRAssertion checkCatchMultipleExceptionTypes =
+  private static final IRAssertion checkCatchMultipleExceptionTypes =
       new IRAssertion() {
 
         private final TypeReference testClass =
@@ -161,18 +153,6 @@ public void check(CallGraph cg) {
         }
       };
 
-  @Test
-  public void testCatchMultipleExceptionTypes()
-      throws IllegalArgumentException, CancelException, IOException {
-    runTest(
-        singlePkgTestSrc("javaonepointseven"),
-        rtJar,
-        simplePkgTestEntryPoint("javaonepointseven"),
-        Collections.singletonList(checkCatchMultipleExceptionTypes),
-        true,
-        null);
-  }
-
   private static final List<IRAssertion> SiSAssertions =
       Collections.singletonList(
           new InstructionOperandAssertion(
@@ -183,49 +163,27 @@ public void testCatchMultipleExceptionTypes()
               1,
               new int[] {9, 58, 9, 67}));
 
-  @Test
-  public void testStringsInSwitch() throws IllegalArgumentException, CancelException, IOException {
-    runTest(
-        singlePkgTestSrc("javaonepointseven"),
-        rtJar,
-        simplePkgTestEntryPoint("javaonepointseven"),
-        SiSAssertions,
-        true,
-        null);
-  }
-
-  @Test
-  public void testTryWithResourcesStatement()
-      throws IllegalArgumentException, CancelException, IOException {
-    runTest(
-        singlePkgTestSrc("javaonepointseven"),
-        rtJar,
-        simplePkgTestEntryPoint("javaonepointseven"),
-        emptyList,
-        true,
-        null);
-  }
-
-  @Test
-  public void testTypeInferenceforGenericInstanceCreation()
-      throws IllegalArgumentException, CancelException, IOException {
-    runTest(
-        singlePkgTestSrc("javaonepointseven"),
-        rtJar,
-        simplePkgTestEntryPoint("javaonepointseven"),
-        emptyList,
-        true,
-        null);
+  static Stream<Arguments> java17IRTestNames() {
+    return Stream.of(
+        Arguments.of("BinaryLiterals", Collections.singletonList(checkBinaryLiterals)),
+        Arguments.of(
+            "CatchMultipleExceptionTypes",
+            Collections.singletonList(checkCatchMultipleExceptionTypes)),
+        Arguments.of("StringsInSwitch", SiSAssertions),
+        Arguments.of("TypeInferenceforGenericInstanceCreation", emptyList),
+        Arguments.of("TryWithResourcesStatement", emptyList),
+        Arguments.of("UnderscoresInNumericLiterals", emptyList));
   }
 
-  @Test
-  public void testUnderscoresInNumericLiterals()
+  @ParameterizedTest
+  @MethodSource("java17IRTestNames")
+  public void runJava17IRTests(String java17IRTestName, List<IRAssertion> ca)
       throws IllegalArgumentException, CancelException, IOException {
     runTest(
-        singlePkgTestSrc("javaonepointseven"),
+        singlePkgTestSrc("javaonepointseven", java17IRTestName),
         rtJar,
-        simplePkgTestEntryPoint("javaonepointseven"),
-        emptyList,
+        simplePkgTestEntryPoint("javaonepointseven", java17IRTestName),
+        ca,
         true,
         null);
   }