diff --git a/platform/lvcs-impl/testSrc/com/intellij/history/integration/ui/LocalHistoryUITestCase.java b/platform/lvcs-impl/testSrc/com/intellij/history/integration/ui/LocalHistoryUITestCase.java index 3036f1233844..fae3c4e46a2e 100644 --- a/platform/lvcs-impl/testSrc/com/intellij/history/integration/ui/LocalHistoryUITestCase.java +++ b/platform/lvcs-impl/testSrc/com/intellij/history/integration/ui/LocalHistoryUITestCase.java @@ -18,12 +18,10 @@ package com.intellij.history.integration.ui; import com.intellij.history.integration.IntegrationTestCase; -import java.awt.*; - public abstract class LocalHistoryUITestCase extends IntegrationTestCase { @Override protected void runTest() throws Throwable { - if (GraphicsEnvironment.isHeadless()) { + if (isInHeadlessEnvironment()) { System.out.println("Test '" + getClass().getName() + "." + getName() + "' is skipped because it requires working UI environment"); return; } diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java index a5a6630d272f..45a9eb1bbf97 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java @@ -76,6 +76,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; +import java.awt.*; import java.io.File; import java.io.IOException; import java.lang.annotation.ElementType; @@ -202,6 +203,10 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro runStartupActivities(); } + protected static boolean isInHeadlessEnvironment() { + return GraphicsEnvironment.isHeadless(); + } + @NotNull public static Project createProject(File projectFile, String creationPlace) { try {