fix: test logic in FoldingTest is broken

sdaimwood · May 17, 2024 · 8d72ffd · 8d72ffd
1 parent d730824
commit 8d72ffd
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/folding/FoldingTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/folding/FoldingTest.java
@@ -31,24 +31,31 @@
 public class FoldingTest extends AbstractTest {
 
 	private static final String CONTENT = """
-		import
-		import
-		import
-		visible
-		""";
+			import
+			import
+			import
+			visible
+			""";
 
 	@Test
 	public void testImportsFoldedByDefaultEnabled() throws CoreException {
 		collapseImports(true);
 		IEditorPart editor = createEditor();
-		DisplayHelper.waitAndAssertCondition(editor.getSite().getShell().getDisplay(), () -> assertEquals("import\nvisible", ((StyledText)editor.getAdapter(Control.class)).getText().trim()));
+
+		// wait for folding to happen
+		DisplayHelper.waitAndAssertCondition(editor.getSite().getShell().getDisplay(),
+				() -> assertEquals("import\nvisible",
+						((StyledText) editor.getAdapter(Control.class)).getText().trim()));
 	}
 
 	@Test
 	public void testImportsFoldedByDefaultDisabled() throws CoreException {
 		collapseImports(false);
 		IEditorPart editor = createEditor();
-		DisplayHelper.waitAndAssertCondition(editor.getSite().getShell().getDisplay(), () -> assertEquals(CONTENT, ((StyledText)editor.getAdapter(Control.class)).getText()));
+
+		// wait a few seconds before testing to ensure no folding happened
+		DisplayHelper.sleep(3000);
+		assertEquals(CONTENT, ((StyledText) editor.getAdapter(Control.class)).getText());
 	}
 
 	private IEditorPart createEditor() throws CoreException, PartInitException {
@@ -59,10 +66,10 @@ private IEditorPart createEditor() throws CoreException, PartInitException {
 		IEditorPart editor = TestUtils.openEditor(file);
 		return editor;
 	}
-	
+
 	private void collapseImports(boolean collapseImports) {
 		IPreferenceStore store = LanguageServerPlugin.getDefault().getPreferenceStore();
-		store.setValue("foldingReconcilingStrategy.collapseImports", true); //$NON-NLS-1$
+		store.setValue("foldingReconcilingStrategy.collapseImports", collapseImports); //$NON-NLS-1$
 	}
 
 }