Attachment #40996 for bug #140758

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




TestRunnerViewPart_stopaction_text=Stop JUnit Test
TestRunnerViewPart_select_test_run=&Select a test run:
TestRunnerViewPart_stopaction_tooltip=Stop JUnit Test Run
TestRunnerViewPart_show_failures_only=Show Failures Only
TestRunnerViewPart_rerunaction_label=Rerun Last Test
TestRunnerViewPart_rerunaction_tooltip=Rerun Last Test
TestRunnerViewPart_hierarchical_layout=Show Tests in &Hierarchy 
TestRunnerViewPart_rerunfailuresaction_label=Rerun Last Test - Failures First
TestRunnerViewPart_rerunfailuresaction_tooltip=Rerun Last Test - Failures First
TestRunnerViewPart_rerunFailedFirstLaunchConfigName={0} (Failed Tests first)

TestRunnerViewPart_test_runs=Test Runs
TestRunnerViewPart_toggle_vertical_label=&Vertical View Orientation
TestRunnerViewPart_toggle_horizontal_label=&Horizontal View Orientation
TestRunnerViewPart_activate_on_failure_only=Activate on &Error/Failure Only
TestRunnerViewPart_toggle_automatic_label=&Automatic View Orientation
TestRunnerViewPart_terminate_title=Run Last Test
TestRunnerViewPart_terminate_message=Terminate currently running tests?

TestRunnerViewPart_testName_startTime={0} ({1})

# The first parameter is the test name and the second is the JUnit version
TestRunnerViewPart_titleToolTip={0} [{1}]
TestSessionLabelProvider_testName_JUnitVersion={0} [{1}]

TestSessionLabelProvider_testMethodName_className={0} - {1}


JUnitMainTab_tab_label=Test
JUnitMainTab_label_defaultpackage=(default package)
JUnitMainTab_label_method=Test method: 
JUnitMainTab_Test_Loader=&Test runner:
JUnitMainTab_folderdialog_title=Folder Selection
JUnitMainTab_folderdialog_message=Choose a Project, Source Folder or Package:
JUnitMainTab_error_projectnotdefined=Project not specified

Lines 221-226 Link Here

(-)src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java (+2 lines)
221		221
222	public static String TestSearchEngine_message_searching;	222	public static String TestSearchEngine_message_searching;
223		223
		224	public static String TestSessionLabelProvider_testName_JUnitVersion;
		225
224	public static String TypeRenameParticipant_change_name;	226	public static String TypeRenameParticipant_change_name;
225	public static String TypeRenameParticipant_name;	227	public static String TypeRenameParticipant_name;
226		228

Lines 1139-1145 Link Here

