Whitespace removal in junit plug-ins
Change-Id: Ia474e1327a8820d16e327d492d697787eb6906d9
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>#
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java
index b742c72..0041c7f 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitCorePlugin.java
@@ -51,7 +51,7 @@
private static JUnitCorePlugin fgPlugin= null;
public static final String CORE_PLUGIN_ID= "org.eclipse.jdt.junit.core"; //$NON-NLS-1$
-
+
/**
* Plug-in ID of the <b>UI</b> plug-in ("org.eclipse.jdt.junit").
* @see #CORE_PLUGIN_ID
@@ -151,7 +151,7 @@
/**
* Returns a service with the specified name or <code>null</code> if none.
- *
+ *
* @param serviceName name of service
* @return service object or <code>null</code> if none
* @since 3.5
@@ -278,7 +278,7 @@
*/
public ListenerList<TestRunListener> getNewTestRunListeners() {
loadTestRunListeners();
-
+
return fNewTestRunListeners;
}
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitPreferencesConstants.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitPreferencesConstants.java
index de2d5fb..3131202 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitPreferencesConstants.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/JUnitPreferencesConstants.java
@@ -98,7 +98,7 @@
* Javadoc location for org.junit.jupiter.params (JUnit 5)
*/
public static final String JUNIT_JUPITER_PARAMS_JAVADOC= JUnitCorePlugin.PLUGIN_ID + ".junit5.jupiter.params.javadoclocation"; //$NON-NLS-1$
-
+
/**
* Javadoc location for org.junit.platform.commons (JUnit 5)
*/
@@ -187,10 +187,10 @@
}
return buffer.toString();
}
-
+
/**
* Parses the comma-separated string into an array of strings.
- *
+ *
* @param listString a comma-separated string
* @return an array of strings
*/
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java
index 409b9cb..849f368 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java
@@ -49,9 +49,9 @@
public class BuildPathSupport {
-
+
public static class JUnitPluginDescription {
-
+
private final String bundleId;
private final VersionRange versionRange;
private final String bundleRoot;
@@ -59,7 +59,7 @@
private final String sourceBundleId;
private final String repositorySource;
private final String javadocPreferenceKey;
-
+
private String resolvedVersion = null;
public JUnitPluginDescription(String bundleId, VersionRange versionRange, String bundleRoot, String binaryImportedRoot, String sourceBundleId, String repositorySource, String javadocPreferenceKey) {
@@ -71,11 +71,11 @@
this.repositorySource= repositorySource;
this.javadocPreferenceKey= javadocPreferenceKey;
}
-
+
public IPath getBundleLocation() {
return getBundleLocation(bundleId, versionRange);
}
-
+
public IPath getSourceBundleLocation() {
return getSourceLocation(getBundleLocation());
}
@@ -83,7 +83,7 @@
private IPath getBundleLocation(String aBundleId, VersionRange aVersionRange) {
return getBundleLocation(aBundleId, aVersionRange, false);
}
-
+
private IPath getBundleLocation(String aBundleId, VersionRange aVersionRange, boolean isSourceBundle) {
BundleInfo bundleInfo = P2Utils.findBundle(aBundleId, aVersionRange, isSourceBundle);
if (bundleInfo != null) {
@@ -114,7 +114,7 @@
}
return null;
}
-
+
private IPath getBundleFileLocation(String aBundleId, VersionRange aVersionRange, String filePath) {
BundleInfo bundleInfo = P2Utils.findBundle(aBundleId, aVersionRange, false);
@@ -222,7 +222,7 @@
} else {
attributes= new IClasspathAttribute[] { JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadocLocation) };
}
-
+
return JavaCore.newLibraryEntry(bundleRootLocation, srcLocation, null, getAccessRules(), attributes, false);
}
return null;
@@ -238,7 +238,7 @@
// Try source in workspace (from repository)
srcLocation= getLocationIfExists(bundleLocation, repositorySource);
}
-
+
if (srcLocation == null) {
if (bundleLocation != null) {
// Try exact version
@@ -288,13 +288,13 @@
}
}
-
+
public static final JUnitPluginDescription JUNIT3_PLUGIN= new JUnitPluginDescription(
"org.junit", new VersionRange("[3.8.2,3.9)"), "junit.jar", "junit.jar", "org.junit.source", "source-bundle/", JUnitPreferencesConstants.JUNIT3_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-
+
public static final JUnitPluginDescription JUNIT4_PLUGIN= new JUnitPluginDescription(
"org.junit", new VersionRange("[4.7.0,5.0.0)"), "junit.jar", "junit.jar", "org.junit.source", "source-bundle/", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-
+
private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription(
"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core_1.*.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
@@ -357,7 +357,7 @@
};
}
};
-
+
/**
* @return the JUnit3 classpath container
*/
@@ -400,7 +400,7 @@
public static IClasspathEntry getJUnit4as3LibraryEntry() {
return JUNIT4_AS_3_PLUGIN.getLibraryEntry();
}
-
+
/**
* @return the org.hamcrest.core library, or <code>null</code> if not available
*/
@@ -477,7 +477,7 @@
public static IClasspathEntry getJUnitVintageEngineLibraryEntry() {
return JUNIT_VINTAGE_ENGINE_PLUGIN.getLibraryEntry();
}
-
+
/**
* @return the org.opentest4j library, or <code>null</code> if not available
*/
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
index 93bf572..b973cfa 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
@@ -185,11 +185,11 @@
@Override
public void requestClasspathContainerUpdate(IPath containerPath, IJavaProject project, IClasspathContainer containerSuggestion) throws CoreException {
IEclipsePreferences preferences= InstanceScope.INSTANCE.getNode(JUnitCorePlugin.CORE_PLUGIN_ID);
-
+
IClasspathEntry[] entries= containerSuggestion.getClasspathEntries();
if (entries.length >= 1 && isValidJUnitContainerPath(containerPath)) {
String version= containerPath.segment(1);
-
+
// only modifiable entry is Javadoc location
for (IClasspathEntry entry : entries) {
String preferenceKey= getPreferenceKey(entry, version);
@@ -200,7 +200,7 @@
if (!defaultValue.equals(preferences.get(preferenceKey, defaultValue))) {
preferences.put(preferenceKey, defaultValue);
}
-
+
/*
* The following would be correct, but would not allow to revert to the default.
* There's no concept of "default value" for a classpath attribute, see
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitHomeInitializer.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitHomeInitializer.java
index a31e1dd..8cea25a 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitHomeInitializer.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitHomeInitializer.java
@@ -57,7 +57,7 @@
IPath sourceLocation= BuildPathSupport.JUNIT3_PLUGIN.getSourceBundleLocation();
if (sourceLocation == null)
sourceLocation= BuildPathSupport.JUNIT4_PLUGIN.getSourceBundleLocation(); // JUnit 4 includes most of JUnit 3, so let's cheat
-
+
if (sourceLocation != null) {
JavaCore.setClasspathVariable(JUnitCorePlugin.JUNIT_SRC_HOME, sourceLocation, null);
} else {
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
index e49efd3..1321800 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/P2Utils.java
@@ -37,7 +37,7 @@
/**
* Utilities to read and write bundle and source information files.
- *
+ *
* @since 3.5
*/
class P2Utils {
@@ -47,7 +47,7 @@
* <p>
* The first match will be returned if more than one bundle matches the arguments.
* </p>
- *
+ *
* @param symbolicName the symbolic name
* @param version the bundle version
* @param isSourceBundle <code>true</code> if it is a source bundle <code>false</code> otherwise
@@ -65,7 +65,7 @@
* <p>
* The best match (latest version) will be returned if more than one bundle matches the arguments.
* </p>
- *
+ *
* @param symbolicName the symbolic name
* @param versionRange the version range for the bundle version
* @param isSourceBundle <code>true</code> if it is a source bundle <code>false</code> otherwise
@@ -94,7 +94,7 @@
} catch (IOException e) {
JUnitCorePlugin.log(e);
}
-
+
if (bundles != null) {
for (BundleInfo bundleInfo : bundles) {
if (symbolicName.equals(bundleInfo.getSymbolicName())) {
@@ -117,18 +117,18 @@
/**
* Returns the bundle location path.
- *
+ *
* @param bundleInfo the bundle info or <code>null</code>
* @return the bundle location or <code>null</code> if it is not possible to convert to a path
*/
public static IPath getBundleLocationPath(BundleInfo bundleInfo) {
if (bundleInfo == null)
return null;
-
+
URI bundleLocation= bundleInfo.getLocation();
if (bundleLocation == null)
return null;
-
+
try {
URL localFileURL= FileLocator.toFileURL(URIUtil.toURL(bundleLocation));
URI localFileURI= new URI(localFileURL.toExternalForm());
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java
index 66f79fc..4275009 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/launcher/JUnit4TestFinder.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* David Saff (saff@mit.edu) - initial API and implementation
* (bug 102632: [JUnit] Support for JUnit 4.)
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/ITestRunListener2.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/ITestRunListener2.java
index c5a0eeb..e20179e 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/ITestRunListener2.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/ITestRunListener2.java
@@ -87,7 +87,7 @@
* displayName: the display name of the test
* parameterTypes: comma-separated list of method parameter types if applicable, otherwise an empty string
* uniqueId: the unique ID of the test provided by JUnit launcher, otherwise an empty string
- *
+ *
* Example: 324968,testPass(junit.tests.MyTest),false,1,false,-1,A simple test case,"",""
* </pre>
*
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java
index 5f31e0f..0d080c2 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/JUnitModel.java
@@ -137,7 +137,7 @@
private void connectTestRunner(ILaunch launch, IJavaProject javaProject, int port) {
TestRunSession testRunSession= new TestRunSession(launch, javaProject, port);
addTestRunSession(testRunSession);
-
+
for (TestRunListener listener : JUnitCorePlugin.getDefault().getNewTestRunListeners()) {
listener.sessionLaunched(testRunSession);
}
@@ -351,11 +351,11 @@
public void addTestRunSession(TestRunSession testRunSession) {
Assert.isNotNull(testRunSession);
ArrayList<TestRunSession> toRemove= new ArrayList<>();
-
+
synchronized (this) {
Assert.isLegal(! fTestRunSessions.contains(testRunSession));
fTestRunSessions.addFirst(testRunSession);
-
+
int maxCount = Platform.getPreferencesService().getInt(JUnitCorePlugin.CORE_PLUGIN_ID, JUnitPreferencesConstants.MAX_TEST_RUNS, 10, null);
int size= fTestRunSessions.size();
if (size > maxCount) {
@@ -369,7 +369,7 @@
}
}
}
-
+
for (int i= 0; i < toRemove.size(); i++) {
TestRunSession oldSession= toRemove.get(i);
notifyTestRunSessionRemoved(oldSession);
@@ -421,10 +421,10 @@
monitor.beginTask(ModelMessages.JUnitModel_importing_from_url, IProgressMonitor.UNKNOWN);
final String trimmedUrl= url.trim().replaceAll("\r\n?|\n", ""); //$NON-NLS-1$ //$NON-NLS-2$
final TestRunHandler handler= new TestRunHandler(monitor);
-
+
final CoreException[] exception= { null };
final TestRunSession[] session= { null };
-
+
Thread importThread= new Thread("JUnit URL importer") { //$NON-NLS-1$
@Override
public void run() {
@@ -453,7 +453,7 @@
}
};
importThread.start();
-
+
while (session[0] == null && exception[0] == null && !monitor.isCanceled()) {
try {
Thread.sleep(100);
@@ -469,7 +469,7 @@
throw new InterruptedException();
}
}
-
+
JUnitCorePlugin.getModel().addTestRunSession(session[0]);
monitor.done();
return session[0];
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/RemoteTestRunnerClient.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/RemoteTestRunnerClient.java
index b5f4977..f57b409 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/RemoteTestRunnerClient.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/RemoteTestRunnerClient.java
@@ -38,7 +38,7 @@
* marshaling of the different messages.
*/
public class RemoteTestRunnerClient {
-
+
public abstract class ListenerSafeRunnable implements ISafeRunnable {
@Override
public void handleException(Throwable exception) {
@@ -570,7 +570,7 @@
/**
* Returns a comparison result from the given buffer.
* Removes the terminating line delimiter.
- *
+ *
* @param buf the comparison result
* @return the result or <code>null</code> if empty
* @since 3.7
@@ -579,7 +579,7 @@
int length= buf.length();
if (length == 0)
return null;
-
+
char last= buf.charAt(length - 1);
if (last == '\n') {
if (length > 1 && buf.charAt(length - 2) == '\r')
@@ -591,7 +591,7 @@
}
return buf.toString();
}
-
+
private void notifyTestRunTerminated() {
// fix for 77771 RemoteTestRunnerClient doing work after junit shutdown [JUnit]
if (JUnitCorePlugin.isStopped())
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestCaseElement.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestCaseElement.java
index d7394ea..2f60518 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestCaseElement.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestCaseElement.java
@@ -69,7 +69,7 @@
else
return super.getTestResult(includeChildren);
}
-
+
public void setIgnored(boolean ignored) {
fIgnored= ignored;
}
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestElement.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestElement.java
index 918e437..6731e2c 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestElement.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestElement.java
@@ -397,7 +397,7 @@
/**
* Returns the display name of the test. Can be <code>null</code>. In that case, use
* {@link TestElement#getTestName() getTestName()}.
- *
+ *
* @return the test display name, can be <code>null</code>
*/
public String getDisplayName() {
@@ -416,7 +416,7 @@
/**
* Returns the unique ID of the test element. Can be <code>null</code> as it is applicable to JUnit
* 5 and above.
- *
+ *
* @return the unique ID of the test, can be <code>null</code>
*/
public String getUniqueId() {
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java
index ba97cef..e0fdf19 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunHandler.java
@@ -72,7 +72,7 @@
public TestRunHandler(IProgressMonitor monitor) {
fMonitor= monitor;
}
-
+
public TestRunHandler(TestRunSession testRunSession) {
fTestRunSession= testRunSession;
}
@@ -98,7 +98,7 @@
}
if (Thread.interrupted())
throw new OperationCanceledException();
-
+
switch (qName) {
case IXMLTags.NODE_TESTRUN:
if (fTestRunSession == null) {
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
index f03c0e7..cc0c5d3 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSession.java
@@ -731,7 +731,7 @@
@Override
public void testEnded(String testId, String testName) {
boolean isIgnored= testName.startsWith(MessageIds.IGNORED_TEST_PREFIX);
-
+
TestElement testElement= getTestElement(testId);
if (testElement == null) {
testElement= createUnrootedTestElement(testId, testName);
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSessionSerializer.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSessionSerializer.java
index 7c63a54..1f10996 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSessionSerializer.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/model/TestRunSessionSerializer.java
@@ -90,7 +90,7 @@
addCDATA(atts, IXMLTags.ATTR_INCLUDE_TAGS, includeTags);
}
String excludeTags= fTestRunSession.getExcludeTags();
- if (excludeTags != null && !excludeTags.trim().isEmpty()) {
+ if (excludeTags != null && !excludeTags.trim().isEmpty()) {
addCDATA(atts, IXMLTags.ATTR_EXCLUDE_TAGS, excludeTags);
}
startElement(IXMLTags.NODE_TESTRUN, atts);
@@ -174,14 +174,14 @@
private void addFailure(TestElement testElement) throws SAXException {
FailureTrace failureTrace= testElement.getFailureTrace();
-
+
if (testElement.isAssumptionFailure()) {
startElement(IXMLTags.NODE_SKIPPED, NO_ATTS);
if (failureTrace != null) {
addCharacters(failureTrace.getTrace());
}
endElement(IXMLTags.NODE_SKIPPED);
-
+
} else if (failureTrace != null) {
AttributesImpl failureAtts= new AttributesImpl();
// addCDATA(failureAtts, IXMLTags.ATTR_MESSAGE, xx);
@@ -226,10 +226,10 @@
string= escapeNonUnicodeChars(string);
fHandler.characters(string.toCharArray(), 0, string.length());
}
-
+
/**
* Replaces all non-Unicode characters in the given string.
- *
+ *
* @param string a string
* @return string with Java-escapes
* @since 3.6
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/CoreTestSearchEngine.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/CoreTestSearchEngine.java
index 9bdb389..8eb320a 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/CoreTestSearchEngine.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/util/CoreTestSearchEngine.java
@@ -266,7 +266,7 @@
new SearchEngine().search(suitePattern, participants, scope, requestor, pm);
}
-
+
// --- copied from org.eclipse.jdt.internal.corext.util.JavaModelUtil: ---
/**
* @param version1 the first version
@@ -299,7 +299,7 @@
/**
* Checks if the given project or workspace has source compliance 1.8 or greater.
- *
+ *
* @param project the project to test or <code>null</code> to test the workspace settings
* @return <code>true</code> if the given project or workspace has source compliance 1.8 or
* greater.
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java
index dd643e1..6129a95 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/JUnitCore.java
@@ -61,31 +61,31 @@
/**
* ID of the JUnit {@linkplain IClasspathContainer classpath container}.
* The general format of classpath entries using this container is unspecified.
- *
+ *
* @see #JUNIT3_CONTAINER_PATH
* @see #JUNIT4_CONTAINER_PATH
* @see #JUNIT5_CONTAINER_PATH
* @since 3.6
*/
public static final String JUNIT_CONTAINER_ID= "org.eclipse.jdt.junit.JUNIT_CONTAINER"; //$NON-NLS-1$
-
+
/**
* Path of the JUnit 3 {@linkplain IClasspathContainer classpath container}.
- *
+ *
* @since 3.6
*/
public final static IPath JUNIT3_CONTAINER_PATH= new Path(JUNIT_CONTAINER_ID).append("3"); //$NON-NLS-1$
-
+
/**
* Path of the JUnit 4 {@linkplain IClasspathContainer classpath container}.
- *
+ *
* @since 3.6
*/
public final static IPath JUNIT4_CONTAINER_PATH= new Path(JUNIT_CONTAINER_ID).append("4"); //$NON-NLS-1$
/**
* Path of the JUnit 5 {@linkplain IClasspathContainer classpath container}.
- *
+ *
* @since 3.10
*/
public final static IPath JUNIT5_CONTAINER_PATH= new Path(JUNIT_CONTAINER_ID).append("5"); //$NON-NLS-1$
@@ -138,14 +138,14 @@
/**
* Finds types that contain JUnit tests in the given container.
- *
+ *
* @param container the container
* @param monitor the progress monitor used to report progress and request cancelation,
* or <code>null</code> if none
* @return test types inside the given container
* @throws CoreException when a problem occurs while accessing <code>container</code> or its children
* @throws OperationCanceledException if the operation has been canceled
- *
+ *
* @since 3.5
*/
public static IType[] findTestTypes(IJavaElement container, IProgressMonitor monitor) throws CoreException, OperationCanceledException {
@@ -158,11 +158,11 @@
/**
* Exports the given test run session into an XML report file.
- *
+ *
* @param testRunSession the test run session
* @param file the destination
* @throws CoreException if an error occurred
- *
+ *
* @since 3.7
*/
public static void exportTestRunSession(ITestRunSession testRunSession, File file) throws CoreException {
@@ -171,17 +171,17 @@
/**
* Exports the given test run session to an output stream.
- *
+ *
* @param testRunSession the test run session
* @param output the output stream
* @throws CoreException if an error occurred
- *
+ *
* @since 3.7
*/
public static void exportTestRunSession(ITestRunSession testRunSession, OutputStream output) throws CoreException {
try {
JUnitModel.exportTestRunSession((TestRunSession)testRunSession, output);
-
+
} catch (TransformerException exception) {
String pluginID= JUnitCorePlugin.getPluginId();
String message= ModelMessages.JUnitModel_could_not_export;
@@ -191,11 +191,11 @@
/**
* Imports a test run session from the given file.
- *
+ *
* @param file a file containing a test run session transcript
* @return the imported test run session
* @throws CoreException if the import failed
- *
+ *
* @since 3.7
*/
public static ITestRunSession importTestRunSession(File file) throws CoreException {
@@ -204,24 +204,24 @@
/**
* Imports a test run session from the given URL.
- *
+ *
* @param url an URL to a test run session transcript
* @param monitor a progress monitor for cancellation
* @return the imported test run session, or <code>null</code> if the import has been cancelled
* @throws CoreException if the import failed
- *
+ *
* @since 3.7
*/
public static ITestRunSession importTestRunSession(final String url, IProgressMonitor monitor) throws CoreException {
try {
return JUnitModel.importTestRunSession(url, monitor);
-
+
} catch (InvocationTargetException exception) {
String pluginID= JUnitCorePlugin.getPluginId();
String message= ModelMessages.JUnitModel_could_not_import;
Throwable throwable= exception.getCause() != null ? exception.getCause() : exception;
throw new CoreException(new Status(IStatus.ERROR, pluginID, message, throwable));
-
+
} catch (InterruptedException interrupt) {
return null;
}
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/TestRunListener.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/TestRunListener.java
index 858189e..2fcf3f0 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/TestRunListener.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/TestRunListener.java
@@ -21,7 +21,7 @@
* or as a contribution to the <code>org.eclipse.jdt.junit.testRunListeners</code> extension point.
* The latter approach has the advantage that the contributing plug-in is automatically loaded when a test run starts.
* <p>
- * A test run starts with the call to {@link #sessionLaunched(ITestRunSession)} and
+ * A test run starts with the call to {@link #sessionLaunched(ITestRunSession)} and
* {@link #sessionStarted(ITestRunSession)}, followed by calls to
* {@link #testCaseStarted(ITestCaseElement)} and {@link #testCaseFinished(ITestCaseElement)}
* for all test cases contained in the tree.
@@ -34,7 +34,7 @@
* @since 3.3
*/
public abstract class TestRunListener {
-
+
/**
* A test run session has been launched. The test tree is not available yet.
* <p>
@@ -47,7 +47,7 @@
*/
public void sessionLaunched(ITestRunSession session) {
}
-
+
/**
* A test run session has started. The test tree can be accessed through the session element.
* <p>
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java
index e9d1bcc..30e6890 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/launcher/JUnitLaunchConfigurationDelegate.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* David Saff (saff@mit.edu) - bug 102632: [JUnit] Support for JUnit 4.
@@ -170,7 +170,7 @@
}
String mainTypeName= verifyMainTypeName(configuration);
-
+
File workingDir = verifyWorkingDirectory(configuration);
String workingDirName = null;
@@ -221,7 +221,7 @@
runConfig.setWorkingDirectory(workingDirName);
runConfig.setVMSpecificAttributesMap(vmAttributesMap);
runConfig.setPreviewEnabled(supportsPreviewFeatures(configuration));
-
+
if (!JavaRuntime.isModularConfiguration(configuration)) {
// Bootpath
runConfig.setBootClassPath(getBootpath(configuration));
@@ -447,7 +447,7 @@
programArguments.add("-packageNameFile"); //$NON-NLS-1$
programArguments.add(fileName);
for (String pkgName : pkgNames) {
- if (!DEFAULT.equals(pkgName)) { // skip --add-opens for default package
+ if (!DEFAULT.equals(pkgName)) { // skip --add-opens for default package
collectAddOpensVmArgs(addOpensTargets, addOpensVmArgs, pkgName, configuration);
}
}
@@ -534,7 +534,7 @@
IJavaProject javaProject= getJavaProject(configuration);
String sourceModuleName= javaProject.getModuleDescription().getElementName();
addOpensVmArgs.add("--add-opens"); //$NON-NLS-1$
- addOpensVmArgs.add(sourceModuleName + "/" + pkgName + "=" + addOpensTargets); //$NON-NLS-1$ //$NON-NLS-2$
+ addOpensVmArgs.add(sourceModuleName + "/" + pkgName + "=" + addOpensTargets); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -648,7 +648,7 @@
* launch(...)} has been replaced with the call to
* {@link JUnitLaunchConfigurationDelegate#getClasspathAndModulepath(ILaunchConfiguration)
* getClasspathAndModulepath(ILaunchConfiguration)}.
- *
+ *
*/
@Override
@Deprecated
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestElement.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestElement.java
index a9fdfa8..a8a5bea 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestElement.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestElement.java
@@ -184,10 +184,10 @@
* <strong>Note:</strong> The elapsed time is only valid for
* {@link ITestElement.ProgressState#COMPLETED} test elements.
* </p>
- *
+ *
* @return total execution time for the test element in seconds, or {@link Double#NaN} if
* the state of the element is not {@link ITestElement.ProgressState#COMPLETED}
- *
+ *
* @since 3.4
*/
public double getElapsedTimeInSeconds();
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestRunSession.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestRunSession.java
index 2696750..74df9dd 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestRunSession.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestRunSession.java
@@ -37,7 +37,7 @@
/**
* Returns the Java project from which this test run session has been launched, or <code>null</code> if not available.
- *
+ *
* @return the launched project, or <code>null</code> is not available.
* @since 3.6
*/
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestSuiteElement.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestSuiteElement.java
index 0e06e6c..74725d7 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestSuiteElement.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/junit/model/ITestSuiteElement.java
@@ -29,7 +29,7 @@
/**
* Returns the name of the suite. This is either the qualified type name of the
* suite class, or a custom name if one has been set.
- *
+ *
* @return the name of the suite
*/
public String getSuiteTypeName();
diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java
index f68b686..bb24f00 100644
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java
+++ b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/MessageIds.java
@@ -121,7 +121,7 @@
* uniqueId = the unique ID of the test provided by JUnit launcher, otherwise an empty string
* <br>
* See: ITestRunListener2#testTreeEntry
- *
+ *
*/
public static final String TEST_TREE= "%TSTTREE"; //$NON-NLS-1$
/**
diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
index 2c29c19..5da9e10 100644
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
+++ b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/RemoteTestRunner.java
@@ -405,7 +405,7 @@
}
}
}
-
+
private void readTestNames(String testNameFile) throws IOException {
BufferedReader br= new BufferedReader(new InputStreamReader(new FileInputStream(new File(testNameFile)), "UTF-8")); //$NON-NLS-1$
try {
@@ -590,8 +590,8 @@
}
public void visitTreeEntry(ITestIdentifier identifier, boolean hasChildren, int testCount, boolean isDynamicTest, String parentId) {
- String treeEntry= getTestId(identifier) + ',' + escapeText(identifier.getName()) + ',' + hasChildren + ',' + testCount
- + ',' + isDynamicTest + ',' + parentId + ',' + escapeText(identifier.getDisplayName()) + ',' + escapeText(identifier.getParameterTypes())
+ String treeEntry= getTestId(identifier) + ',' + escapeText(identifier.getName()) + ',' + hasChildren + ',' + testCount
+ + ',' + isDynamicTest + ',' + parentId + ',' + escapeText(identifier.getDisplayName()) + ',' + escapeText(identifier.getParameterTypes())
+ ',' + escapeText(identifier.getUniqueId());
notifyTestTreeEntry(treeEntry);
}
diff --git a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestReferenceFailure.java b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestReferenceFailure.java
index 395deda..22205d7 100644
--- a/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestReferenceFailure.java
+++ b/org.eclipse.jdt.junit.runtime/src/org/eclipse/jdt/internal/junit/runner/TestReferenceFailure.java
@@ -60,7 +60,7 @@
@Override
public String toString() {
return fStatus + " " + RemoteTestRunner.escapeText(fTest.getName()) //$NON-NLS-1$
- + " " + RemoteTestRunner.escapeText(fTest.getParameterTypes()); //$NON-NLS-1$
+ + " " + RemoteTestRunner.escapeText(fTest.getParameterTypes()); //$NON-NLS-1$
}
public void setComparison(FailedComparison comparison) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java
index db74459..f42b850 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerWizardPage.java
@@ -175,7 +175,7 @@
setControl(composite);
}
-
+
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
index b7f3663..8cd93be 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/FailureTrace.java
@@ -46,7 +46,7 @@
* A pane that shows a stack trace of a failed test.
*/
public class FailureTrace implements IMenuListener {
-
+
/**
* Internal property change listener for handling workbench font changes.
*/
@@ -113,7 +113,7 @@
}
}
});
-
+
fFontPropertyChangeListener = new FontPropertyChangeListener();
JFaceResources.getFontRegistry().addListener(fFontPropertyChangeListener);
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 17773c2..fc60daa 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
@@ -168,23 +168,23 @@
public static String JUnitLaunchConfigurationTab_testdialog_message;
public static String JUnitLaunchConfigurationTab_testdialog_title;
-
+
public static String JUnitLaunchConfigurationTab_addtag_label;
-
+
public static String JUnitLaunchConfigurationTab_addtag_text;
-
+
public static String JUnitLaunchConfigurationTab_includetag_checkbox_label;
-
+
public static String JUnitLaunchConfigurationTab_excludetag_checkbox_label;
-
+
public static String JUnitLaunchConfigurationTab_includetags_description;
-
+
public static String JUnitLaunchConfigurationTab_excludetags_description;
-
+
public static String JUnitLaunchConfigurationTab_addincludeexcludetagdialog_title;
-
+
public static String JUnitLaunchConfigurationTab_includetag_empty_error;
-
+
public static String JUnitLaunchConfigurationTab_excludetag_empty_error;
public static String JUnitLaunchShortcut_dialog_title;
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
index da4a399..f78bfca 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPlugin.java
@@ -256,7 +256,7 @@
/**
* Returns a service with the specified name or <code>null</code> if none.
- *
+ *
* @param serviceName name of service
* @return service object or <code>null</code> if none
* @since 3.5
@@ -343,7 +343,7 @@
}
return section;
}
-
+
public static void asyncShowTestRunnerViewPart() {
getDisplay().asyncExec(new Runnable() {
@Override
@@ -372,7 +372,7 @@
return null;
}
}
-
+
private static Display getDisplay() {
// Shell shell= getActiveWorkbenchShell();
// if (shell != null) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
index a493405..8c8a33a 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
@@ -374,7 +374,7 @@
SWTUtil.setButtonDimensionHint(fShowInAllViewsCheckBox);
setShowInAllViewsCheckBoxSelection(JUnitUIPreferencesConstants.getShowInAllViews());
}
-
+
/**
* Programatic access to enable assertions checkbox
* @return boolean indicating check box selected or not
@@ -390,11 +390,11 @@
public boolean getShowInAllViewsCheckBoxSelection() {
return fShowInAllViewsCheckBox.getSelection();
}
-
+
public void setShowInAllViewsCheckBoxSelection(boolean selected) {
fShowInAllViewsCheckBox.setSelection(selected);
}
-
+
/*
* Create a group to contain the step filter related widgets
*/
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
index e648ce9..19d77a2 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitQuickFixProcessor.java
@@ -162,7 +162,7 @@
qualifiedName= "org.junit.jupiter.api.TestFactory"; //$NON-NLS-1$
break;
case "Testable": //$NON-NLS-1$
- qualifiedName= "org.junit.platform.commons.annotation.Testable"; //$NON-NLS-1$
+ qualifiedName= "org.junit.platform.commons.annotation.Testable"; //$NON-NLS-1$
break;
case "TestTemplate": //$NON-NLS-1$
qualifiedName= "org.junit.jupiter.api.TestTemplate"; //$NON-NLS-1$
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitUIPreferencesConstants.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitUIPreferencesConstants.java
index 36b3df2..3cbdda0 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitUIPreferencesConstants.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitUIPreferencesConstants.java
@@ -21,7 +21,7 @@
/**
* Defines constants which are used to refer to values in the plugin's preference store.
- *
+ *
* @since 3.7
*/
public class JUnitUIPreferencesConstants {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
index 99a17d9..2fccc7e 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/OpenTestAction.java
@@ -113,7 +113,7 @@
if (testCase.isIgnored() && JavaConventions.validateJavaTypeName(testCase.getTestName(), JavaCore.VERSION_1_5, JavaCore.VERSION_1_5).getSeverity() != IStatus.ERROR) {
return null;
}
-
+
//workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=275308 :
String testMethodName= testCase.getTestMethodName();
for (int i= 0; i < testMethodName.length(); i++) {
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
index ef68136..aba2a3e 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TestViewer.java
@@ -111,13 +111,13 @@
return ! fTestRunSession.isRunning() && status == Status.RUNNING; // rerunning
}
}
-
+
private final class IgnoredOnlyFilter extends ViewerFilter {
@Override
public boolean select(Viewer viewer, Object parentElement, Object element) {
return select(((TestElement) element));
}
-
+
public boolean select(TestElement testElement) {
if (hasIgnoredInTestResult(testElement))
return true;
@@ -128,9 +128,9 @@
/**
* Checks whether a test was skipped i.e. it was ignored (<code>@Ignored</code>) or had any
* assumption failure.
- *
+ *
* @param testElement the test element (a test suite or a single test case)
- *
+ *
* @return <code>true</code> if the test element or any of its children has
* {@link Result#IGNORED} test result
*/
@@ -468,7 +468,7 @@
fViewerbook.setRedraw(true);
}
}
-
+
/**
* It makes sense to display either failed or ignored tests, not both together.
*
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java
index 70b4083..d27646c 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/JUnitStubUtility.java
@@ -277,7 +277,7 @@
* enclosing type separator in the qualified type name. Type erasure is performed on a parameterized
* type, arrays use the square brackets and a type parameter is resolved while creating the return
* value.
- *
+ *
* @param method the method whose parameter types are required
* @param useSimpleNames <code>true</code> if the last segment of the type name should be used
* instead of the fully qualified type name
@@ -330,7 +330,7 @@
if (useSimpleNames) {
stream= stream.map(paramTypeName -> paramTypeName.substring(paramTypeName.lastIndexOf('.') + 1));
}
- paramTypes= stream.collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ paramTypes= stream.collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return paramTypes;
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java
index 42c6263..afa5a3c 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/util/LayoutUtil.java
@@ -94,7 +94,7 @@
/**
* Sets the horizontal indent of a dependent control. Assumes that GridData is used.
- *
+ *
* @param control the control
*/
public static void setHorizontalIndent(Control control) {
@@ -110,7 +110,7 @@
* <strong>Note:</strong> Use this method instead of {@link LayoutConstants#getIndent()} for
* compatibility reasons.
* </p>
- *
+ *
* @return the indent of dependent controls, in pixels.
*/
public static final int getIndent() {
@@ -119,7 +119,7 @@
/**
* Sets the horizontal grabbing of a control to true. Assumes that GridData is used.
- *
+ *
* @param control the control
*/
public static void setHorizontalGrabbing(Control control) {
@@ -131,9 +131,9 @@
/**
* Sets the vertical grabbing of a control to true. Assumes that GridData is used.
- *
+ *
* @param control the control
- *
+ *
*/
public static void setVerticalGrabbing(Control control) {
Object ld= control.getLayoutData();
@@ -146,7 +146,7 @@
/**
* Sets the width hint of a control. Assumes that GridData is used.
- *
+ *
* @param control the control
* @param widthHint the preferred width in pixels
*/
@@ -159,7 +159,7 @@
/**
* Sets the heightHint hint of a control. Assumes that GridData is used.
- *
+ *
* @param control the control
* @param heightHint the preferred height in pixels
*/
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/SuiteClassesContentProvider.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/SuiteClassesContentProvider.java
index a19e821..c7aae02 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/SuiteClassesContentProvider.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/SuiteClassesContentProvider.java
@@ -40,7 +40,7 @@
public SuiteClassesContentProvider() {
this(false);
}
-
+
public SuiteClassesContentProvider(boolean includeJunit4Tests) {
this.fIncludeJunit4Tests = includeJunit4Tests;
}
@@ -72,7 +72,7 @@
} else {
new JUnit3TestFinder().findTestsInContainer(pack, result, null);
}
-
+
return result;
} catch (CoreException e) {
JUnitPlugin.log(e);
@@ -87,11 +87,11 @@
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
-
+
public void setIncludeJunit4Tests(boolean includeJunit4Tests) {
fIncludeJunit4Tests= includeJunit4Tests;
}
-
+
public boolean isIncludeJunit4Tests() {
return fIncludeJunit4Tests;
}
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
index 806b428..39b0d4e 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/UpdateTestSuite.java
@@ -156,7 +156,7 @@
} else {
noSuiteError();
}
-
+
} else{
/* find TestClasses already in Test Suite */
IType testSuiteType= fTestSuite.findPrimaryType();
@@ -219,7 +219,7 @@
if (primaryType != null) {
fIsJunit4 = primaryType.getAnnotation("RunWith").exists(); //$NON-NLS-1$
}
-
+
}
}
}
@@ -249,7 +249,7 @@
monitor.done();
}
}
-
+
public static void updateTestCasesInSuite(IProgressMonitor monitor, ICompilationUnit testSuite, IMethod suiteMethod, Object[] selectedTestCases) throws JavaModelException {
try {
monitor.beginTask(WizardMessages.UpdateAllTests_beginTask, 5);
@@ -294,8 +294,8 @@
end += NewTestSuiteWizardPage.NON_COMMENT_END_MARKER.length();
return new TestSuiteClassListRange(start, end);
}
-
-
+
+
/*
* Returns the new code to be included in a new suite() or which replaces old code in an existing suite().
@@ -317,7 +317,7 @@
suite.append("\n"+NewTestSuiteWizardPage.END_MARKER); //$NON-NLS-1$
return suite.toString();
}
-
+
/*
* Returns the new test suite annotations which replace old annotations in the existing suite
*/
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java
index c2df134..0ea8aae 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/launcher/JUnitLaunchShortcut.java
@@ -303,7 +303,7 @@
* <code>{@link #createLaunchConfiguration(IJavaElement, String) createLaunchConfiguration}(element, null)</code>.
* Extenders are recommended to extend the two-args method instead of this method.
* </p>
- *
+ *
* @param element element to launch
*
* @return a launch configuration working copy for the given element
@@ -322,7 +322,7 @@
* <p>Clients can extend this method (should call super) to configure additional attributes on the
* launch configuration working copy.
* </p>
- *
+ *
* @param element element to launch
* @param testName name of the test to launch, e.g. the method name or an artificial name
* created by a JUnit runner, or <code>null</code> if none. The testName is
@@ -388,7 +388,7 @@
/**
* Computes a human-readable name for a launch configuration. The name serves as a suggestion and
* it's the caller's responsibility to make it valid and unique.
- *
+ *
* @param element The Java Element that will be executed.
* @param fullTestName The test name. See
* org.eclipse.jdt.internal.junit4.runner.DescriptionMatcher for supported formats.
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java
index 6fa7427..efaa8ca 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestCaseWizardPageOne.java
@@ -171,7 +171,7 @@
/**
* Available JUnit versions.
- *
+ *
* @since 3.11
*/
public enum JUnitVersion {
@@ -323,7 +323,7 @@
/**
* Specifies the JUnit version to create the test.
- *
+ *
* @param version the JUnit version
* @since 3.11
*/
@@ -352,7 +352,7 @@
/**
* Specifies if the JUnit version radio buttons are enabled.
- *
+ *
* @param enabled if <code>true</code>, the JUnit version radio buttons are enabled; otherwise they
* are read-only
* @since 3.11
@@ -384,7 +384,7 @@
/**
* Returns the JUnit version to create the test.
- *
+ *
* @return the JUnit version to create the test
* @since 3.11
*/
@@ -403,7 +403,7 @@
/**
* Returns whether the super class name is one of the default super class names.
- *
+ *
* @return <code>true</code> if the super class name is one of the default super class names,
* <code>false</code> otherwise
* @since 3.7
@@ -994,22 +994,22 @@
private void createSetUp(IType type, ImportsManager imports) throws CoreException {
String annotationType= fJUnitVersion == JUnitVersion.VERSION_4 ? "org.junit.Before" : "org.junit.jupiter.api.BeforeEach"; //$NON-NLS-1$ //$NON-NLS-2$
- createSetupStubs(type, "setUp", false, annotationType, imports); //$NON-NLS-1$
+ createSetupStubs(type, "setUp", false, annotationType, imports); //$NON-NLS-1$
}
private void createTearDown(IType type, ImportsManager imports) throws CoreException {
String annotationType= fJUnitVersion == JUnitVersion.VERSION_4 ? "org.junit.After" : "org.junit.jupiter.api.AfterEach"; //$NON-NLS-1$ //$NON-NLS-2$
- createSetupStubs(type, "tearDown", false, annotationType, imports); //$NON-NLS-1$
+ createSetupStubs(type, "tearDown", false, annotationType, imports); //$NON-NLS-1$
}
private void createSetUpClass(IType type, ImportsManager imports) throws CoreException {
String annotationType= fJUnitVersion == JUnitVersion.VERSION_4 ? "org.junit.BeforeClass" : "org.junit.jupiter.api.BeforeAll"; //$NON-NLS-1$ //$NON-NLS-2$
- createSetupStubs(type, "setUpBeforeClass", true, annotationType, imports); //$NON-NLS-1$
+ createSetupStubs(type, "setUpBeforeClass", true, annotationType, imports); //$NON-NLS-1$
}
private void createTearDownClass(IType type, ImportsManager imports) throws CoreException {
String annotationType= fJUnitVersion == JUnitVersion.VERSION_4 ? "org.junit.AfterClass" : "org.junit.jupiter.api.AfterAll"; //$NON-NLS-1$ //$NON-NLS-2$
- createSetupStubs(type, "tearDownAfterClass", true, annotationType, imports); //$NON-NLS-1$
+ createSetupStubs(type, "tearDownAfterClass", true, annotationType, imports); //$NON-NLS-1$
}
private void createTestMethodStubs(IType type, ImportsManager imports) throws CoreException {
@@ -1039,7 +1039,7 @@
/**
* Creates a test method.
- *
+ *
* @param type the type to create the method
* @param imports the imports manager
* @param method the method or <code>null</code>
@@ -1388,7 +1388,7 @@
* returned. Implementors can override this behavior to return the name of a
* subclass instead.
*
- * @return the fully qualified name of a subclass of the JUnit 3 TestCase class.
+ * @return the fully qualified name of a subclass of the JUnit 3 TestCase class.
*
* @since 3.7
*/
@@ -1398,7 +1398,7 @@
/**
* Returns the default value for the super class field.
- *
+ *
* @return the default value for the super class field
* @since 3.7
*/
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
index be0c1ba..d0a3a8d 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/junit/wizards/NewTestSuiteWizardPage.java
@@ -107,10 +107,10 @@
/** Field ID of the class in suite field. */
public final static String CLASSES_IN_SUITE= PAGE_NAME + ".classesinsuite"; //$NON-NLS-1$
-
+
/**
* Field ID of the junit4 toggle field.
- *
+ *
* @since 3.7
*/
public final static String JUNIT4TOGGLE= PAGE_NAME + ".junit4toggle"; //$NON-NLS-1$
@@ -126,7 +126,7 @@
private Button fJUnit3Toggle;
private boolean fIsJunit4;
private boolean fIsJunit4Enabled;
-
+
/**
* Creates a new <code>NewTestSuiteWizardPage</code>.
*/
@@ -362,7 +362,7 @@
*/
private String getSuiteMethodString(IType type) {
String typeName= type.getElementName();
- StringBuilder suite= new StringBuilder("public static Test suite () {TestSuite suite= new TestSuite(" + typeName + ".class.getName());\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ StringBuilder suite= new StringBuilder("public static Test suite () {TestSuite suite= new TestSuite(" + typeName + ".class.getName());\n"); //$NON-NLS-1$ //$NON-NLS-2$
suite.append(getUpdatableString());
suite.append("\nreturn suite;}"); //$NON-NLS-1$
return suite.toString();
@@ -475,7 +475,7 @@
status.setError(WizardMessages.NewTestSuiteWizPage_typeName_error_name_qualified);
return status;
}
-
+
IPackageFragment pack= getPackageFragment();
if (pack != null) {
ICompilationUnit cu= pack.getCompilationUnit(typeName + ".java"); //$NON-NLS-1$
@@ -509,7 +509,7 @@
if (cu.exists()) {
status.setWarning(isJUnit4()
? WizardMessages.NewTestSuiteWizPage_typeName_warning_already_exists_junit4
- : WizardMessages.NewTestSuiteWizPage_typeName_warning_already_exists);
+ : WizardMessages.NewTestSuiteWizPage_typeName_warning_already_exists);
return status;
}
IResource resource= cu.getResource();
@@ -550,7 +550,7 @@
imports.addImport("org.junit.runners.Suite.SuiteClasses"); //$NON-NLS-1$
} else {
imports.addImport("junit.framework.Test"); //$NON-NLS-1$
- imports.addImport("junit.framework.TestSuite"); //$NON-NLS-1$
+ imports.addImport("junit.framework.TestSuite"); //$NON-NLS-1$
}
}
@@ -567,9 +567,9 @@
*/
private void saveWidgetValues() {
}
-
-
-
+
+
+
/**
* Creates the controls for the JUnit 4 toggle control. Expects a <code>GridLayout</code> with
* at least 3 columns.
@@ -608,10 +608,10 @@
fJUnit4Toggle.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 1, 1));
fJUnit4Toggle.addSelectionListener(listener);
}
-
+
/**
* Specifies if the test should be created as JUnit 4 test.
- *
+ *
* @param isJUnit4 If set, a JUnit 4 test will be created
* @param isEnabled if <code>true</code> the modifier fields are
* editable; otherwise they are read-only
@@ -624,7 +624,7 @@
fJUnit4Toggle.setSelection(isJUnit4);
fJUnit3Toggle.setSelection(!isJUnit4);
fJUnit4Toggle.setEnabled(isEnabled || isJUnit4);
- fJUnit3Toggle.setEnabled(isEnabled || !isJUnit4);
+ fJUnit3Toggle.setEnabled(isEnabled || !isJUnit4);
}
internalSetJUnit4(isJUnit4);
}
@@ -654,13 +654,13 @@
}
handleFieldChanged(JUNIT4TOGGLE);
}
-
+
@Override
protected String constructCUContent(ICompilationUnit cu, String typeContent, String lineDelimiter) throws CoreException {
if (isJUnit4()) {
typeContent= appendAnnotations(typeContent, lineDelimiter);
}
-
+
return super.constructCUContent(cu, typeContent, lineDelimiter);
}
@@ -676,7 +676,7 @@
buffer.append(".class"); //$NON-NLS-1$
if(i<checkedElements.length-1)
buffer.append(',');
-
+
}
}
buffer.append("})"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/DescriptionMatcher.java b/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/DescriptionMatcher.java
index fabe275..6e07228 100644
--- a/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/DescriptionMatcher.java
+++ b/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/DescriptionMatcher.java
@@ -23,7 +23,7 @@
/**
* This class matches JUnit's {@link Description} against a string.
- *
+ *
* See {@link #create(Class, String)} for details.
*/
public abstract class DescriptionMatcher {
@@ -76,7 +76,7 @@
* This class extracts the leading chars from {@link Description#getMethodName()} which are a
* valid Java identifier. If this identifier equals this class' identifier, the Description is
* matched.
- *
+ *
* Please be aware that {@link Description#getMethodName()} can be any value a JUnit runner has
* computed. It is not necessarily a valid method name. For example, {@link Parameterized} uses
* the format 'methodname[i]', with 'i' being the row index in the table of test data.
@@ -115,7 +115,7 @@
/**
* Creates a matcher object that can decide for {@link Description}s whether they match the
* supplied 'matchString' or not.
- *
+ *
* Several strategies for matching are applied:
* <ul>
* <li>if 'matchString' equals {@link Description#getDisplayName()}, it's always a match</li>
@@ -126,12 +126,12 @@
* 'matchString' is a Java identifier, it matches Descriptions via leading identifiers. See
* {@link LeadingIdentifierMatcher}</li>
* </ul>
- *
+ *
* @param clazz A class that is used when 'matchString' does not have the format
* methodName(className).
- *
+ *
* @param matchString A string to match JUnit's {@link Description}s against.
- *
+ *
* @return A matcher object.
*/
public static DescriptionMatcher create(Class<?> clazz, String matchString) {
diff --git a/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/FailuresFirstSorter.java b/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/FailuresFirstSorter.java
index 5796444..9d8e69f 100644
--- a/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/FailuresFirstSorter.java
+++ b/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/FailuresFirstSorter.java
@@ -27,16 +27,16 @@
* A description is considered to have failures if its name or one of its transitive
* children's names are in the failures list.
* If neither or both have failures, returns 0.
- *
+ *
* @since 3.6
*/
public class FailuresFirstSorter implements Comparator<Description> {
private final Set<String> failuresList;
-
+
/**
* Creates a sorter.
- *
+ *
* @param failuresList list of failed tests based on the description's display string
*/
public FailuresFirstSorter(String[] failuresList) {
@@ -47,12 +47,12 @@
* Compares two descriptions based on the failure list.
* @param d1 the first Description to compare with
* @param d2 the second Description to compare with
- * @return -1 if only d1 has failures, 1 if only d2 has failures, 0 otherwise
+ * @return -1 if only d1 has failures, 1 if only d2 has failures, 0 otherwise
*/
public int compare(Description d1, Description d2) {
boolean d1HasFailures = hasFailures(d1);
boolean d2HasFailures = hasFailures(d2);
-
+
if (d1HasFailures) {
return -1;
} else if (d2HasFailures) {
diff --git a/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/SubForestFilter.java b/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/SubForestFilter.java
index 2739d46..2616db3 100644
--- a/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/SubForestFilter.java
+++ b/org.eclipse.jdt.junit4.runtime/src/org/eclipse/jdt/internal/junit4/runner/SubForestFilter.java
@@ -24,7 +24,7 @@
/**
* This filter keeps all matched {@link Description}s in a tree, including the children and
* container of the matched Description.
- *
+ *
* It is allowed to match more than one Description.
*/
public class SubForestFilter extends Filter {
diff --git a/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java b/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java
index 4db779a..bb6b766 100644
--- a/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java
+++ b/org.eclipse.jdt.junit5.runtime/src/org/eclipse/jdt/internal/junit5/runner/JUnit5TestListener.java
@@ -134,7 +134,7 @@
return new FailedComparison(expectedStr, actualStr);
}
- // Avoid reference to ComparisonFailure initially to avoid NoClassDefFoundError for ComparisonFailure when junit.jar is not on the build path
+ // Avoid reference to ComparisonFailure initially to avoid NoClassDefFoundError for ComparisonFailure when junit.jar is not on the build path
String classname= exception.getClass().getName();
if (classname.equals("junit.framework.ComparisonFailure")) { //$NON-NLS-1$
junit.framework.ComparisonFailure comparisonFailure= (junit.framework.ComparisonFailure) exception;
