Fixed parts of bug 140125: [junit] Polish JUnit view
diff --git a/org.eclipse.jdt.junit.core/plugin.properties b/org.eclipse.jdt.junit.core/plugin.properties
index d5d6aef..3b926ff 100644
--- a/org.eclipse.jdt.junit.core/plugin.properties
+++ b/org.eclipse.jdt.junit.core/plugin.properties
@@ -56,7 +56,7 @@
RenameTypeParticipant.name=JUnit Launch configuration participant
junitRenameParticipant= JUnit Project Rename Participant
-testKind.junit3 = JUnit 3 (Default)
+testKind.junit3 = JUnit 3
testKind.junit4 = JUnit 4
JUnitContainerName = JUnit
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java
index 4003b08..6b8ec8a 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.java
@@ -208,6 +208,7 @@
public static String TestRunnerViewPart_toggle_automatic_label;
public static String TestRunnerViewPart_toggle_horizontal_label;
public static String TestRunnerViewPart_toggle_vertical_label;
+ public static String TestRunnerViewPart_titleToolTip;
public static String TestRunnerViewPart_wrapperJobName;
public static String TestRunnerViewPart_history;
public static String TestRunnerViewPart_test_run_history;
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties
index a013b14..af907f0 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitMessages.properties
@@ -106,6 +106,9 @@
TestRunnerViewPart_test_run_history=Test Run History...
TestRunnerViewPart_testName_startTime={0} ({1})
+# The first parameter is the test name and the second is the JUnit version
+TestRunnerViewPart_titleToolTip={0} - {1}
+
TestSessionLabelProvider_testMethodName_className={0} - {1}
JUnitBaseLaunchConfiguration_dialog_title=Problems Launching JUnit Tests
diff --git a/org.eclipse.jdt.junit/plugin.properties b/org.eclipse.jdt.junit/plugin.properties
index d5d6aef..3b926ff 100644
--- a/org.eclipse.jdt.junit/plugin.properties
+++ b/org.eclipse.jdt.junit/plugin.properties
@@ -56,7 +56,7 @@
RenameTypeParticipant.name=JUnit Launch configuration participant
junitRenameParticipant= JUnit Project Rename Participant
-testKind.junit3 = JUnit 3 (Default)
+testKind.junit3 = JUnit 3
testKind.junit4 = JUnit 4
JUnitContainerName = JUnit
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
index 4003b08..6b8ec8a 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java
@@ -208,6 +208,7 @@
public static String TestRunnerViewPart_toggle_automatic_label;
public static String TestRunnerViewPart_toggle_horizontal_label;
public static String TestRunnerViewPart_toggle_vertical_label;
+ public static String TestRunnerViewPart_titleToolTip;
public static String TestRunnerViewPart_wrapperJobName;
public static String TestRunnerViewPart_history;
public static String TestRunnerViewPart_test_run_history;
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties
index a013b14..af907f0 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties
@@ -106,6 +106,9 @@
TestRunnerViewPart_test_run_history=Test Run History...
TestRunnerViewPart_testName_startTime={0} ({1})
+# The first parameter is the test name and the second is the JUnit version
+TestRunnerViewPart_titleToolTip={0} - {1}
+
TestSessionLabelProvider_testMethodName_className={0} - {1}
JUnitBaseLaunchConfiguration_dialog_title=Problems Launching JUnit Tests
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
index eb514c4..24fc1bd 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java
@@ -18,6 +18,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.text.DateFormat;
+import java.text.MessageFormat;
import java.text.NumberFormat;
import java.util.Date;
import java.util.Iterator;
@@ -97,6 +98,8 @@
import org.eclipse.jdt.internal.junit.Messages;
import org.eclipse.jdt.internal.junit.launcher.JUnitBaseLaunchConfiguration;
+import org.eclipse.jdt.internal.junit.launcher.TestKind;
+import org.eclipse.jdt.internal.junit.launcher.TestKindRegistry;
import org.eclipse.jdt.internal.junit.model.ITestRunSessionListener;
import org.eclipse.jdt.internal.junit.model.ITestSessionListener;
import org.eclipse.jdt.internal.junit.model.TestCaseElement;
@@ -1097,7 +1100,8 @@
fTestSessionListener= new TestSessionListener();
fTestRunSession.addTestSessionListener(fTestSessionListener);
- setTitleToolTip(fTestRunSession.getTestRunName());
+ setTitleToolTip();
+
clearStatus();
fFailureTrace.clear();
registerInfoMessage(fTestRunSession.getTestRunName());
@@ -1117,6 +1121,32 @@
}
}
}
+
+ private void setTitleToolTip() {
+ String testKindDisplayStr= null;
+ ILaunchConfiguration config= fTestRunSession.getLaunch().getLaunchConfiguration();
+ if (config != null) {
+ TestKind kind= TestKindRegistry.getDefault().getKind(config);
+ if (kind.isNull())
+ testKindDisplayStr= getJunit3DisplayName();
+ else
+ testKindDisplayStr= kind.getDisplayName();
+ }
+ if (testKindDisplayStr != null)
+ setTitleToolTip(MessageFormat.format(JUnitMessages.TestRunnerViewPart_titleToolTip, new String[] {fTestRunSession.getTestRunName(), testKindDisplayStr}));
+ else
+ setTitleToolTip(fTestRunSession.getTestRunName());
+ }
+
+ private String getJunit3DisplayName() {
+ Iterator iter= TestKindRegistry.getDefault().getAllKinds().iterator();
+ while (iter.hasNext()) {
+ TestKind kind= (TestKind)iter.next();
+ if ("org.eclipse.jdt.junit.loader.junit3".equals(kind.getId())) //$NON-NLS-1$
+ return kind.getDisplayName();
+ }
+ return null;
+ }
public synchronized void dispose(){
fIsDisposed= true;
