Bug 397747: [JUnit] JUnit3TestReference handles JUnit4TestAdapter incorrectly

3 files changed, 16 insertions, 10 deletions

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java
index 07f16efa0a..85ca97b836 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunListenerTest.java
@@ -42,7 +42,6 @@ import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
 
 import org.eclipse.jdt.internal.junit.launcher.JUnitLaunchConfigurationConstants;
-import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
 
 
 public class AbstractTestRunListenerTest extends TestCase {
@@ -93,10 +92,9 @@ public class AbstractTestRunListenerTest extends TestCase {
 	}
 
 	private static class TestJUnitLaunchShortcut extends JUnitLaunchShortcut {
-		public static ILaunchConfiguration createConfiguration(IJavaElement element) throws CoreException {
+		public static ILaunchConfigurationWorkingCopy createConfiguration(IJavaElement element) throws CoreException {
 			ILaunchConfigurationWorkingCopy copy= new TestJUnitLaunchShortcut().createLaunchConfiguration(element);
-			copy.setAttribute(JUnitLaunchConfigurationConstants.ATTR_TEST_RUNNER_KIND, TestKindRegistry.JUNIT3_TEST_KIND_ID);
-			return copy.doSave();
+			return copy;
 		}
 	}
 
@@ -108,7 +106,7 @@ public class AbstractTestRunListenerTest extends TestCase {
 		return aTestCase;
 	}
 
-	protected void launchJUnit(IJavaElement aTest) throws CoreException {
+	protected void launchJUnit(IJavaElement aTest, String testKindID) throws CoreException {
 		ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
 
 		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
@@ -153,7 +151,10 @@ public class AbstractTestRunListenerTest extends TestCase {
 		};
 		lm.addLaunchListener(launchesListener);
 
-		ILaunchConfiguration configuration= TestJUnitLaunchShortcut.createConfiguration(aTest);
+		ILaunchConfigurationWorkingCopy configuration= TestJUnitLaunchShortcut.createConfiguration(aTest);
+		if (testKindID != null) {
+			configuration.setAttribute(JUnitLaunchConfigurationConstants.ATTR_TEST_RUNNER_KIND, testKindID);
+		}
 		try {
 			configuration.launch(ILaunchManager.RUN_MODE, null);
 			new DisplayHelper() {
@@ -171,7 +172,11 @@ public class AbstractTestRunListenerTest extends TestCase {
 	}
 
 	protected String[] launchJUnit(IJavaElement aTest, final TestRunLog log) throws CoreException {
-		launchJUnit(aTest);
+		return launchJUnit(aTest, null, log);
+	}
+	
+	protected String[] launchJUnit(IJavaElement aTest, String testKindID, final TestRunLog log) throws CoreException {
+		launchJUnit(aTest, testKindID);
 
 		boolean success= new DisplayHelper(){
 			protected boolean condition() {
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java
index 2a72c46356..092c36eb00 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/AbstractTestRunSessionSerializationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,7 +76,7 @@ public class AbstractTestRunSessionSerializationTests extends TestCase {
 
 		JUnitCore.addTestRunListener(testRunListener);
 		try {
-			new AbstractTestRunListenerTest().launchJUnit(elementToLaunch);
+			new AbstractTestRunListenerTest().launchJUnit(elementToLaunch, (String) null);
 			assertTrue(new DisplayHelper(){
 				protected boolean condition() {
 					return result.fTestRunSession != null;
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunListenerTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunListenerTest.java
index ccc12d1d61..6bc94422b7 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunListenerTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/junit/tests/TestRunListenerTest.java
@@ -23,6 +23,7 @@ import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 
 import org.eclipse.jdt.internal.junit.JUnitMessages;
+import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
 
 public class TestRunListenerTest extends AbstractTestRunListenerTest {
 
@@ -42,7 +43,7 @@ public class TestRunListenerTest extends AbstractTestRunListenerTest {
 		final TestRunListener testRunListener= new TestRunListeners.TreeTest(log, step);
 		JUnitCore.addTestRunListener(testRunListener);
 		try {
-			return launchJUnit(typeToLaunch, log);
+			return launchJUnit(typeToLaunch, TestKindRegistry.JUNIT3_TEST_KIND_ID, log);
 		} finally {
 			JUnitCore.removeTestRunListener(testRunListener);
 		}