Add waiting for jobs and auto-build in tests setup

Fixes: #2128

Author: trancexpress

ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/JUnitExecutionTest.java

@@ -35,6 +35,7 @@
 import org.eclipse.jdt.junit.model.ITestElement.Result;
 import org.eclipse.jdt.junit.model.ITestElementContainer;
 import org.eclipse.jdt.junit.model.ITestRunSession;
+import org.eclipse.pde.ui.tests.runtime.TestUtils;
 import org.eclipse.pde.ui.tests.util.ProjectUtils;
 import org.eclipse.pde.ui.tests.util.TargetPlatformUtil;
 import org.junit.Assert;
@@ -72,7 +73,10 @@ public static void setupProjects() throws Exception {
 		for (URL resource : Collections.list(bundle.findEntries("test-bundles", "verification.tests.*", false))) {
 			ProjectUtils.importTestProject(FileLocator.toFileURL(resource));
 		}
+		TestUtils.waitForJobs(JUnitExecutionTest.class + ".setupProjects() before build", 100, 10_000);
 		workspaceRoot.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
+		TestExecutionUtil.waitForAutoBuild();
+		TestUtils.waitForJobs(JUnitExecutionTest.class + ".setupProjects() after build", 100, 10_000);
 	}
 
 	@Parameters(name = "{0}")

ui/org.eclipse.pde.junit.runtime.tests/src/org/eclipse/pde/junit/runtime/tests/TestExecutionUtil.java

@@ -31,10 +31,13 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
@@ -55,6 +58,20 @@
 
 class TestExecutionUtil {
 
+	public static void waitForAutoBuild() {
+		boolean wasInterrupted = false;
+		do {
+			try {
+				Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
+				wasInterrupted = false;
+			} catch (OperationCanceledException e) {
+				e.printStackTrace();
+			} catch (InterruptedException e) {
+				wasInterrupted = true;
+			}
+		} while (wasInterrupted);
+	}
+
 	public static ITestRunSession runTest(IJavaElement element) throws CoreException {
 		IProject project = element.getResource().getProject();
 		project.build(IncrementalProjectBuilder.FULL_BUILD, null);

ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF

@@ -73,4 +73,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.pde.ui.tests
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.pde.ui.tests.util
+Export-Package: org.eclipse.pde.ui.tests.runtime,
+ org.eclipse.pde.ui.tests.util