(-)src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java (-1 / +9 lines)
1139	return kind.isNull() \|\| "org.eclipse.jdt.junit.loader.junit3".equals(kind.getId()); //$NON-NLS-1$	1139	return kind.isNull() \|\| "org.eclipse.jdt.junit.loader.junit3".equals(kind.getId()); //$NON-NLS-1$
1140	}	1140	}
1141		1141
1142	private void setTitleToolTip() {	1142	/**
		1143	* @return the display name of the current test run sessions kind, or <code>null</code>
		1144	*/
		1145	public String getTestKindDisplayName() {
1143	String testKindDisplayStr= null;	1146	String testKindDisplayStr= null;
1144	ILaunchConfiguration config= fTestRunSession.getLaunch().getLaunchConfiguration();	1147	ILaunchConfiguration config= fTestRunSession.getLaunch().getLaunchConfiguration();
1145	if (config != null) {	1148	if (config != null) {
Lines 1147-1152 Link Here
1147	if (!kind.isNull())	1150	if (!kind.isNull())
1148	testKindDisplayStr= kind.getDisplayName();	1151	testKindDisplayStr= kind.getDisplayName();
1149	}	1152	}
		1153	return testKindDisplayStr;
		1154	}
		1155
		1156	private void setTitleToolTip() {
		1157	String testKindDisplayStr= getTestKindDisplayName();
1150		1158
1151	if (testKindDisplayStr != null)	1159	if (testKindDisplayStr != null)
1152	setTitleToolTip(MessageFormat.format(JUnitMessages.TestRunnerViewPart_titleToolTip, new String[] {fTestRunSession.getTestRunName(), testKindDisplayStr}));	1160	setTitleToolTip(MessageFormat.format(JUnitMessages.TestRunnerViewPart_titleToolTip, new String[] {fTestRunSession.getTestRunName(), testKindDisplayStr}));




import org.eclipse.jdt.internal.junit.Messages;
import org.eclipse.jdt.internal.junit.model.TestCaseElement;
import org.eclipse.jdt.internal.junit.model.TestElement;
import org.eclipse.jdt.internal.junit.model.TestRoot;
import org.eclipse.jdt.internal.junit.model.TestSuiteElement;
import org.eclipse.jdt.internal.junit.model.TestElement.Status;


		fTestRunnerPart= testRunnerPart;
		fLayoutMode= layoutMode;
	}

	public String getText(Object element) {
		if (element instanceof TestCaseElement) {
			TestCaseElement testCaseElement= (TestCaseElement) element;
			String testMethodName= testCaseElement.getTestMethodName();
			if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL) {
				return getElementLabel(testMethodName, testCaseElement);
			} else {
				String className= testCaseElement.getClassName();
				return Messages.format(JUnitMessages.TestSessionLabelProvider_testMethodName_className, new Object[] { testMethodName, className });
			}
			
		} else if (element instanceof TestElement) {
			TestElement testElement= (TestElement) element;
			String testName= testElement.getTestName();
			return getElementLabel(testName, testElement);
		} else {
			throw new IllegalArgumentException(String.valueOf(element));
		}
	}

	private String getElementLabel(String name, TestElement testElement) {
		if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL && testElement.getParent() instanceof TestRoot) {
			String testKindDisplayName= fTestRunnerPart.getTestKindDisplayName();
				if (testKindDisplayName == null)
					return name;
				else
					return Messages.format(JUnitMessages.TestSessionLabelProvider_testName_JUnitVersion, new Object[] { name, testKindDisplayName });
		} else
			return name;
		
	}

	public Image getImage(Object element) {
		if (element instanceof TestCaseElement) {
			TestCaseElement testCaseElement= ((TestCaseElement) element);

Return to bug 140758

Lines 75-84 Link Here

(-)src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties (-5 / +6 lines)
75	TestRunnerViewPart_stopaction_text=Stop JUnit Test	75	TestRunnerViewPart_stopaction_text=Stop JUnit Test
76	TestRunnerViewPart_select_test_run=&Select a test run:	76	TestRunnerViewPart_select_test_run=&Select a test run:
77	TestRunnerViewPart_stopaction_tooltip=Stop JUnit Test Run	77	TestRunnerViewPart_stopaction_tooltip=Stop JUnit Test Run
78	TestRunnerViewPart_show_failures_only=Show Failures only	78	TestRunnerViewPart_show_failures_only=Show Failures Only
79	TestRunnerViewPart_rerunaction_label=Rerun Last Test	79	TestRunnerViewPart_rerunaction_label=Rerun Last Test
80	TestRunnerViewPart_rerunaction_tooltip=Rerun Last Test	80	TestRunnerViewPart_rerunaction_tooltip=Rerun Last Test
81	TestRunnerViewPart_hierarchical_layout=Show Test &Hierarchy	81	TestRunnerViewPart_hierarchical_layout=Show Tests in &Hierarchy
82	TestRunnerViewPart_rerunfailuresaction_label=Rerun Last Test - Failures First	82	TestRunnerViewPart_rerunfailuresaction_label=Rerun Last Test - Failures First
83	TestRunnerViewPart_rerunfailuresaction_tooltip=Rerun Last Test - Failures First	83	TestRunnerViewPart_rerunfailuresaction_tooltip=Rerun Last Test - Failures First
84	TestRunnerViewPart_rerunFailedFirstLaunchConfigName={0} (Failed Tests first)	84	TestRunnerViewPart_rerunFailedFirstLaunchConfigName={0} (Failed Tests first)
Lines 99-105 Link Here
99	TestRunnerViewPart_test_runs=Test Runs	99	TestRunnerViewPart_test_runs=Test Runs
100	TestRunnerViewPart_toggle_vertical_label=&Vertical View Orientation	100	TestRunnerViewPart_toggle_vertical_label=&Vertical View Orientation
101	TestRunnerViewPart_toggle_horizontal_label=&Horizontal View Orientation	101	TestRunnerViewPart_toggle_horizontal_label=&Horizontal View Orientation
102	TestRunnerViewPart_activate_on_failure_only=Activate on &Error/Failure only	102	TestRunnerViewPart_activate_on_failure_only=Activate on &Error/Failure Only
103	TestRunnerViewPart_toggle_automatic_label=&Automatic View Orientation	103	TestRunnerViewPart_toggle_automatic_label=&Automatic View Orientation
104	TestRunnerViewPart_terminate_title=Run Last Test	104	TestRunnerViewPart_terminate_title=Run Last Test
105	TestRunnerViewPart_terminate_message=Terminate currently running tests?	105	TestRunnerViewPart_terminate_message=Terminate currently running tests?
Lines 107-113 Link Here
107	TestRunnerViewPart_testName_startTime={0} ({1})	107	TestRunnerViewPart_testName_startTime={0} ({1})
108		108
109	# The first parameter is the test name and the second is the JUnit version	109	# The first parameter is the test name and the second is the JUnit version
110	TestRunnerViewPart_titleToolTip={0} - {1}	110	TestRunnerViewPart_titleToolTip={0} [{1}]
		111	TestSessionLabelProvider_testName_JUnitVersion={0} [{1}]
111		112
112	TestSessionLabelProvider_testMethodName_className={0} - {1}	113	TestSessionLabelProvider_testMethodName_className={0} - {1}
113		114
Lines 131-137 Link Here
131	JUnitMainTab_tab_label=Test	132	JUnitMainTab_tab_label=Test
132	JUnitMainTab_label_defaultpackage=(default package)	133	JUnitMainTab_label_defaultpackage=(default package)
133	JUnitMainTab_label_method=Test method:	134	JUnitMainTab_label_method=Test method:
134	JUnitMainTab_Test_Loader=&Test Loader:	135	JUnitMainTab_Test_Loader=&Test runner:
135	JUnitMainTab_folderdialog_title=Folder Selection	136	JUnitMainTab_folderdialog_title=Folder Selection
136	JUnitMainTab_folderdialog_message=Choose a Project, Source Folder or Package:	137	JUnitMainTab_folderdialog_message=Choose a Project, Source Folder or Package:
137	JUnitMainTab_error_projectnotdefined=Project not specified	138	JUnitMainTab_error_projectnotdefined=Project not specified

Lines 18-23 Link Here

(-)src/org/eclipse/jdt/internal/junit/ui/TestSessionLabelProvider.java (-7 / +22 lines)
18	import org.eclipse.jdt.internal.junit.Messages;	18	import org.eclipse.jdt.internal.junit.Messages;
19	import org.eclipse.jdt.internal.junit.model.TestCaseElement;	19	import org.eclipse.jdt.internal.junit.model.TestCaseElement;
20	import org.eclipse.jdt.internal.junit.model.TestElement;	20	import org.eclipse.jdt.internal.junit.model.TestElement;
		21	import org.eclipse.jdt.internal.junit.model.TestRoot;
21	import org.eclipse.jdt.internal.junit.model.TestSuiteElement;	22	import org.eclipse.jdt.internal.junit.model.TestSuiteElement;
22	import org.eclipse.jdt.internal.junit.model.TestElement.Status;	23	import org.eclipse.jdt.internal.junit.model.TestElement.Status;
23		24
Lines 30-54 Link Here
30	fTestRunnerPart= testRunnerPart;	31	fTestRunnerPart= testRunnerPart;
31	fLayoutMode= layoutMode;	32	fLayoutMode= layoutMode;
32	}	33	}
33		34
34	public String getText(Object element) {	35	public String getText(Object element) {
35	if (element instanceof TestCaseElement) {	36	if (element instanceof TestCaseElement) {
36	String testMethodName= ((TestCaseElement) element).getTestMethodName();	37	TestCaseElement testCaseElement= (TestCaseElement) element;
		38	String testMethodName= testCaseElement.getTestMethodName();
37	if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL) {	39	if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL) {
38	return testMethodName;	40	return getElementLabel(testMethodName, testCaseElement);
39	} else {	41	} else {
40	String className= ((TestCaseElement) element).getClassName();	42	String className= testCaseElement.getClassName();
41	return Messages.format(JUnitMessages.TestSessionLabelProvider_testMethodName_className, new Object[] { testMethodName, className });	43	return Messages.format(JUnitMessages.TestSessionLabelProvider_testMethodName_className, new Object[] { testMethodName, className });
42	}	44	}
43		45
44	} else if (element instanceof TestElement) {	46	} else if (element instanceof TestElement) {
45	return ((TestElement) element).getTestName();	47	TestElement testElement= (TestElement) element;
46		48	String testName= testElement.getTestName();
		49	return getElementLabel(testName, testElement);
47	} else {	50	} else {
48	throw new IllegalArgumentException(String.valueOf(element));	51	throw new IllegalArgumentException(String.valueOf(element));
49	}	52	}
50	}	53	}
51		54
		55	private String getElementLabel(String name, TestElement testElement) {
		56	if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL && testElement.getParent() instanceof TestRoot) {
		57	String testKindDisplayName= fTestRunnerPart.getTestKindDisplayName();
		58	if (testKindDisplayName == null)
		59	return name;
		60	else
		61	return Messages.format(JUnitMessages.TestSessionLabelProvider_testName_JUnitVersion, new Object[] { name, testKindDisplayName });
		62	} else
		63	return name;
		64
		65	}
		66
52	public Image getImage(Object element) {	67	public Image getImage(Object element) {
53	if (element instanceof TestCaseElement) {	68	if (element instanceof TestCaseElement) {
54	TestCaseElement testCaseElement= ((TestCaseElement) element);	69	TestCaseElement testCaseElement= ((TestCaseElement) element);