improve test cases

Jenkinsfile

@@ -1,10 +1,10 @@
 pipeline {
 	options {
 		timeout(time: 40, unit: 'MINUTES')
-		buildDiscarder(logRotator(numToKeepStr:'10'))
+		buildDiscarder(logRotator(numToKeepStr: '10'))
 	}
 	agent {
-		label "centos-latest"
+		label 'centos-latest'
 	}
 	tools {
 		maven 'apache-maven-latest'
@@ -13,9 +13,17 @@ pipeline {
 	stages {
 		stage('Build') {
 			steps {
+				withMaven(maven:'apache-maven-latest', mavenLocalRepo: '$WORKSPACE/.m2/repository') {
 				wrap([$class: 'Xvnc', useXauthority: true]) {
-					sh 'mvn clean verify org.eclipse.dash:license-tool-plugin:license-check -B -Psign -Dmaven.repo.local=$WORKSPACE/.m2/repository -Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true -Ddash.fail=false'
-				}
+					sh '''
+						mvn clean verify \
+							org.eclipse.dash:license-tool-plugin:license-check \
+							-B -Psign \
+							-Dmaven.test.failure.ignore=true \
+							-Ddash.fail=false \
+							-Dsurefire.rerunFailingTestsCount=3
+					'''
+				}}
 			}
 			post {
 				always {
@@ -29,12 +37,12 @@ pipeline {
 				branch 'master'
 			}
 			steps {
-				sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
+				sshagent (['projects-storage.eclipse.org-bot-ssh']) {
 					sh '''
 						DOWNLOAD_AREA=/home/data/httpd/download.eclipse.org/lsp4e/snapshots/
 						echo DOWNLOAD_AREA=$DOWNLOAD_AREA
 						ssh genie.lsp4e@projects-storage.eclipse.org "\
-							rm -rf  ${DOWNLOAD_AREA}/* && \
+							rm -rf ${DOWNLOAD_AREA}/* && \
 							mkdir -p ${DOWNLOAD_AREA}"
 						scp -r repository/target/repository/* genie.lsp4e@projects-storage.eclipse.org:${DOWNLOAD_AREA}
 					'''

org.eclipse.lsp4e.test/fragment.xml

@@ -4,37 +4,37 @@
    <extension
          point="org.eclipse.lsp4e.languageServer">
       <server
-            class="org.eclipse.lsp4e.test.MockConnectionProvider"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS">
       </server>
       <server
-            class="org.eclipse.lsp4e.test.MockConnectionProvider"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server2"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS 2">
       </server>
        <server
-            class="org.eclipse.lsp4e.test.MockConnectionProviderWithException"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProviderWithException"
             id="org.eclipse.lsp4e.test.server-with-exception"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS With Exception">
       </server>
        <server
-            class="org.eclipse.lsp4e.test.MockConnectionProviderMultiRootFolders"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProviderMultiRootFolders"
             id="org.eclipse.lsp4e.test.server-with-multi-root-support"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS With Multi-Root Support">
       </server>
       <server
-            class="org.eclipse.lsp4e.test.MockConnectionProvider"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server.disable"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS Enablement">
       </server>
       <server
-            class="org.eclipse.lsp4e.test.MockConnectionProvider"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server-with-last-document-disconnected-timeout"
             lastDocumentDisconnectedTimeout="2"
             label="Test LS with LastDocumentDisconnectedTimeout set to two seconds">
@@ -95,7 +95,7 @@
             </enabledWhen>
       </contentTypeMapping>
       <server
-            class="org.eclipse.lsp4e.test.MockConnectionProvider"
+            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.singletonLS"
             label="Singleton LS"
             lastDocumentDisconnectedTimeout="0"
@@ -204,14 +204,14 @@
    <extension
          point="org.eclipse.ui.startup">
       <startup
-            class="org.eclipse.lsp4e.test.CreateAndRegisterContentTypeLSPLaunchConfigMapping">
+            class="org.eclipse.lsp4e.test.utils.CreateAndRegisterContentTypeLSPLaunchConfigMapping">
       </startup>
    </extension>
 
   <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
-            class="org.eclipse.lsp4e.test.MappingEnablementTester"
+            class="org.eclipse.lsp4e.test.utils.MappingEnablementTester"
             id="org.eclipse.lsp4e.test.MappingEnablementTester"
             namespace="org.eclipse.lsp4e.test"
             properties="enablementPropertyTester"
@@ -221,14 +221,14 @@
   <extension
          point="org.eclipse.core.filesystem.filesystems">
       <filesystem scheme="other">
-         <run class="org.eclipse.lsp4e.test.OtherFileSystem" />
+         <run class="org.eclipse.lsp4e.test.utils.OtherFileSystem" />
       </filesystem>
   </extension>"
   <extension
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="java.lang.String"
-            class="org.eclipse.lsp4e.test.UriToResourceAdapterFactory">
+            class="org.eclipse.lsp4e.test.utils.UriToResourceAdapterFactory">
          <adapter
                type="org.eclipse.core.resources.IResource">
          </adapter>
@@ -238,7 +238,7 @@
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="java.lang.String"
-            class="org.eclipse.lsp4e.test.UriToResourceAdapterFactory">
+            class="org.eclipse.lsp4e.test.utils.UriToResourceAdapterFactory">
          <adapter
                type="org.eclipse.core.resources.IFile">
          </adapter>
@@ -248,7 +248,7 @@
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="org.eclipse.core.resources.IFile"
-            class="org.eclipse.lsp4e.test.UriToResourceAdapterFactory">
+            class="org.eclipse.lsp4e.test.utils.UriToResourceAdapterFactory">
          <adapter
                type="java.net.URI">
          </adapter>

org.eclipse.lsp4e.test/pom.xml

@@ -36,13 +36,13 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
+				<!-- https://tycho.eclipseprojects.io/doc/latest/tycho-surefire-plugin/test-mojo.html -->
 				<configuration>
 					<trimStackTrace>false</trimStackTrace>
-					<testClass>org.eclipse.lsp4e.test.AllTests</testClass>
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
 					<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
-					<argLine>${tycho.testArgLine} ${ui.test.vmargs} ${os-jvm-flags}</argLine>
+					<argLine>${tycho.testArgLine} -Djava.util.logging.config.file=${project.basedir}/src/jul.properties ${ui.test.vmargs} ${os-jvm-flags}</argLine>
 				</configuration>
 			</plugin>
 		</plugins>

org.eclipse.lsp4e.test/src/jul.properties

@@ -0,0 +1,15 @@
+# configure log output target(s)
+handlers=java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level=INFO
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+
+# configure log format
+# %1=date %2=source %3=logger %4=level %5=message, %6=thrown
+java.util.logging.SimpleFormatter.format=%1$tT %4$s [%3$s] %5$s %6$s%n
+
+
+# configure log levels
+.level=INFO
+
+# this suppresses the useless logging of "IOException: Connection reset by peer" at INFO level which occurs when the LS was gracefully stopped
+org.eclipse.lsp4j.jsonrpc.json.StreamMessageProducer.level=WARNING

org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/ContentTypeToLanguageServerDefinitionTest.java

@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -20,6 +19,7 @@
 import org.eclipse.lsp4e.ContentTypeToLanguageServerDefinition;
 import org.eclipse.lsp4e.LanguageServerPlugin;
 import org.eclipse.lsp4e.LanguageServersRegistry;
+import org.eclipse.lsp4e.test.utils.TestUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -46,23 +46,21 @@ public void testDisabledLanguageServerMappingsPreference() {
 		List<ContentTypeToLanguageServerDefinition> disabledDefinitions = LanguageServersRegistry.getInstance()
 				.getContentTypeToLSPExtensions().stream().filter(lsDefinition -> !lsDefinition.isEnabled(null))
 				.toList();
-		assertEquals(1, disabledDefinitions.size());
-		assertEquals(SERVER_TO_DISABLE, disabledDefinitions.get(0).getValue().id);
-		assertEquals(DISABLED_CONTENT_TYPE, disabledDefinitions.get(0).getKey().toString());
-
+		assertTrue(disabledDefinitions.contains(TestUtils.getDisabledLS()));
 	}
 
 	@Test
 	public void testDisableLanguageServerMapping() {
 		ContentTypeToLanguageServerDefinition lsDefinition = TestUtils.getDisabledLS();
+
 		lsDefinition.setUserEnabled(false);
 		assertFalse(lsDefinition.isEnabled(null));
 		assertTrue(LanguageServerPlugin.getDefault().getPreferenceStore().contains(DISABLED_SERVER_PREF));
 		assertFalse(LanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(DISABLED_SERVER_PREF));
+
 		lsDefinition.setUserEnabled(true);
 		assertTrue(lsDefinition.isEnabled(null));
 		assertTrue(LanguageServerPlugin.getDefault().getPreferenceStore().contains(DISABLED_SERVER_PREF));
 		assertTrue(LanguageServerPlugin.getDefault().getPreferenceStore().getBoolean(DISABLED_SERVER_PREF));
 	}
-
 }

org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java

@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.test;
 
-import static org.eclipse.lsp4e.test.TestUtils.waitForAndAssertCondition;
+import static org.eclipse.lsp4e.test.utils.TestUtils.waitForAndAssertCondition;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -27,6 +27,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.lsp4e.LanguageServerWrapper;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
+import org.eclipse.lsp4e.test.utils.AllCleanRule;
+import org.eclipse.lsp4e.test.utils.TestUtils;
 import org.eclipse.ui.IEditorPart;
 import org.junit.Before;
 import org.junit.Rule;

org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServersTest.java

@@ -13,9 +13,7 @@
 package org.eclipse.lsp4e.test;
 
 import static org.eclipse.lsp4e.LanguageServiceAccessor.hasActiveLanguageServers;
-import static org.eclipse.lsp4e.test.TestUtils.createUniqueTestFile;
-import static org.eclipse.lsp4e.test.TestUtils.openEditor;
-import static org.eclipse.lsp4e.test.TestUtils.waitForCondition;
+import static org.eclipse.lsp4e.test.utils.TestUtils.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -43,6 +41,9 @@
 import org.eclipse.lsp4e.LanguageServers;
 import org.eclipse.lsp4e.LanguageServers.LanguageServerDocumentExecutor;
 import org.eclipse.lsp4e.internal.Pair;
+import org.eclipse.lsp4e.test.utils.AllCleanRule;
+import org.eclipse.lsp4e.test.utils.MockConnectionProvider;
+import org.eclipse.lsp4e.test.utils.TestUtils;
 import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
 import org.eclipse.lsp4e.tests.mock.MockTextDocumentService;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;

org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServiceAccessorTest.java

@@ -19,15 +19,7 @@
 import static org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrapper;
 import static org.eclipse.lsp4e.LanguageServiceAccessor.getLSWrappers;
 import static org.eclipse.lsp4e.LanguageServiceAccessor.hasActiveLanguageServers;
-import static org.eclipse.lsp4e.test.TestUtils.createFile;
-import static org.eclipse.lsp4e.test.TestUtils.createProject;
-import static org.eclipse.lsp4e.test.TestUtils.createTempFile;
-import static org.eclipse.lsp4e.test.TestUtils.createUniqueTestFile;
-import static org.eclipse.lsp4e.test.TestUtils.createUniqueTestFileMultiLS;
-import static org.eclipse.lsp4e.test.TestUtils.openEditor;
-import static org.eclipse.lsp4e.test.TestUtils.openTextViewer;
-import static org.eclipse.lsp4e.test.TestUtils.waitForAndAssertCondition;
-import static org.eclipse.lsp4e.test.TestUtils.waitForCondition;
+import static org.eclipse.lsp4e.test.utils.TestUtils.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -52,6 +44,8 @@
 import org.eclipse.lsp4e.LanguageServers;
 import org.eclipse.lsp4e.LanguageServersRegistry;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
+import org.eclipse.lsp4e.test.utils.AllCleanRule;
+import org.eclipse.lsp4e.test.utils.MappingEnablementTester;
 import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
 import org.eclipse.lsp4e.tests.mock.MockLanguageServerMultiRootFolders;
 import org.eclipse.lsp4e.ui.UI;