commit 6dfe33cd6d1478e9ebb5819c42945dcb78acae61
author Vikas Chandra <Vikas.Chandra@in.ibm.com> Fri Aug 24 14:44:23 2018 +0530
committer Vikas Chandra <Vikas.Chandra@in.ibm.com> Mon Sep 10 04:40:39 2018 -0400
tree 8e5df2c8c3628dfedd41706682b3c3d12b230f0d
parent eb8877fd66d57a90d981a9616409ffdd496d4856

Bug 538237 - JUnit Launch configuration dialog selects JUnit3 while
selecting a package containing JUnit5 test cases

Change-Id: Iafb39e5510d34b94d429f609977ec3fb7e72b4ab
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>

org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java

diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java
index f87816b..e7293bc 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java
@@ -489,8 +489,14 @@
 
 	private void updateTestLoaderFromConfig(ILaunchConfiguration config) {
 		ITestKind testKind= JUnitLaunchConfigurationConstants.getTestRunnerKind(config);
-		if (testKind.isNull())
-			testKind= TestKindRegistry.getDefault().getKind(TestKindRegistry.JUNIT3_TEST_KIND_ID);
+		if (testKind.isNull()) {
+			if (fContainerElement != null) {
+				testKind= TestKindRegistry.getContainerTestKind(fContainerElement);
+			}
+			if (testKind.isNull()) {
+				testKind= TestKindRegistry.getDefault().getKind(TestKindRegistry.JUNIT3_TEST_KIND_ID);
+			}
+		}
 		fTestLoaderViewer.setSelection(new StructuredSelection(testKind));
 	}