8369306: Implement invokeAndWait and finishTerminating on headless platform

modules/javafx.graphics/src/main/java/com/sun/glass/ui/headless/HeadlessApplication.java

@@ -61,7 +61,7 @@ protected void runLoop(Runnable launchable) {
 
     @Override
     protected void _invokeAndWait(Runnable runnable) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        processor.invokeAndWait(runnable);
     }
 
     @Override
@@ -79,6 +79,13 @@ protected void _leaveNestedEventLoop(Object retValue) {
         processor.leaveCurrentLoop(retValue);
     }
 
+    @Override
+    protected void finishTerminating() {
+        processor.stopProcessing();
+        setEventThread(null);
+        super.finishTerminating();
+    }
+
     @Override
     protected int _isKeyLocked(int keyCode) {
         return KeyEvent.KEY_LOCK_OFF;

modules/javafx.graphics/src/main/java/com/sun/glass/ui/headless/NestedRunnableProcessor.java

@@ -27,6 +27,7 @@
 import com.sun.glass.ui.Application;
 import java.util.LinkedList;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class NestedRunnableProcessor implements Runnable {
@@ -44,6 +45,28 @@ void invokeLater(final Runnable r) {
         runnableQueue.add(r);
     }
 
+    void invokeAndWait(final Runnable r) {
+        final CountDownLatch latch = new CountDownLatch(1);
+        runnableQueue.add(() -> {
+            try {
+                r.run();
+            } finally {
+                latch.countDown();
+            }
+        });
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            Application.reportException(e);
+        }
+    }
+
+    void stopProcessing() {
+        for (RunLoopEntry entry : activeRunLoops) {
+            runnableQueue.add(() -> entry.active = false);
+        }
+    }
+
     public Object newRunLoop() {
         RunLoopEntry entry = new RunLoopEntry();
 
@@ -68,7 +91,9 @@ public void leaveCurrentLoop(Object returnValue) {
 
     private static class RunLoopEntry {
 
+        // This is only accessed on the event thread
         boolean active;
+
         Object returnValue;
     }
 

tests/system/src/test/java/test/com/sun/glass/ui/headless/HeadlessApplication1Test.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.com.sun.glass.ui.headless;
+
+import com.sun.glass.ui.Application;
+import javafx.application.Platform;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HeadlessApplication1Test {
+
+    @BeforeAll
+    public static void setup() throws Exception {
+        System.setProperty("glass.platform", "Headless");
+        System.setProperty("prism.order", "sw");
+    }
+
+    @Test
+    public void invokeAndWaitFromBackgroundThreadTest() {
+        assertFalse(Platform.isFxApplicationThread());
+        AtomicInteger counter = new AtomicInteger();
+        AtomicBoolean fail = new AtomicBoolean();
+        CountDownLatch waitLatch = new CountDownLatch(1);
+        Platform.startup(() -> {
+            assertTrue(Platform.isFxApplicationThread());
+            new Thread(() -> {
+                assertFalse(Platform.isFxApplicationThread());
+                Application.invokeAndWait(counter::incrementAndGet);
+                assertEquals(1, counter.get());
+                waitLatch.countDown();
+            }).start();
+        });
+        try {
+            if (!waitLatch.await(1, TimeUnit.SECONDS)) {
+                fail.set(true);
+            }
+        } catch (InterruptedException e) {
+            fail.set(true);
+        }
+        assertFalse(fail.get());
+        assertEquals(0, waitLatch.getCount());
+        assertFalse(Platform.isFxApplicationThread());
+        Platform.exit();
+    }
+
+}

tests/system/src/test/java/test/com/sun/glass/ui/headless/HeadlessApplication2Test.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.com.sun.glass.ui.headless;
+
+import com.sun.javafx.application.PlatformImplShim;
+import javafx.application.Platform;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class HeadlessApplication2Test {
+
+    private final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch();
+    private Thread fxThread;
+
+    @BeforeAll
+    public static void setup() throws Exception {
+        System.setProperty("glass.platform", "Headless");
+        System.setProperty("prism.order", "sw");
+    }
+
+    @Test
+    public void userThreadIsShutdownOnPlatformExitTest() {
+        assertFalse(Platform.isFxApplicationThread());
+        AtomicBoolean fail = new AtomicBoolean();
+        Platform.startup(() -> {
+            assertTrue(Platform.isFxApplicationThread());
+            fxThread = Thread.currentThread();
+            assertEquals(1, exitLatch.getCount());
+            Platform.runLater(Platform::exit);
+        });
+        try {
+            if (!exitLatch.await(1, TimeUnit.SECONDS)) {
+                fail.set(true);
+            }
+        } catch (InterruptedException e) {
+            fail.set(true);
+        }
+
+        assertEquals(0, exitLatch.getCount());
+        assertFalse(fail.get());
+
+        assertNotNull(fxThread);
+        try {
+            fxThread.join(10);
+        }  catch (InterruptedException e) {
+            fail.set(true);
+        }
+
+        assertFalse(fail.get());
+        assertFalse(Thread.getAllStackTraces().keySet().stream().anyMatch(t -> "JavaFX Application Thread".equals(t.getName())));
+    }
+
+}