fix: discover inherited test methods when running child classes

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-child/.classpath

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+        <attributes>
+            <attribute name="test" value="true"/>
+        </attributes>
+    </classpathentry>
+    <classpathentry kind="src" path="/inheritance-parent"/>
+    <classpathentry kind="con"
+        path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
+    <classpathentry kind="output" path="target/test-classes"/>
+</classpath>

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-child/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+    <name>inheritance-child</name>
+    <comment></comment>
+    <projects>
+        <project>inheritance-parent</project>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments></arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
+</projectDescription>

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-child/src/test/java/example/InheritanceChildTest.java

@@ -0,0 +1,9 @@
+package example;
+
+import org.junit.jupiter.api.Test;
+
+public class InheritanceChildTest extends InheritanceBaseTest {
+    @Test
+    void child() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-junit4/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+        <attributes>
+            <attribute name="test" value="true"/>
+        </attributes>
+    </classpathentry>
+    <classpathentry kind="con"
+        path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+    <classpathentry kind="output" path="target/test-classes"/>
+</classpath>

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-junit4/.project

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+    <name>inheritance-junit4</name>
+    <comment></comment>
+    <projects></projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments></arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
+</projectDescription>

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-junit4/src/test/java/example/JUnit4BaseTest.java

@@ -0,0 +1,9 @@
+package example;
+
+import org.junit.Test;
+
+public class JUnit4BaseTest {
+    @Test
+    public void inherited() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-junit4/src/test/java/example/JUnit4ChildTest.java

@@ -0,0 +1,7 @@
+package example;
+
+public class JUnit4ChildTest extends JUnit4BaseTest {
+    @Override
+    public void inherited() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-parent/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+        <attributes>
+            <attribute name="test" value="true"/>
+        </attributes>
+    </classpathentry>
+    <classpathentry kind="con"
+        path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
+    <classpathentry kind="output" path="target/test-classes"/>
+</classpath>

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-parent/.project

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+    <name>inheritance-parent</name>
+    <comment></comment>
+    <projects></projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments></arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+    </natures>
+</projectDescription>

java-extension/com.microsoft.java.test.plugin.test/projects/inheritance-parent/src/test/java/example/InheritanceBaseTest.java

@@ -0,0 +1,9 @@
+package example;
+
+import org.junit.jupiter.api.Test;
+
+public class InheritanceBaseTest {
+    @Test
+    void base() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/preview-junit/src/test/java/example/InheritanceBaseTest.java

@@ -0,0 +1,9 @@
+package example;
+
+import org.junit.jupiter.api.Test;
+
+public class InheritanceBaseTest {
+    @Test
+    void base() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/preview-junit/src/test/java/example/InheritanceChildTest.java

@@ -0,0 +1,9 @@
+package example;
+
+import org.junit.jupiter.api.Test;
+
+public class InheritanceChildTest extends InheritanceBaseTest {
+    @Test
+    void child() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/preview-junit/src/test/java/example/InheritanceOverrideTest.java

@@ -0,0 +1,14 @@
+package example;
+
+import org.junit.jupiter.api.Test;
+
+public class InheritanceOverrideTest extends InheritanceBaseTest {
+    @Test
+    @Override
+    void base() {
+    }
+
+    @Test
+    void extra() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/projects/preview-junit/src/test/java/example/InheritanceUnannotatedOverrideTest.java

@@ -0,0 +1,7 @@
+package example;
+
+public class InheritanceUnannotatedOverrideTest extends InheritanceBaseTest {
+    @Override
+    void base() {
+    }
+}

java-extension/com.microsoft.java.test.plugin.test/src/com/microsoft/java/test/plugin/launchers/JUnitLaunchConfigurationDelegateTest.java

@@ -28,6 +28,7 @@
 import org.junit.Test;
 
 import com.microsoft.java.test.plugin.AbstractProjectsManagerBasedTest;
+import com.microsoft.java.test.plugin.WorkspaceHelper;
 import com.microsoft.java.test.plugin.model.Response;
 import com.google.gson.Gson;
 
@@ -82,4 +83,28 @@ public void testAddOpensForAllSelectedPackagesInModularProject() throws Exceptio
         assertEquals("--add-opens", vmArguments.get(vmArguments.indexOf(secondPackageOpen) - 1));
     }
 
+        @Test
+        public void testInheritedMethodLaunchesAgainstChildClass() throws Exception {
+                importProjects(Arrays.asList("inheritance-parent", "inheritance-child"));
+                final IProject childProject = WorkspaceHelper.getProject("inheritance-child");
+                final IJavaProject childJavaProject = JavaCore.create(childProject);
+                final IType parentType = JavaCore.create(WorkspaceHelper.getProject("inheritance-parent"))
+                                .findType("example.InheritanceBaseTest");
+
+                final Map<String, Object> request = new LinkedHashMap<>();
+                request.put("projectName", childProject.getName());
+                request.put("testLevel", 6);
+                request.put("testKind", 0);
+                request.put("testNames", Arrays.asList(parentType.getMethod("base", new String[0]).getHandleIdentifier()));
+                request.put("executionClassNames", Arrays.asList("example.InheritanceChildTest"));
+
+                final Response<JUnitLaunchArguments> response = JUnitLaunchUtils.resolveLaunchArgument(
+                                Arrays.asList(new Gson().toJson(request)), new NullProgressMonitor());
+
+                assertEquals(0, response.getStatus());
+                assertEquals(childJavaProject.getElementName(), response.getBody().projectName);
+                assertTrue(Arrays.asList(response.getBody().programArguments)
+                                .contains("example.InheritanceChildTest:base"));
+        }
+
 }

java-extension/com.microsoft.java.test.plugin.test/src/com/microsoft/java/test/plugin/util/TestSearchUtilsTest.java

@@ -34,6 +34,7 @@
 
 import com.microsoft.java.test.plugin.AbstractProjectsManagerBasedTest;
 import com.microsoft.java.test.plugin.model.JavaTestItem;
+import com.microsoft.java.test.plugin.WorkspaceHelper;
 
 public class TestSearchUtilsTest extends AbstractProjectsManagerBasedTest {
 
@@ -77,10 +78,12 @@ public void testDiscoverJUnit5TestsWithOlderPreviewSource() throws Exception {
         final List<JavaTestItem> packages = TestSearchUtils.findTestPackagesAndTypes(
                 Arrays.asList(javaProject.getHandleIdentifier()), new NullProgressMonitor());
         assertEquals(1, packages.size());
-        assertEquals(3, packages.get(0).getChildren().size());
+        assertEquals(7, packages.get(0).getChildren().size());
         assertTrue(packages.get(0).getChildren().stream().anyMatch(item -> "MiniTest".equals(item.getLabel())));
         assertTrue(packages.get(0).getChildren().stream().anyMatch(item -> "SiblingTest".equals(item.getLabel())));
         assertTrue(packages.get(0).getChildren().stream().anyMatch(item -> "NestedOnlyTest".equals(item.getLabel())));
+        assertTrue(packages.get(0).getChildren().stream()
+                .anyMatch(item -> "InheritanceChildTest".equals(item.getLabel())));
 
         final List<JavaTestItem> methods = TestSearchUtils.findDirectTestChildrenForClass(
                 Arrays.asList(type.getHandleIdentifier()), new NullProgressMonitor());
@@ -94,4 +97,86 @@ public void testDiscoverJUnit5TestsWithOlderPreviewSource() throws Exception {
         assertEquals("Child", nestedChildren.get(0).getLabel());
         assertEquals(JavaCore.ENABLED, javaProject.getOption(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, true));
     }
+
+    @Test
+    public void testDiscoverInheritedTestMethods() throws Exception {
+        final IProject project = importProjects("preview-junit").get(0);
+        final IJavaProject javaProject = JavaCore.create(project);
+        final IType childType = javaProject.findType("example.InheritanceChildTest");
+        assertNotNull(childType);
+
+        final List<JavaTestItem> childMethods = TestSearchUtils.findDirectTestChildrenForClass(
+                Arrays.asList(childType.getHandleIdentifier()), new NullProgressMonitor());
+        assertEquals(2, childMethods.size());
+        assertTrue(childMethods.stream().anyMatch(
+                item -> "example.InheritanceChildTest#child()".equals(item.getFullName())));
+        assertTrue(childMethods.stream().anyMatch(
+                item -> "example.InheritanceChildTest#base()".equals(item.getFullName())));
+        for (final JavaTestItem item : childMethods) {
+            assertTrue(item.getId().startsWith(item.getProjectName() + "@example.InheritanceChildTest#"));
+        }
+
+        final IType baseType = javaProject.findType("example.InheritanceBaseTest");
+        final List<JavaTestItem> baseMethods = TestSearchUtils.findDirectTestChildrenForClass(
+                Arrays.asList(baseType.getHandleIdentifier()), new NullProgressMonitor());
+        assertEquals(1, baseMethods.size());
+        assertEquals("example.InheritanceBaseTest#base()", baseMethods.get(0).getFullName());
+
+        final IType overrideType = javaProject.findType("example.InheritanceOverrideTest");
+        final List<JavaTestItem> overrideMethods = TestSearchUtils.findDirectTestChildrenForClass(
+                Arrays.asList(overrideType.getHandleIdentifier()), new NullProgressMonitor());
+        assertEquals(2, overrideMethods.size());
+        assertTrue(overrideMethods.stream().anyMatch(
+                item -> "example.InheritanceOverrideTest#base()".equals(item.getFullName())));
+        assertTrue(overrideMethods.stream().anyMatch(
+                item -> "example.InheritanceOverrideTest#extra()".equals(item.getFullName())));
+    }
+
+    @Test
+    public void testInheritedMethodUsesChildProjectAndExecutionClass() throws Exception {
+        importProjects(Arrays.asList("inheritance-parent", "inheritance-child"));
+        final IProject childProject = WorkspaceHelper.getProject("inheritance-child");
+        final IJavaProject javaProject = JavaCore.create(childProject);
+        final IType childType = javaProject.findType("example.InheritanceChildTest");
+        final IType parentType = JavaCore.create(WorkspaceHelper.getProject("inheritance-parent"))
+                .findType("example.InheritanceBaseTest");
+        assertNotNull(childType);
+        assertNotNull(parentType);
+
+        final List<JavaTestItem> methods = TestSearchUtils.findDirectTestChildrenForClass(
+                Arrays.asList(childType.getHandleIdentifier()), new NullProgressMonitor());
+        final JavaTestItem inherited = methods.stream()
+                .filter(item -> item.getFullName().endsWith("#base()"))
+                .findFirst().orElse(null);
+        assertNotNull(inherited);
+        assertEquals(childProject.getName(), inherited.getProjectName());
+        assertEquals(childProject.getName() + "@example.InheritanceChildTest#base()", inherited.getId());
+        assertEquals("example.InheritanceChildTest", inherited.getExecutionClassName());
+        assertEquals(parentType.getMethod("base", new String[0]).getHandleIdentifier(), inherited.getJdtHandler());
+    }
+
+    @Test
+    public void testJUnit4TestSurvivesUnannotatedOverride() throws Exception {
+        importProjects("inheritance-junit4");
+        final IJavaProject javaProject = JavaCore.create(WorkspaceHelper.getProject("inheritance-junit4"));
+        final IType childType = javaProject.findType("example.JUnit4ChildTest");
+        assertNotNull(childType);
+
+        final List<JavaTestItem> methods = TestSearchUtils.findDirectTestChildrenForClass(
+                Arrays.asList(childType.getHandleIdentifier()), new NullProgressMonitor());
+        assertEquals(1, methods.size());
+        assertEquals("example.JUnit4ChildTest#inherited", methods.get(0).getFullName());
+        assertEquals("example.JUnit4ChildTest", methods.get(0).getExecutionClassName());
+    }
+
+    @Test
+    public void testJUnit5UnannotatedOverrideSuppressesInheritedTest() throws Exception {
+        final IProject project = importProjects("preview-junit").get(0);
+        final IType childType = JavaCore.create(project).findType("example.InheritanceUnannotatedOverrideTest");
+        assertNotNull(childType);
+
+        final List<JavaTestItem> methods = TestSearchUtils.findDirectTestChildrenForClass(
+                Arrays.asList(childType.getHandleIdentifier()), new NullProgressMonitor());
+        assertTrue(methods.isEmpty());
+    }
 }

java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/launchers/JUnitLaunchConfigurationDelegate.java

@@ -192,7 +192,7 @@ private void addTestItemArgs(List<String> arguments) throws CoreException {
                 arguments.add(fileName);
             } else {
                 arguments.add("-test");
-                arguments.add(resolveMethodTestName(this.args.testNames[0]));
+                arguments.add(resolveMethodTestName(this.args.testNames[0], getExecutionClassName(0)));
 
                 if (StringUtils.isNotBlank(this.args.uniqueId)) {
                     arguments.add("-uniqueId");
@@ -202,7 +202,7 @@ private void addTestItemArgs(List<String> arguments) throws CoreException {
         }
     }
 
-    private String resolveMethodTestName(String handleId) throws CoreException {
+    private String resolveMethodTestName(String handleId, String executionClassName) throws CoreException {
         final IMethod method = (IMethod) JavaCore.create(handleId);
         String testName = method.getElementName();
         if ((this.args.testKind == TestKind.JUnit5 || this.args.testKind == TestKind.JUnit6) &&
@@ -239,7 +239,14 @@ private String resolveMethodTestName(String handleId) throws CoreException {
                 testName += "(" + String.join(",", parameters) + ")";
             }
         }
-        return method.getDeclaringType().getFullyQualifiedName() + ':' + testName;
+        final String className = StringUtils.isNotBlank(executionClassName) ? executionClassName :
+                method.getDeclaringType().getFullyQualifiedName();
+        return className + ':' + testName;
+    }
+
+    private String getExecutionClassName(int index) {
+        return this.args.executionClassNames != null && index < this.args.executionClassNames.length ?
+                this.args.executionClassNames[index] : null;
     }
 
     private String createTestNamesFile(String[] testNames) throws CoreException {
@@ -266,8 +273,8 @@ private String createMethodTestNamesFile(String[] testNames) throws CoreExceptio
             file.deleteOnExit();
             try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
                         new FileOutputStream(file), StandardCharsets.UTF_8));) {
-                for (final String handleId : testNames) {
-                    bw.write(resolveMethodTestName(handleId));
+                for (int index = 0; index < testNames.length; index++) {
+                    bw.write(resolveMethodTestName(testNames[index], getExecutionClassName(index)));
                     bw.newLine();
                 }
             }