refactor: remove the getTestName method in IRTests

Author: jkhaliqi

cast/java/build.gradle.kts

@@ -11,6 +11,7 @@ dependencies {
   api(projects.util)
   implementation(projects.shrike)
   testFixturesApi(libs.junit.jupiter.api)
+  testFixturesApi(libs.junit.jupiter.params)
   testFixturesApi(projects.core)
   testFixturesApi(projects.util)
   testFixturesImplementation(projects.cast)

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

@@ -60,7 +60,13 @@ protected Iterable<Entrypoint> makeDefaultEntrypoints(IClassHierarchy cha) {
   @Test
   public void testComments() throws IllegalArgumentException, CancelException, IOException {
     Pair<CallGraph, CallGraphBuilder<? super InstanceKey>> result =
-        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
+        runTest(
+            singleTestSrc("Comments"),
+            rtJar,
+            simpleTestEntryPoint("Comments"),
+            emptyList,
+            true,
+            null);
     for (CGNode node : result.fst.getNodes(testMethod)) {
       if (node.getMethod() instanceof AstMethod) {
         AstMethod m = (AstMethod) node.getMethod();

cast/java/src/testFixtures/java/com/ibm/wala/cast/java/test/IRTests.java

@@ -340,42 +340,22 @@ public void check(CallGraph cg) {
     }
   }
 
-  protected Collection<String> singleTestSrc() {
-    return Collections.singletonList(getTestSrcPath() + File.separator + singleJavaInputForTest());
+  protected Collection<String> singleTestSrc(String testName) {
+    return Collections.singletonList(getTestSrcPath() + File.separator + testName + ".java");
   }
 
-  protected Collection<String> singleTestSrc(final String folder) {
+  protected Collection<String> singleTestSrc(final String folder, String testName) {
     return Collections.singletonList(
-        getTestSrcPath() + File.separator + folder + File.separator + singleJavaInputForTest());
-  }
-
-  protected Collection<String> singlePkgTestSrc(String pkgName) {
-    return Collections.singletonList(
-        getTestSrcPath() + File.separator + singleJavaPkgInputForTest(pkgName));
+        getTestSrcPath() + File.separator + folder + File.separator + testName + ".java");
   }
 
   protected Collection<String> singlePkgTestSrc(String pkgName, String testName) {
     return Collections.singletonList(
         getTestSrcPath() + File.separator + pkgName + File.separator + testName + ".java");
   }
 
-  protected String getTestName() {
-    StackTraceElement stack[] = new Throwable().getStackTrace();
-    for (int i = 0; i <= stack.length; i++) {
-      if (stack[i].getMethodName().startsWith("test")) {
-        return stack[i].getMethodName();
-      }
-    }
-
-    throw new Error("test method not found");
-  }
-
-  protected String[] simpleTestEntryPoint() {
-    return new String[] {'L' + getTestName().substring(4)};
-  }
-
-  protected String[] simplePkgTestEntryPoint(String pkgName) {
-    return new String[] {"L" + pkgName + "/" + getTestName().substring(4)};
+  protected String[] simpleTestEntryPoint(String testName) {
+    return new String[] {'L' + testName};
   }
 
   protected String[] simplePkgTestEntryPoint(String pkgName, String testName) {
@@ -533,15 +513,11 @@ protected String getTestSrcPath() {
     return testSrcPath;
   }
 
-  protected String singleJavaInputForTest() {
-    return getTestName().substring(4) + ".java";
-  }
-
-  protected String singleInputForTest() {
-    return getTestName().substring(4);
+  protected String singleInputForTest(String testName) {
+    return testName;
   }
 
-  protected String singleJavaPkgInputForTest(String pkgName) {
-    return pkgName + File.separator + getTestName().substring(4) + ".java";
+  protected String singleJavaPkgInputForTest(String pkgName, String testName) {
+    return pkgName + File.separator + testName + ".java";
   }
 }

cast/java/src/testFixtures/java/com/ibm/wala/cast/java/test/Issue666Test.java

@@ -22,7 +22,13 @@ public Issue666Test(String projectName) {
   @Test
   public void testPeekErrorCase() throws CancelException, IOException {
     Pair<CallGraph, ?> result =
-        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
+        runTest(
+            singleTestSrc("PeekErrorCase"),
+            rtJar,
+            simpleTestEntryPoint("PeekErrorCase"),
+            emptyList,
+            true,
+            null);
 
     assert result != null;
 

cast/java/src/testFixtures/java/com/ibm/wala/cast/java/test/Issue667Test.java

@@ -24,7 +24,13 @@ public Issue667Test(String projectName) {
   @Test
   public void testDominanceFrontierCase() throws CancelException, IOException {
     Pair<CallGraph, ?> result =
-        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
+        runTest(
+            singleTestSrc("DominanceFrontierCase"),
+            rtJar,
+            simpleTestEntryPoint("DominanceFrontierCase"),
+            emptyList,
+            true,
+            null);
 
     MethodReference cm =
         MethodReference.findOrCreate(

cast/java/src/testFixtures/java/com/ibm/wala/cast/java/test/JLexTest.java

@@ -20,18 +20,12 @@ public JLexTest() {
     super(null);
   }
 
-  @Override
   protected String singleJavaInputForTest() {
     return "JLex";
   }
 
   @Test
   public void testJLex() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, new String[] {"LJLex/Main"}, emptyList, false, null);
-  }
-
-  @Override
-  protected String singleJavaPkgInputForTest(String pkgName) {
-    return "";
+    runTest(singleTestSrc("JLex"), rtJar, new String[] {"LJLex/Main"}, emptyList, false, null);
   }
 }