Fixed CI to avoid dynamic classloading

shai-almog · shai-almog · commit fa6f7b4ffdd3 · 2025-11-21T06:42:43.000+02:00
Also used callSerially to avoid blocking the start method on Android
diff --git a/scripts/device-runner-app/main/HelloCodenameOne.java b/scripts/device-runner-app/main/HelloCodenameOne.java
@@ -10,6 +10,7 @@
 import com.codename1.ui.Label;
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.BoxLayout;
+import com.codename1.ui.CN;
 
 import com.codenameone.examples.hellocodenameone.tests.Cn1ssDeviceRunner;
 import com.codenameone.examples.hellocodenameone.tests.Cn1ssDeviceRunnerReporter;
@@ -30,9 +31,9 @@ public void start() {
         }
         if (!deviceRunnerExecuted) {
             deviceRunnerExecuted = true;
-            new Cn1ssDeviceRunner().runSuite();
+            CN.callSerially(() -> new Cn1ssDeviceRunner().runSuite());
         }
-        showMainForm();
+        new Form("Fallback").show();
     }
 
     public void stop() {
@@ -42,59 +43,4 @@ public void stop() {
     public void destroy() {
         // Nothing to clean up for this sample
     }
-
-    private void showMainForm() {
-        if (mainForm == null) {
-            mainForm = new Form("Main Screen", new BorderLayout());
-
-            Container content = new Container(BoxLayout.y());
-            content.getAllStyles().setBgColor(0x1f2937);
-            content.getAllStyles().setBgTransparency(255);
-            content.getAllStyles().setPadding(6, 6, 6, 6);
-            content.getAllStyles().setFgColor(0xf9fafb);
-
-            Label heading = new Label("Hello Codename One");
-            heading.getAllStyles().setFgColor(0x38bdf8);
-            heading.getAllStyles().setMargin(0, 4, 0, 0);
-
-            Label body = new Label("Instrumentation main activity preview");
-            body.getAllStyles().setFgColor(0xf9fafb);
-
-            Button openBrowser = new Button("Open Browser Screen");
-            openBrowser.addActionListener(evt -> showBrowserForm());
-
-            content.add(heading);
-            content.add(body);
-            content.add(openBrowser);
-
-            mainForm.add(BorderLayout.CENTER, content);
-        }
-        current = mainForm;
-        mainForm.show();
-    }
-
-    private void showBrowserForm() {
-        Form browserForm = new Form("Browser Screen", new BorderLayout());
-
-        BrowserComponent browser = new BrowserComponent();
-        browser.setPage(buildBrowserHtml(), null);
-        browserForm.add(BorderLayout.CENTER, browser);
-        browserForm.getToolbar().addMaterialCommandToLeftBar(
-                "Back",
-                FontImage.MATERIAL_ARROW_BACK,
-                evt -> showMainForm()
-        );
-
-        current = browserForm;
-        browserForm.show();
-    }
-
-    private String buildBrowserHtml() {
-        return "<html><head><meta charset='utf-8'/>"
-                + "<style>body{margin:0;font-family:sans-serif;background:#0e1116;color:#f3f4f6;}"
-                + ".container{padding:24px;text-align:center;}h1{font-size:24px;margin-bottom:12px;}"
-                + "p{font-size:16px;line-height:1.4;}span{color:#4cc9f0;}</style></head>"
-                + "<body><div class='container'><h1>Codename One</h1>"
-                + "<p>BrowserComponent <span>instrumentation</span> test content.</p></div></body></html>";
-    }
 }
diff --git a/scripts/device-runner-app/tests/Cn1ssDeviceRunner.java b/scripts/device-runner-app/tests/Cn1ssDeviceRunner.java
@@ -4,26 +4,41 @@
 import com.codename1.testing.TestReporting;
 import com.codename1.ui.Display;
 import com.codename1.ui.Form;
+import com.codename1.testing.AbstractTest;
 
 public final class Cn1ssDeviceRunner extends DeviceRunner {
-    private static final String[] TEST_CLASSES = new String[] {
-            MainScreenScreenshotTest.class.getName(),
-            BrowserComponentScreenshotTest.class.getName(),
-            MediaPlaybackScreenshotTest.class.getName(),
-            GraphicsPipelineScreenshotTest.class.getName(),
-            GraphicsShapesAndGradientsScreenshotTest.class.getName(),
-            GraphicsStateAndTextScreenshotTest.class.getName(),
-            GraphicsTransformationsScreenshotTest.class.getName(),
-            GraphicsMethodsScreenshotTest.class.getName()
+    private static final AbstractTest[] TEST_CLASSES = new AbstractTest[] {
+            new MainScreenScreenshotTest(),
+            new GraphicsPipelineScreenshotTest(),
+            new GraphicsShapesAndGradientsScreenshotTest(),
+            new GraphicsStateAndTextScreenshotTest(),
+            new GraphicsTransformationsScreenshotTest(),
+            new GraphicsMethodsScreenshotTest(),
+            new BrowserComponentScreenshotTest(),
+            new MediaPlaybackScreenshotTest()
     };
 
     public void runSuite() {
-        for (String testClass : TEST_CLASSES) {
-            runTest(testClass);
+        for (AbstractTest testClass : TEST_CLASSES) {
+            log("CN1SS:INFO:suite starting test=" + testClass);
+            try {
+                testClass.prepare();
+                testClass.runTest();
+                testClass.cleanup();
+                log("CN1SS:INFO:suite finished test=" + testClass);
+            } catch (Throwable t) {
+                log("CN1SS:ERR:suite test=" + testClass + " failed=" + t);
+                t.printStackTrace();
+            }
         }
+        log("CN1SS:SUITE:FINISHED");
         TestReporting.getInstance().testExecutionFinished(getClass().getName());
     }
 
+    private static void log(String msg) {
+        System.out.println(msg);
+    }
+
     @Override
     protected void startApplicationInstance() {
         Cn1ssDeviceRunnerHelper.runOnEdtSync(() -> {
