Enable KVM before running Android emulator

Author: shai-almog

.github/workflows/scripts-android.yml

@@ -22,4 +22,18 @@ jobs:
       - name: Build Android port
         run: ./scripts/build-android-port.sh -q -DskipTests
       - name: Build Hello Codename One Android app
+        id: build-android-app
         run: ./scripts/build-android-app.sh -q -DskipTests
+      - name: Enable KVM for Android emulator
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+      - name: Run Android instrumentation tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 31
+          arch: x86_64
+          target: google_apis
+          script: |
+            ./scripts/run-android-instrumentation-tests.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"

scripts/build-android-app.sh

@@ -265,6 +265,85 @@ if [ -z "$GRADLE_PROJECT_DIR" ]; then
   exit 1
 fi
 
+ba_log "Configuring instrumentation test sources in $GRADLE_PROJECT_DIR"
+APP_BUILD_GRADLE="$GRADLE_PROJECT_DIR/app/build.gradle"
+if [ -f "$APP_BUILD_GRADLE" ]; then
+  python3 - "$APP_BUILD_GRADLE" <<'PYTHON'
+import pathlib
+import re
+import sys
+
+path = pathlib.Path(sys.argv[1])
+text = path.read_text()
+modified = False
+
+if "androidx.test.runner.AndroidJUnitRunner" not in text:
+    def add_runner(match):
+        prefix = match.group(0)
+        return prefix + "\n        testInstrumentationRunner \"androidx.test.runner.AndroidJUnitRunner\""
+
+    new_text, count = re.subn(r"(defaultConfig\s*\{)", add_runner, text, count=1, flags=re.MULTILINE)
+    if count:
+        text = new_text
+        modified = True
+    else:
+        raise SystemExit("defaultConfig block not found while adding instrumentation runner")
+
+dependencies_to_add = (
+    '    androidTestImplementation "androidx.test.ext:junit:1.1.5"\n'
+    '    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"'
+)
+
+if "androidx.test.ext:junit" not in text and "androidx.test.espresso:espresso-core" not in text:
+    def add_dependencies(match):
+        prefix = match.group(0)
+        return prefix + "\n" + dependencies_to_add
+
+    new_text, count = re.subn(r"(dependencies\s*\{)", add_dependencies, text, count=1, flags=re.MULTILINE)
+    if count:
+        text = new_text
+        modified = True
+    else:
+        raise SystemExit("dependencies block not found while adding androidTest dependencies")
+
+if modified:
+    if not text.endswith("\n"):
+        text += "\n"
+    path.write_text(text)
+PYTHON
+  ba_log "Ensured instrumentation runner and dependencies are declared"
+else
+  ba_log "Warning: Gradle build file not found at $APP_BUILD_GRADLE; skipping instrumentation dependency configuration" >&2
+fi
+
+TEST_SRC_DIR="$GRADLE_PROJECT_DIR/app/src/androidTest/java/${PACKAGE_PATH}"
+mkdir -p "$TEST_SRC_DIR"
+TEST_CLASS="$TEST_SRC_DIR/HelloCodenameOneInstrumentedTest.java"
+cat >"$TEST_CLASS" <<EOF
+package $PACKAGE_NAME;
+
+import android.content.Context;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(AndroidJUnit4.class)
+public class HelloCodenameOneInstrumentedTest {
+
+    @Test
+    public void useAppContext() {
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("$PACKAGE_NAME", appContext.getPackageName());
+    }
+}
+EOF
+ba_log "Created instrumentation test at $TEST_CLASS"
+
 ba_log "Invoking Gradle build in $GRADLE_PROJECT_DIR"
 chmod +x "$GRADLE_PROJECT_DIR/gradlew"
 ORIGINAL_JAVA_HOME="$JAVA_HOME"
