Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 40996 Details for
Bug 140758
[junit] Inconsistent labels in JUnit view
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Simpler with less code duplication
patch.txt (text/plain), 7.50 KB, created by
Dani Megert
on 2006-05-10 14:40:47 EDT
(
hide
)
Description:
Simpler with less code duplication
Filename:
MIME Type:
Creator:
Dani Megert
Created:
2006-05-10 14:40:47 EDT
Size:
7.50 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jdt.junit >Index: src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties,v >retrieving revision 1.83 >diff -u -r1.83 JUnitMessages.properties >--- src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties 4 May 2006 23:40:13 -0000 1.83 >+++ src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.properties 10 May 2006 18:42:05 -0000 >@@ -75,10 +75,10 @@ > 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_show_failures_only=Show Failures Only > TestRunnerViewPart_rerunaction_label=Rerun Last Test > TestRunnerViewPart_rerunaction_tooltip=Rerun Last Test >-TestRunnerViewPart_hierarchical_layout=Show Test &Hierarchy >+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) >@@ -99,7 +99,7 @@ > 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_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? >@@ -107,7 +107,8 @@ > TestRunnerViewPart_testName_startTime={0} ({1}) > > # The first parameter is the test name and the second is the JUnit version >-TestRunnerViewPart_titleToolTip={0} - {1} >+TestRunnerViewPart_titleToolTip={0} [{1}] >+TestSessionLabelProvider_testName_JUnitVersion={0} [{1}] > > TestSessionLabelProvider_testMethodName_className={0} - {1} > >@@ -131,7 +132,7 @@ > JUnitMainTab_tab_label=Test > JUnitMainTab_label_defaultpackage=(default package) > JUnitMainTab_label_method=Test method: >-JUnitMainTab_Test_Loader=&Test Loader: >+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 >Index: src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java,v >retrieving revision 1.26 >diff -u -r1.26 JUnitMessages.java >--- src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java 4 May 2006 23:40:13 -0000 1.26 >+++ src/org/eclipse/jdt/internal/junit/ui/JUnitMessages.java 10 May 2006 18:42:05 -0000 >@@ -221,6 +221,8 @@ > > public static String TestSearchEngine_message_searching; > >+ public static String TestSessionLabelProvider_testName_JUnitVersion; >+ > public static String TypeRenameParticipant_change_name; > public static String TypeRenameParticipant_name; > >Index: src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java,v >retrieving revision 1.134 >diff -u -r1.134 TestRunnerViewPart.java >--- src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java 5 May 2006 16:26:28 -0000 1.134 >+++ src/org/eclipse/jdt/internal/junit/ui/TestRunnerViewPart.java 10 May 2006 18:42:06 -0000 >@@ -1139,7 +1139,10 @@ > return kind.isNull() || "org.eclipse.jdt.junit.loader.junit3".equals(kind.getId()); //$NON-NLS-1$ > } > >- private void setTitleToolTip() { >+ /** >+ * @return the display name of the current test run sessions kind, or <code>null</code> >+ */ >+ public String getTestKindDisplayName() { > String testKindDisplayStr= null; > ILaunchConfiguration config= fTestRunSession.getLaunch().getLaunchConfiguration(); > if (config != null) { >@@ -1147,6 +1150,11 @@ > if (!kind.isNull()) > testKindDisplayStr= kind.getDisplayName(); > } >+ return testKindDisplayStr; >+ } >+ >+ private void setTitleToolTip() { >+ String testKindDisplayStr= getTestKindDisplayName(); > > if (testKindDisplayStr != null) > setTitleToolTip(MessageFormat.format(JUnitMessages.TestRunnerViewPart_titleToolTip, new String[] {fTestRunSession.getTestRunName(), testKindDisplayStr})); >Index: src/org/eclipse/jdt/internal/junit/ui/TestSessionLabelProvider.java >=================================================================== >RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestSessionLabelProvider.java,v >retrieving revision 1.6 >diff -u -r1.6 TestSessionLabelProvider.java >--- src/org/eclipse/jdt/internal/junit/ui/TestSessionLabelProvider.java 5 May 2006 16:09:35 -0000 1.6 >+++ src/org/eclipse/jdt/internal/junit/ui/TestSessionLabelProvider.java 10 May 2006 18:42:06 -0000 >@@ -18,6 +18,7 @@ > 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; > >@@ -30,25 +31,39 @@ > fTestRunnerPart= testRunnerPart; > fLayoutMode= layoutMode; > } >- >+ > public String getText(Object element) { > if (element instanceof TestCaseElement) { >- String testMethodName= ((TestCaseElement) element).getTestMethodName(); >+ TestCaseElement testCaseElement= (TestCaseElement) element; >+ String testMethodName= testCaseElement.getTestMethodName(); > if (fLayoutMode == TestRunnerViewPart.LAYOUT_HIERARCHICAL) { >- return testMethodName; >+ return getElementLabel(testMethodName, testCaseElement); > } else { >- String className= ((TestCaseElement) element).getClassName(); >+ String className= testCaseElement.getClassName(); > return Messages.format(JUnitMessages.TestSessionLabelProvider_testMethodName_className, new Object[] { testMethodName, className }); > } > > } else if (element instanceof TestElement) { >- return ((TestElement) element).getTestName(); >- >+ 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);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 140758
:
40757
|
40913
| 40996