Add watchdog and logging for Android UI tests

Author: shai-almog

scripts/build-android-app.sh

@@ -311,14 +311,43 @@ elif [ -x "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" ]; then
   yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null 2>&1 || true
 fi
 
+UI_TEST_TIMEOUT_SECONDS="${UI_TEST_TIMEOUT_SECONDS:-600}"
+if ! [[ "$UI_TEST_TIMEOUT_SECONDS" =~ ^[0-9]+$ ]] || [ "$UI_TEST_TIMEOUT_SECONDS" -le 0 ]; then
+  ba_log "Invalid UI_TEST_TIMEOUT_SECONDS=$UI_TEST_TIMEOUT_SECONDS provided; falling back to 600"
+  UI_TEST_TIMEOUT_SECONDS=600
+fi
+
+GRADLE_TEST_CMD=("./gradlew" "--no-daemon" "test")
+if command -v timeout >/dev/null 2>&1; then
+  ba_log "Running Gradle UI tests with external timeout of ${UI_TEST_TIMEOUT_SECONDS}s"
+  GRADLE_TEST_WRAPPER=("timeout" "$UI_TEST_TIMEOUT_SECONDS" "${GRADLE_TEST_CMD[@]}")
+else
+  ba_log "timeout command not found; running Gradle UI tests without external watchdog"
+  GRADLE_TEST_WRAPPER=("${GRADLE_TEST_CMD[@]}")
+fi
+
 set +e
 (
   cd "$GRADLE_PROJECT_DIR"
-  ./gradlew --no-daemon test
+  "${GRADLE_TEST_WRAPPER[@]}"
 )
 TEST_EXIT_CODE=$?
 set -e
 
+if [ "$TEST_EXIT_CODE" -eq 124 ]; then
+  ba_log "Gradle UI tests exceeded ${UI_TEST_TIMEOUT_SECONDS}s timeout and were terminated"
+fi
+if [ "$TEST_EXIT_CODE" -ne 0 ]; then
+  ba_log "Gradle UI tests exited with status $TEST_EXIT_CODE"
+  TEST_RESULTS_DIR="$APP_MODULE_DIR/build/test-results/testDebugUnitTest"
+  if [ -d "$TEST_RESULTS_DIR" ]; then
+    ba_log "Available XML results under $TEST_RESULTS_DIR:"
+    find "$TEST_RESULTS_DIR" -maxdepth 1 -type f -name '*.xml' -print | sed 's#^.*/##' | sed 's/^/[build-android-app]   /'
+  else
+    ba_log "No test result XML directory found at $TEST_RESULTS_DIR"
+  fi
+fi
+
 if [ "$TEST_EXIT_CODE" -eq 0 ]; then
   (
     cd "$GRADLE_PROJECT_DIR"

scripts/templates/HelloCodenameOneUiTest.java.tmpl

@@ -29,19 +29,23 @@ public class @MAIN_NAME@UiTest {
 
     @Test
     public void mainFormScreenshotContainsRenderedContent() throws Exception {
+        log("Starting Robolectric activity for screenshot test");
         ActivityController<@MAIN_NAME@Stub> controller = Robolectric.buildActivity(@[email protected]).setup().visible();
         try {
+            log("Waiting for Codename One main form to be displayed");
             Form displayed = waitForDisplayedForm(5000L);
             assertNotNull("Codename One form should be displayed", displayed);
 
             @MAIN_NAME@Stub activity = controller.get();
+            log("Captured Codename One form; capturing decor view screenshot");
             Bitmap screenshot = captureScreenshot(activity);
             assertNotNull("Screenshot capture should succeed", screenshot);
             assertTrue("Screenshot width should be positive", screenshot.getWidth() > 0);
             assertTrue("Screenshot height should be positive", screenshot.getHeight() > 0);
             assertTrue("Screenshot should contain rendered content beyond the background", hasRenderableContent(screenshot));
 
             File screenshotFile = saveScreenshot(screenshot);
+            log("Screenshot stored at " + screenshotFile.getAbsolutePath());
             assertTrue("Screenshot file should exist", screenshotFile.isFile());
             assertTrue("Screenshot file should not be empty", screenshotFile.length() > 0L);
         } finally {
@@ -51,6 +55,7 @@ public class @MAIN_NAME@UiTest {
 
     private static Form waitForDisplayedForm(long timeoutMillis) throws InterruptedException {
         long deadline = SystemClock.uptimeMillis() + timeoutMillis;
+        long nextLog = SystemClock.uptimeMillis();
         while (SystemClock.uptimeMillis() < deadline) {
             ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
             if (Display.isInitialized()) {
@@ -60,6 +65,11 @@ public class @MAIN_NAME@UiTest {
                 }
             }
             Thread.sleep(50L);
+            long now = SystemClock.uptimeMillis();
+            if (now >= nextLog) {
+                log("Still waiting for Codename One form; displayInitialized=" + Display.isInitialized());
+                nextLog = now + 1000L;
+            }
         }
         throw new AssertionError("Timed out waiting for Codename One form to be displayed");
     }
@@ -117,6 +127,7 @@ public class @MAIN_NAME@UiTest {
 
     private static View waitForDecorViewWithDimensions(@MAIN_NAME@Stub activity, long timeoutMillis) throws InterruptedException {
         long deadline = SystemClock.uptimeMillis() + timeoutMillis;
+        long nextLog = SystemClock.uptimeMillis();
         while (SystemClock.uptimeMillis() < deadline) {
             View decorView = activity.getWindow().getDecorView();
             if (decorView != null) {
@@ -127,6 +138,12 @@ public class @MAIN_NAME@UiTest {
             }
             ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
             Thread.sleep(50L);
+            long now = SystemClock.uptimeMillis();
+            if (now >= nextLog) {
+                log("Waiting for decor view layout; width=" + (decorView != null ? decorView.getWidth() : 0)
+                        + " height=" + (decorView != null ? decorView.getHeight() : 0));
+                nextLog = now + 1000L;
+            }
         }
         throw new AssertionError("Timed out waiting for decor view layout");
     }
@@ -141,4 +158,8 @@ public class @MAIN_NAME@UiTest {
         view.measure(widthSpec, heightSpec);
         view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
     }
+
+    private static void log(String message) {
+        System.out.println("[@MAIN_NAME@UiTest] " + message);
+    }
 }