Fix tests on Mac OS

Fix several race conditions

This closes #1046
This closes #1080

Author: kwin

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/internal/project/registry/MemoryConsumptionTest.java

@@ -14,7 +14,7 @@
 package org.eclipse.m2e.core.internal.project.registry;
 
 import java.io.File;
-import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.file.Files;
 import java.util.Collections;
@@ -69,7 +69,8 @@ public void testImportLongBuildChain() throws Exception {
       waitForJobsToComplete(monitor);
       for(IProject p : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
         if(p.hasNature(IMavenConstants.NATURE_ID)) {
-          poms.remove(p.getFile("pom.xml").getLocation().toFile());
+          File pomFile = p.getFile("pom.xml").getLocation().toFile();
+          Assert.assertTrue("Could not remove pom path " + pomFile + " from list of projects to be imported: " + poms, poms.remove(pomFile));
         }
       }
       Assert.assertEquals("Some poms were not imported as project", Collections.emptySet(), poms);
@@ -80,13 +81,13 @@ public void testImportLongBuildChain() throws Exception {
     }
   }
 
-  private Set<File> buildLinearHierarchy(int depth, File tempDirectory) throws FileNotFoundException {
+  private Set<File> buildLinearHierarchy(int depth, File tempDirectory) throws IOException {
     Set<File> poms = new HashSet<>(depth, 1.f);
     for(int i = 0; i < depth; i++ ) {
       File projectDir = new File(tempDirectory, "p" + i);
       projectDir.mkdirs();
       File pom = new File(projectDir, "pom.xml");
-      poms.add(pom);
+      poms.add(pom.getCanonicalFile()); // on Mac OS the temp file is reachable via /var which is a symbolic link to /private/var
       try (PrintStream content = new PrintStream(pom);) {
         content.println("<project>");
         content.println("  <modelVersion>4.0.0</modelVersion>");

org.eclipse.m2e.core.ui.tests/src/org/eclipse/m2e/core/ui/tests/ConsoleTest.java

@@ -216,8 +216,12 @@ private static void assertDebugeePrintOutAndDebuggerLaunch(IDocument document, S
 				debugLaunch.getLaunchConfiguration().getType().getIdentifier());
 		assertEquals(debugLaunchName, debugLaunch.getLaunchConfiguration()
 				.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""));
-		assertEquals("debug", debugLaunch.getLaunchMode());
-		assertTrue(debugLaunch.isTerminated());
+		assertEquals(ILaunchManager.DEBUG_MODE, debugLaunch.getLaunchMode());
+		long startTime = System.currentTimeMillis();
+		while (!debugLaunch.isTerminated() && System.currentTimeMillis() - startTime < 10000 ) {
+			Thread.onSpinWait();
+		}
+		assertTrue("Debug launch " + debugLaunch.getLaunchConfiguration().getName() + " is not terminated yet after waiting for 10 seconds", debugLaunch.isTerminated());
 	}
 
 	// --- common utility methods ---

org.eclipse.m2e.editor.lemminx.tests/src/org/eclipse/m2e/editor/lemminx/tests/EditorTest.java

@@ -90,7 +90,7 @@ public void testGenericEditorHasMavenExtensionEnabled() throws Exception {
 		Set<Shell> beforeShells = Arrays.stream(display.getShells()).filter(Shell::isVisible).collect(Collectors.toSet());
 		editorPart.getSelectionProvider().setSelection(new TextSelection(offset, 0));
 		editorPart.getAction(ITextEditorActionConstants.CONTENT_ASSIST).run();
-		assertTrue("Missing completion proposals", DisplayHelper.waitForCondition(display, 3000, () -> {
+		assertTrue("Missing completion proposals", DisplayHelper.waitForCondition(display, 10000, () -> {
 			Set<Shell> afterShells = Arrays.stream(display.getShells()).filter(Shell::isVisible).collect(Collectors.toSet());
 			afterShells.removeAll(beforeShells);
 			return afterShells.stream()

org.eclipse.m2e.jdt.tests/src/org/eclipse/m2e/jdt/tests/RunTest.java

@@ -33,6 +33,7 @@ public class RunTest extends AbstractMavenProjectTestCase {
 	@Test
 	public void testRunTwice() throws Exception {
 		IProject project = importProject(FileLocator.toFileURL(getClass().getResource("/projects/basicProjectWithDep/pom.xml")).getPath());
+		waitForJobsToComplete(monitor);
 		project.build(IncrementalProjectBuilder.FULL_BUILD, null);
 		ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
 		ILaunchConfigurationWorkingCopy launchConfig = launchManager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION).newInstance(project, "launch");

pom.xml

@@ -25,7 +25,8 @@
 	<name>Maven Integration for Eclipse (root)</name>
 
 	<properties>
-		<tycho.testArgLine>-Xmx800m</tycho.testArgLine>
+		<tychoDefaultTestArgLine>-Xmx800m</tychoDefaultTestArgLine>
+		<tycho.testArgLine>${tychoDefaultTestArgLine}</tycho.testArgLine>
 		<tycho.surefire.timeout>900</tycho.surefire.timeout>
 		<tycho.surefire.useUIHarness>true</tycho.surefire.useUIHarness>
 		<tycho.surefire.useUIThread>true</tycho.surefire.useUIThread>
@@ -226,8 +227,30 @@
 			</activation>
 			<properties>
 				<!-- SWT on Mac OS needs to be started on main thread -->
-				<tycho.testArgLine>-XstartOnFirstThread</tycho.testArgLine>
+				<tycho.testArgLine>-XstartOnFirstThread ${tychoDefaultTestArgLine}</tycho.testArgLine>
 			</properties>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-surefire-plugin</artifactId>
+							<version>${tycho-version}</version>
+							<configuration>
+								<dependencies combine.children="append">
+									<!--this dependency is needed to detect and set the default VM correctly on Mac OS,
+									 https://github.com/eclipse-jdt/eclipse.jdt.debug/tree/master/org.eclipse.jdt.launching.macosx -->
+									<dependency>
+										<artifactId>org.eclipse.jdt.launching.macosx</artifactId>
+										<type>eclipse-plugin</type>
+										<version>0.0.0</version>
+									</dependency>
+								</dependencies>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
 		</profile>
 		<profile>
 			<id>its</id>