From d26cf6c5d7d179a683facf6e84783903e8c184a6 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 4 May 2018 15:02:44 -0700 Subject: [PATCH] Attempt to fix failin test cases. --- .../commons/frameworks/test/util/ACondition.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/src/org/springsource/ide/eclipse/commons/frameworks/test/util/ACondition.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/src/org/springsource/ide/eclipse/commons/frameworks/test/util/ACondition.java index 69a7f96e6..e2342a3d2 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/src/org/springsource/ide/eclipse/commons/frameworks/test/util/ACondition.java +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/src/org/springsource/ide/eclipse/commons/frameworks/test/util/ACondition.java @@ -44,6 +44,15 @@ import junit.framework.AssertionFailedError; */ public abstract class ACondition { + private static boolean headless; + static { + try { + Display.getDefault(); + headless = false; + } catch (Exception e) { + headless = true; + } + } private String description = null; /** @@ -240,7 +249,7 @@ public abstract class ACondition { } public static boolean inUIThread() { - return Display.getDefault().getThread() == Thread.currentThread(); + return !headless && Display.getDefault().getThread() == Thread.currentThread(); } public static StringBuffer getStackDumps() {