Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVikas Chandra2018-08-24 09:14:23 +0000
committerVikas Chandra2018-09-10 08:40:39 +0000
commit6dfe33cd6d1478e9ebb5819c42945dcb78acae61 (patch)
tree8e5df2c8c3628dfedd41706682b3c3d12b230f0d
parenteb8877fd66d57a90d981a9616409ffdd496d4856 (diff)
downloadeclipse.jdt.ui-6dfe33cd6d1478e9ebb5819c42945dcb78acae61.tar.gz
eclipse.jdt.ui-6dfe33cd6d1478e9ebb5819c42945dcb78acae61.tar.xz
eclipse.jdt.ui-6dfe33cd6d1478e9ebb5819c42945dcb78acae61.zip
Bug 538237 - JUnit Launch configuration dialog selects JUnit3 whileI20180913-1800I20180913-0415I20180912-2240I20180912-0225I20180912-0210I20180911-1400
selecting a package containing JUnit5 test cases Change-Id: Iafb39e5510d34b94d429f609977ec3fb7e72b4ab Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
-rw-r--r--org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationTab.java10
1 files changed, 8 insertions, 2 deletions
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 f87816b3c0..e7293bc552 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 @@ public class JUnitLaunchConfigurationTab extends AbstractLaunchConfigurationTab
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));
}

Back to the top