fixes

Author: riccardobl

jme3-examples/build.gradle

@@ -300,6 +300,11 @@ tasks.named('nativeCompile') {
     doFirst {
         // Gradle's Copy task cannot preserve symlinks in some provisioned toolchains.
         // Recreate likely broken links in the GraalVM toolchain before native-image runs.
+        if (!FileSystems.getDefault().supportedFileAttributeViews().contains('posix')) {
+            logger.info("Skipping GraalVM toolchain symlink fixup on non-POSIX file system.")
+            return
+        }
+
         File graalvmHomeDir = System.getenv('GRAALVM_HOME') ? file(System.getenv('GRAALVM_HOME')) : null
         def nativeImageLauncher = javaToolchains.launcherFor {
             languageVersion = JavaLanguageVersion.of(21)
@@ -330,7 +335,11 @@ tasks.named('nativeCompile') {
                     if (link != target) {
                         logger.quiet("Fixing up '${link}' to link to '${target}'.")
                         if (link.delete()) {
-                            Files.createSymbolicLink(link.toPath(), target.toPath())
+                            try {
+                                Files.createSymbolicLink(link.toPath(), target.toPath())
+                            } catch (Exception ex) {
+                                logger.warn("Unable to create symlink '${link}' to '${target}'.", ex)
+                            }
                         } else {
                             logger.warn("Unable to delete '${link}'.")
                         }

jme3-examples/src/main/java/jme3test/TestChooserCli.java

@@ -39,7 +39,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
@@ -67,6 +66,12 @@ public class TestChooserCli {
 
     private static final Logger logger = Logger.getLogger(TestChooserCli.class.getName());
     private static final String CLASS_LIST_RESOURCE = "/jme3test/test-classes.txt";
+    private static final long WAIT_INTERVAL_MILLIS = Math.max(10L,
+            Long.getLong("jme3test.cli.waitIntervalMillis", 100L));
+    private static final long START_TIMEOUT_MILLIS = Math.max(WAIT_INTERVAL_MILLIS,
+            Long.getLong("jme3test.cli.startTimeoutMillis", 30000L));
+    private static final long RUN_TIMEOUT_MILLIS = Long.getLong("jme3test.cli.runTimeoutMillis",
+            30L * 60L * 1000L);
 
     public static void main(String[] args) {
         new TestChooserCli().start(args);
@@ -212,27 +217,15 @@ private String chooseClassName(List<String> classNames) {
     private void launchClass(Class<?> clazz, String[] appArgs) {
         try {
             if (LegacyApplication.class.isAssignableFrom(clazz)) {
-                Object app = clazz.getDeclaredConstructor().newInstance();
+                LegacyApplication app = (LegacyApplication) clazz.getDeclaredConstructor().newInstance();
                 if (app instanceof SimpleApplication) {
-                    Method settingMethod = clazz.getMethod("setShowSettings", boolean.class);
-                    settingMethod.invoke(app, false);
-                }
-                Method startMethod = clazz.getMethod("start");
-                startMethod.invoke(app);
-
-                Field contextField = LegacyApplication.class.getDeclaredField("context");
-                contextField.setAccessible(true);
-                JmeContext context = null;
-                while (context == null) {
-                    context = (JmeContext) contextField.get(app);
-                    Thread.sleep(100);
-                }
-                while (!context.isCreated()) {
-                    Thread.sleep(100);
-                }
-                while (context.isCreated()) {
-                    Thread.sleep(100);
+                    ((SimpleApplication) app).setShowSettings(false);
                 }
+                app.start();
+
+                JmeContext context = waitForContext(app, clazz.getName());
+                waitForContextCreated(app, context, clazz.getName());
+                waitForContextDestroyed(app, context, clazz.getName());
             } else {
                 Method mainMethod = clazz.getMethod("main", String[].class);
                 mainMethod.invoke(null, new Object[]{appArgs});
@@ -247,8 +240,6 @@ private void launchClass(Class<?> clazz, String[] appArgs) {
             logger.log(Level.SEVERE, "Failed to create app: " + clazz.getName(), e);
         } catch (NoSuchMethodException e) {
             logger.log(Level.SEVERE, "Test class does not have required method: " + clazz.getName(), e);
-        } catch (NoSuchFieldException e) {
-            logger.log(Level.SEVERE, "Cannot access application context: " + clazz.getName(), e);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             logger.log(Level.SEVERE, "Interrupted while waiting for app context", e);
@@ -257,6 +248,56 @@ private void launchClass(Class<?> clazz, String[] appArgs) {
         }
     }
 
+    private JmeContext waitForContext(LegacyApplication app, String className) throws InterruptedException {
+        long deadline = System.currentTimeMillis() + START_TIMEOUT_MILLIS;
+        JmeContext context = app.getContext();
+        while (context == null) {
+            if (System.currentTimeMillis() >= deadline) {
+                requestStop(app);
+                throw new IllegalStateException("Timed out waiting for application context: " + className);
+            }
+            Thread.sleep(WAIT_INTERVAL_MILLIS);
+            context = app.getContext();
+        }
+        return context;
+    }
+
+    private void waitForContextCreated(LegacyApplication app, JmeContext context, String className)
+            throws InterruptedException {
+        long deadline = System.currentTimeMillis() + START_TIMEOUT_MILLIS;
+        while (!context.isCreated()) {
+            if (System.currentTimeMillis() >= deadline) {
+                requestStop(app);
+                throw new IllegalStateException("Timed out waiting for context creation: " + className);
+            }
+            Thread.sleep(WAIT_INTERVAL_MILLIS);
+        }
+    }
+
+    private void waitForContextDestroyed(LegacyApplication app, JmeContext context, String className)
+            throws InterruptedException {
+        long deadline = RUN_TIMEOUT_MILLIS > 0L ? System.currentTimeMillis() + RUN_TIMEOUT_MILLIS : Long.MAX_VALUE;
+        while (context.isCreated()) {
+            if (System.currentTimeMillis() >= deadline) {
+                requestStop(app);
+                throw new IllegalStateException("Timed out waiting for application to exit: " + className);
+            }
+            Thread.sleep(WAIT_INTERVAL_MILLIS);
+        }
+    }
+
+    private void requestStop(LegacyApplication app) {
+        JmeContext context = app.getContext();
+        if (context == null) {
+            return;
+        }
+        try {
+            app.stop(false);
+        } catch (RuntimeException e) {
+            logger.log(Level.WARNING, "Failed to stop timed-out application", e);
+        }
+    }
+
     private void find(String packageName, boolean recursive, Set<Class<?>> classes) {
         String name = packageName;
         if (!name.startsWith("/")) {