see if we managed to fix tests

torakiki · Nov 25, 2022 · e23c746 · e23c746
1 parent 8841a28
commit e23c746
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pdfsam-service/src/test/java/org/pdfsam/service/pdf/SAMBoxPdfLoadServiceTest.java b/pdfsam-service/src/test/java/org/pdfsam/service/pdf/SAMBoxPdfLoadServiceTest.java
@@ -33,12 +33,11 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.TimeoutException;
 
 import static java.time.Duration.ofSeconds;
 import static org.awaitility.Awaitility.await;
-import static org.hibernate.validator.internal.util.Contracts.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Andrea Vacondio

diff --git a/pdfsam-test/src/main/java/org/pdfsam/test/JavaFxThreadInitializeExtension.java b/pdfsam-test/src/main/java/org/pdfsam/test/JavaFxThreadInitializeExtension.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.extension.Extension;
 
 import javax.swing.SwingUtilities;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * @author Andrea Vacondio
@@ -30,7 +31,12 @@ public class JavaFxThreadInitializeExtension implements Extension {
 
     static {
         System.out.println("Initializing JavaFX thread");
-        SwingUtilities.invokeLater(JFXPanel::new);
+        try {
+            SwingUtilities.invokeAndWait(JFXPanel::new);
+        } catch (InterruptedException | InvocationTargetException e) {
+            System.out.println("Unable to initialize JavaFX thread");
+            throw new RuntimeException(e);
+        }
         System.out.println("JavaFX initialized");
     }
 }