@@ -282,4 +361,13 @@ export JAVA_HOME="$ORIGINAL_JAVA_HOME"
 
 APK_PATH=$(find "$GRADLE_PROJECT_DIR" -path "*/outputs/apk/debug/*.apk" | head -n 1 || true)
 [ -n "$APK_PATH" ] || { ba_log "Gradle build completed but no APK was found" >&2; exit 1; }
-ba_log "Successfully built Android APK at $APK_PATH"
+ba_log "Successfully built Android APK at $APK_PATH"
+
+if [ -n "${GITHUB_OUTPUT:-}" ]; then
+  {
+    echo "gradle_project_dir=$GRADLE_PROJECT_DIR"
+    echo "apk_path=$APK_PATH"
+    echo "instrumentation_test_class=$PACKAGE_NAME.HelloCodenameOneInstrumentedTest"
+  } >> "$GITHUB_OUTPUT"
+  ba_log "Published GitHub Actions outputs for downstream steps"
+fi

scripts/run-android-instrumentation-tests.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# Run instrumentation tests against the generated Codename One Android project
+set -euo pipefail
+
+ra_log() { echo "[run-android-instrumentation-tests] $1"; }
+
+if [ $# -lt 1 ]; then
+  ra_log "Usage: $0 <gradle_project_dir>" >&2
+  exit 1
+fi
+
+GRADLE_PROJECT_DIR="$1"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+cd "$REPO_ROOT"
+
+TMPDIR="${TMPDIR:-/tmp}"; TMPDIR="${TMPDIR%/}"
+DOWNLOAD_DIR="${TMPDIR%/}/codenameone-tools"
+ENV_DIR="$DOWNLOAD_DIR/tools"
+ENV_FILE="$ENV_DIR/env.sh"
+
+ra_log "Loading workspace environment from $ENV_FILE"
+if [ -f "$ENV_FILE" ]; then
+  # shellcheck disable=SC1090
+  source "$ENV_FILE"
+else
+  ra_log "Workspace environment file not found. Run scripts/setup-workspace.sh before this script." >&2
+  exit 1
+fi
+
+if [ -z "${JAVA17_HOME:-}" ] || [ ! -x "$JAVA17_HOME/bin/java" ]; then
+  ra_log "JAVA17_HOME validation failed. Current value: ${JAVA17_HOME:-<unset>}" >&2
+  exit 1
+fi
+
+ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-${ANDROID_HOME:-}}"
+if [ -z "$ANDROID_SDK_ROOT" ]; then
+  if [ -d "/usr/local/lib/android/sdk" ]; then ANDROID_SDK_ROOT="/usr/local/lib/android/sdk"
+  elif [ -d "$HOME/Android/Sdk" ]; then ANDROID_SDK_ROOT="$HOME/Android/Sdk"; fi
+fi
+if [ -z "$ANDROID_SDK_ROOT" ] || [ ! -d "$ANDROID_SDK_ROOT" ]; then
+  ra_log "Android SDK not found. Set ANDROID_SDK_ROOT or ANDROID_HOME to a valid installation." >&2
+  exit 1
+fi
+export ANDROID_SDK_ROOT ANDROID_HOME="$ANDROID_SDK_ROOT"
+
+if [ ! -d "$GRADLE_PROJECT_DIR" ]; then
+  ra_log "Gradle project directory not found: $GRADLE_PROJECT_DIR" >&2
+  exit 1
+fi
+
+if [ ! -x "$GRADLE_PROJECT_DIR/gradlew" ]; then
+  chmod +x "$GRADLE_PROJECT_DIR/gradlew"
+fi
+
+ra_log "Running instrumentation tests from $GRADLE_PROJECT_DIR"
+ORIGINAL_JAVA_HOME="${JAVA_HOME:-}"; export JAVA_HOME="$JAVA17_HOME"
+(
+  cd "$GRADLE_PROJECT_DIR"
+  ./gradlew --no-daemon connectedDebugAndroidTest
+)
+export JAVA_HOME="$ORIGINAL_JAVA_HOME"
+ra_log "Instrumentation tests completed successfully"