From f79d83ff7e0100f2656097846ca26f58fb31046a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Kubitz?= Date: Wed, 2 Oct 2024 14:15:39 +0200 Subject: [PATCH] ResourceInitialSelectionTest: fix deleting resources #294 Concurrent "Decoration Calculation" sometimes prevented Project from deleting on Windows OS. https://github.com/eclipse-platform/eclipse.platform.ui/issues/294 --- .../ui/tests/dialogs/ResourceInitialSelectionTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java index 0ffe9d0be6e..9dc75c3a025 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/ResourceInitialSelectionTest.java @@ -31,12 +31,14 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.FilteredResourcesSelectionDialog; +import org.eclipse.ui.internal.decorators.DecoratorManager; import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.eclipse.ui.tests.harness.util.UITestCase; import org.junit.Test; @@ -381,6 +383,8 @@ protected void doTearDown() throws Exception { } if (project != null) { try { + Job.getJobManager().wakeUp(DecoratorManager.FAMILY_DECORATE); + Job.getJobManager().join(DecoratorManager.FAMILY_DECORATE, null); project.delete(true, null); } catch (Exception e) { // try to get a stacktrace which jobs still has project open so that it can not