Add inner class test for JUnit entrypoints (#1409)

Additional test for #1398.
wala · Jun 24, 2024 · dba0a06 · dba0a06
1 parent df5caa4
commit dba0a06
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/core/src/test/java/com/ibm/wala/core/tests/cha/JunitEntrypointSupportTest.java b/core/src/test/java/com/ibm/wala/core/tests/cha/JunitEntrypointSupportTest.java
@@ -1,6 +1,8 @@
 package com.ibm.wala.core.tests.cha;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasToString;
 
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
@@ -25,12 +27,16 @@ public void basic() throws ClassHierarchyException, IllegalArgumentException, IO
     ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     List<Entrypoint> entrypoints =
         Iterator2Collection.toList(JUnitEntryPoints.make(cha).iterator());
-    assertEquals(2, entrypoints.size());
-    assertEquals(
-        "< Application, Ljunit/JunitTests, test1()V >([<Application,Ljunit/JunitTests>])",
-        entrypoints.get(0).toString());
-    assertEquals(
-        "< Application, Ljunit/JunitTests, <init>()V >([<Application,Ljunit/JunitTests>])",
-        entrypoints.get(1).toString());
+    assertThat(
+        entrypoints,
+        contains(
+            hasToString(
+                "< Application, Ljunit/JunitTests$A, test2()V >([<Application,Ljunit/JunitTests$A>])"),
+            hasToString(
+                "< Application, Ljunit/JunitTests$A, <init>()V >([<Application,Ljunit/JunitTests$A>])"),
+            hasToString(
+                "< Application, Ljunit/JunitTests, test1()V >([<Application,Ljunit/JunitTests>])"),
+            hasToString(
+                "< Application, Ljunit/JunitTests, <init>()V >([<Application,Ljunit/JunitTests>])")));
   }
 }
diff --git a/core/src/testSubjects/java/junit/JunitTests.java b/core/src/testSubjects/java/junit/JunitTests.java
@@ -6,4 +6,10 @@ public class JunitTests {
 
   @Test
   public void test1() {}
+
+  public static class A {
+
+    @Test
+    public void test2() {}
+  }
 }