Merge pull request #3331 from LorenzoBettini/lb_3319_experiments

Fixed a few other flaky tests
eclipse-xtext · Feb 1, 2025 · 2e919f4 · 2e919f4
2 parents 2fb90d5 + ec36fa2
commit 2e919f4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/...clipse/xtend/ide/tests/compiler/QuickDebugSourceInstallingCompilationParticipantTest.java b/...clipse/xtend/ide/tests/compiler/QuickDebugSourceInstallingCompilationParticipantTest.java
@@ -11,6 +11,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.xtend.ide.tests.AbstractXtendUITestCase;
 import org.eclipse.xtend.ide.tests.WorkbenchTestHelper;
 import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
@@ -31,15 +32,6 @@ public class QuickDebugSourceInstallingCompilationParticipantTest extends Abstra
 
 	@Test
 	public void testIfThereIsAnyStatum() throws Exception {
-		// ensure JDT is fully functional and its participants registered
-		workbenchTestHelper.createFile("hello/Hello.java", """
-			package hello;
-
-			public class Hello {
-			}
-		""");
-		IResourcesSetupUtil.waitForBuild();
-
 		final IFile source = workbenchTestHelper.createFile("somePackage/Outer.xtend", """
 			package somePackage
 
@@ -51,11 +43,11 @@ def dosomething() {
 			  }
 			}
 		""");
-		IResourcesSetupUtil.waitForBuild();
-
-		// ensure also JDT builder finished its jobs
 		IResourcesSetupUtil.waitForBuild(
-			new IResourcesSetupUtil.ConsoleLoggingProgressMonitor("ANOTHER BUILD"));
+				new IResourcesSetupUtil.ConsoleLoggingProgressMonitor("XTEND BUILD"));
+
+		source.getProject().refreshLocal(IResource.DEPTH_INFINITE,
+				new IResourcesSetupUtil.ConsoleLoggingProgressMonitor("REFRESH"));
 
 		final IFile clazz = source.getProject().getFile("bin/somePackage/Outer.class");
 		assertTrue("bytecode not found", clazz.exists());

diff --git a/...clipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/hover/XtendHoverInEditorTest.xtend b/...clipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/hover/XtendHoverInEditorTest.xtend
@@ -90,6 +90,7 @@ class XtendHoverInEditorTest extends AbstractXtendUITestCase {
 		waitForBuild(null)
 
 		val editor = openEditor(fileBar)
+		editor.waitForReconciler
 		val loggings = LoggingTester.captureLogging(Level.ERROR, AbstractBatchTypeResolver) [
 			val info = (hoverer as ITextHoverExtension2).getHoverInfo2(editor.internalSourceViewer as ITextViewer, new Region(19,1)) as XtextBrowserInformationControlInput
 			assertTrue(info.html,info.html.contains("Hello Foo"))

diff --git a/...e.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/hover/XtendHoverInEditorTest.java b/...e.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/hover/XtendHoverInEditorTest.java
@@ -140,6 +140,7 @@ public void testHoverOfReferencedElementWithAnnotation() {
       final IFile fileBar = this.helper.createFile("Bar.xtend", contentBar);
       this._syncUtil.waitForBuild(null);
       final XtextEditor editor = this.helper.openEditor(fileBar);
+      this._syncUtil.waitForReconciler(editor);
       final Runnable _function = () -> {
         ISourceViewer _internalSourceViewer = editor.getInternalSourceViewer();
         Region _region = new Region(19, 1);

diff --git a/...xt.xtext.ui.tests/src/org/eclipse/xtext/xtext/ui/editor/quickfix/InternalBuilderTest.java b/...xt.xtext.ui.tests/src/org/eclipse/xtext/xtext/ui/editor/quickfix/InternalBuilderTest.java
@@ -31,13 +31,28 @@
 import org.eclipse.jdt.internal.core.JavaModelManager;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.ui.texteditor.MarkerUtilities;
+import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * @author dhuebner - Initial contribution and API
  */
 public class InternalBuilderTest {
 
+	private boolean wasAutoBuild;
+
+	@Before
+	public void saveAutoBuild() {
+		wasAutoBuild = IResourcesSetupUtil.isAutobuild();
+	}
+
+	@After
+	public void resetAutoBuild() {
+		setAutoBuild(wasAutoBuild);
+	}
+
 	@Test
 	public void test() throws CoreException, FileNotFoundException {
 
@@ -163,7 +178,7 @@ public static void waitForAutoBuild() {
 		} while (wasInterrupted);
 	}
 
-	public static void setAutoBuild(boolean b) {
+	private static void setAutoBuild(boolean b) {
 		System.out.println("Setting auto-build to " + b);
 
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();

diff --git a/...ests/src/org/eclipse/xtext/xtext/ui/editor/quickfix/XtextGrammarQuickfixProviderTest.java b/...ests/src/org/eclipse/xtext/xtext/ui/editor/quickfix/XtextGrammarQuickfixProviderTest.java
@@ -263,7 +263,6 @@ private void assertAndApplySingleResolution(XtextEditor xtextEditor, String issu
 
 	private void assertAndApplyAllResolutions(XtextEditor xtextEditor, String issueCode, int issueDataCount, int issueCount,
 			String resolutionLabel) throws CoreException {
-		InternalBuilderTest.setAutoBuild(true);
 		if (xtextEditor.isDirty()) {
 			xtextEditor.doSave(new NullProgressMonitor());
 		}