From 594e6cadbc7831baa8db0233a42e2a7a361e3433 Mon Sep 17 00:00:00 2001 From: Sergey Karashevich Date: Mon, 13 Aug 2018 10:17:22 +0300 Subject: [PATCH] [gui-test] get contents of tool window from EDT only (GUI-143) --- .../intellij/testGuiFramework/fixtures/ToolWindowFixture.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/ToolWindowFixture.java b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/ToolWindowFixture.java index 70eac76750b3..628bea48e904 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/ToolWindowFixture.java +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/ToolWindowFixture.java @@ -23,6 +23,7 @@ import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.openapi.wm.impl.StripeButton; import com.intellij.testGuiFramework.framework.Timeouts; +import com.intellij.testGuiFramework.impl.GuiTestUtilKt; import com.intellij.ui.content.Content; import org.fest.swing.core.GenericTypeMatcher; import org.fest.swing.core.Robot; @@ -165,7 +166,8 @@ public abstract class ToolWindowFixture { @NotNull public Content[] getContents() { - return myToolWindow.getContentManager().getContents(); + //noinspection ConstantConditions + return GuiTestUtilKt.INSTANCE.computeOnEdt(() -> myToolWindow.getContentManager().getContents()); } protected boolean isActive() {