Fix test in headless

animatinetpacs · Jul 12, 2024 · be6e4bc · be6e4bc
1 parent 4bb34ab
commit be6e4bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/weasis-core/src/main/java/org/weasis/core/api/service/UICore.java b/weasis-core/src/main/java/org/weasis/core/api/service/UICore.java
@@ -18,6 +18,7 @@
 import bibliothek.gui.dock.common.event.CVetoFocusListener;
 import bibliothek.gui.dock.common.intern.CDockable;
 import bibliothek.gui.dock.event.KeyboardListener;
+import java.awt.GraphicsEnvironment;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
 import java.io.DataOutputStream;
@@ -99,7 +100,11 @@ private static final class Holder {
   /** Do not instantiate UICore, get OSGI singleton service from GuiUtils.getUICore() */
   private UICore() {
     this.dockingControl = new CControl();
-    this.baseArea = dockingControl.getContentArea();
+    if (GraphicsEnvironment.isHeadless()) {
+      this.baseArea = null; // For test where no GUI is available
+    } else {
+      this.baseArea = dockingControl.getContentArea();
+    }
     this.mainArea = dockingControl.createWorkingArea("mainArea");
     this.toolbarContainer = new ToolBarContainer();
     this.dicomLaunchers = Launcher.loadLaunchers(Launcher.Type.DICOM);

diff --git a/weasis-core/src/test/java/org/weasis/core/ui/launcher/LauncherTest.java b/weasis-core/src/test/java/org/weasis/core/ui/launcher/LauncherTest.java
@@ -16,7 +16,6 @@
 import java.lang.management.ManagementFactory;
 import java.net.URI;
 import javax.management.ObjectName;
-import javax.swing.JFrame;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;