Switched to androidx testing

Author: shai-almog

scripts/build-android-app.sh

@@ -201,6 +201,7 @@ xmlstarlet sel -N "$NS" -t -c "/mvn:project/mvn:build/mvn:plugins" -n "$ROOT_POM
 [ -f "$APP_DIR/build.sh" ] && chmod +x "$APP_DIR/build.sh"
 
 SETTINGS_FILE="$APP_DIR/common/codenameone_settings.properties"
+echo "codename1.arg.android.useAndroidX=true" >> "$SETTINGS_FILE"
 [ -f "$SETTINGS_FILE" ] || { ba_log "codenameone_settings.properties not found at $SETTINGS_FILE" >&2; exit 1; }
 
 # --- Read settings ---
@@ -266,112 +267,158 @@ if [ -z "$GRADLE_PROJECT_DIR" ]; then
 fi
 
 ba_log "Configuring instrumentation test sources in $GRADLE_PROJECT_DIR"
+
+# Ensure AndroidX flags in gradle.properties
+GRADLE_PROPS="$GRADLE_PROJECT_DIR/gradle.properties"
+grep -q '^android.useAndroidX=' "$GRADLE_PROPS" 2>/dev/null || echo 'android.useAndroidX=true' >> "$GRADLE_PROPS"
+grep -q '^android.enableJetifier=' "$GRADLE_PROPS" 2>/dev/null || echo 'android.enableJetifier=true' >> "$GRADLE_PROPS"
+
 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
+ROOT_BUILD_GRADLE="$GRADLE_PROJECT_DIR/build.gradle"
 
-path = pathlib.Path(sys.argv[1])
-text = path.read_text()
-modified = False
+# Add google()/mavenCentral() to repositories blocks (root + app), but don't touch dependencies
+for F in "$ROOT_BUILD_GRADLE" "$APP_BUILD_GRADLE"; do
+  if [ -f "$F" ]; then
+    if ! grep -q 'repositories[[:space:]]*{' "$F"; then
+      cat >> "$F" <<'EOS'
+
+repositories {
+    google()
+    mavenCentral()
+}
+EOS
+    else
+      # insert only if missing
+      grep -q 'google()' "$F" || sed -E -i '0,/repositories[[:space:]]*\{/s//repositories {\n    google()\n    mavenCentral()/' "$F"
+      grep -q 'mavenCentral()' "$F" || sed -E -i '0,/repositories[[:space:]]*\{/s//repositories {\n    google()\n    mavenCentral()/' "$F"
+    fi
+  fi
+done
 
-if "android.test.InstrumentationTestRunner" not in text:
-    def add_runner(match):
-        prefix = match.group(0)
-        return prefix + "\n        testInstrumentationRunner \"android.test.InstrumentationTestRunner\""
+if [ -f "$APP_BUILD_GRADLE" ]; then
+  python3 - "$APP_BUILD_GRADLE" <<'PY'
+import sys, re, pathlib
+p = pathlib.Path(sys.argv[1])
+txt = p.read_text()
+orig = txt
+modified = False
 
-    new_text, count = re.subn(r"(defaultConfig\s*\{)", add_runner, text, count=1, flags=re.MULTILINE)
-    if count:
-        text = new_text
+def strip_block(name, s):
+    return re.sub(rf'(?ms)^\s*{name}\s*\{{.*?\}}\s*', '', s)
+module_view = strip_block('buildscript', txt)
+module_view = strip_block('pluginManagement', module_view)
+
+# Runner -> AndroidX
+if "androidx.test.runner.AndroidJUnitRunner" not in module_view:
+    t2, n = re.subn(r'(?m)^\s*testInstrumentationRunner\s*".*?"\s*$',
+                    '        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"', txt)
+    if n == 0:
+        t2, n = re.subn(r'(?m)(^\s*defaultConfig\s*\{)',
+                        r'\1\n        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"', txt, count=1)
+    if n == 0:
+        t2, n = re.subn(r'(?ms)(^\s*android\s*\{)',
+                        r'\1\n    defaultConfig {\n        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"\n    }', txt, count=1)
+    if n:
+        txt = t2
+        module_view = strip_block('buildscript', txt)
+        module_view = strip_block('pluginManagement', module_view)
         modified = True
-    else:
-        raise SystemExit("defaultConfig block not found while adding instrumentation runner")
 
-libraries = [
-    "useLibrary 'android.test.base'",
-    "useLibrary 'android.test.mock'",
-    "useLibrary 'android.test.runner'",
-]
+# Remove legacy useLibrary
+t2, n = re.subn(r'(?m)^\s*useLibrary\s+\'android\.test\.(base|mock|runner)\'\s*$', '', txt)
+if n:
+    txt = t2
+    module_view = strip_block('buildscript', txt)
+    module_view = strip_block('pluginManagement', module_view)
+    modified = True
+
+# Pick config name (modern vs legacy)
+uses_modern = re.search(r'(?m)^\s*(implementation|api|testImplementation|androidTestImplementation)\b', module_view) is not None
+conf = "androidTestImplementation" if uses_modern else "androidTestCompile"
 
-missing_libraries = [lib for lib in libraries if lib not in text]
-if missing_libraries:
-    match = re.search(r"^(\s*android\s*\{)", text, flags=re.MULTILINE)
-    if not match:
-        raise SystemExit("android block not found while adding instrumentation libraries")
-    line = match.group(1)
-    indent = re.match(r"^(\s*)", line).group(1)
-    insertion = "".join(f"\n{indent}    {lib}" for lib in missing_libraries)
-    text = text[: match.end()] + insertion + text[match.end():]
+# Append deps block at EOF (module-level)
+needed = [
+    ("androidx.test:ext:junit:1.1.5", conf),        # <-- provides AndroidJUnit4
+    ("androidx.test:runner:1.5.2", conf),
+    ("androidx.test:core:1.5.0", conf),
+    ("androidx.test.services:storage:1.4.2", conf),
+]
+to_add = [(coord, c) for coord, c in needed if coord not in module_view]
+if to_add:
+    block = "\n\ndependencies {\n" + "".join([f"    {c} \"{coord}\"\n" for coord, c in to_add]) + "}\n"
+    txt = txt.rstrip() + block
     modified = True
 
-if modified:
-    if not text.endswith("\n"):
-        text += "\n"
-    path.write_text(text)
-PYTHON
-  ba_log "Ensured instrumentation runner and libraries are declared"
-else
-  ba_log "Warning: Gradle build file not found at $APP_BUILD_GRADLE; skipping instrumentation dependency configuration" >&2
+if modified and txt != orig:
+    if not txt.endswith("\n"): txt += "\n"
+    p.write_text(txt)
+    print(f"Patched app/build.gradle (deps via {conf}, appended at EOF)")
+else:
+    print("No changes needed in app/build.gradle")
+PY
+  ba_log "Applied AndroidX test runner/deps (EOF append, module-only)"
 fi
 
+echo "----- app/build.gradle tail -----"
+tail -n 80 "$APP_BUILD_GRADLE" | sed 's/^/| /'
+echo "---------------------------------"
+
 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 android.test.InstrumentationTestCase;
+cat >"$TEST_CLASS" <<'EOF'
+package @PACKAGE@;
 
 import android.app.Instrumentation;
 import android.os.ParcelFileDescriptor;
-import android.util.Base64;
 
-import java.io.FileInputStream;
-import java.io.IOException;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.services.storage.TestStorage;
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
 
-public class HelloCodenameOneInstrumentedTest extends InstrumentationTestCase {
+import static org.junit.Assert.assertEquals;
 
-    public void testUseAppContext() {
-        Context appContext = getInstrumentation().getTargetContext();
-        assertEquals("$PACKAGE_NAME", appContext.getPackageName());
-    }
+@RunWith(AndroidJUnit4.class)
+public class HelloCodenameOneInstrumentedTest {
 
-    private static final int CHUNK = 200_000;
+    @Test
+    public void testUseAppContext_andSaveScreenshot() throws Exception {
+        // Keep your assertion
+        String expectedPkg = "@PACKAGE@";
+        String actualPkg = ApplicationProvider.getApplicationContext().getPackageName();
+        assertEquals(expectedPkg, actualPkg);
 
-    public static void printPngToStdout(Instrumentation inst) {
-      try {
+        // Capture PNG from emulator
+        Instrumentation inst = InstrumentationRegistry.getInstrumentation();
         ParcelFileDescriptor pfd = inst.getUiAutomation().executeShellCommand("screencap -p");
-        byte[] png;
-        try (InputStream in = new FileInputStream(pfd.getFileDescriptor())) {
-            png = readAll(in);
-        }
-        String b64 = Base64.encodeToString(png, Base64.NO_WRAP);
-        System.out.println("<<CN1_SCREENSHOT_BEGIN>>");
-        for (int i = 0; i < b64.length(); i += CHUNK) {
-            int end = Math.min(i + CHUNK, b64.length());
-            System.out.println(b64.substring(i, end));
+        byte[] png = readAll(new FileInputStream(pfd.getFileDescriptor()));
+
+        // Write to AndroidX TestStorage (runner copies back to host)
+        try (OutputStream out = TestStorage.openOutputFile("emulator-screenshot.png")) {
+            out.write(png);
         }
-        System.out.println("<<CN1_SCREENSHOT_END>>");
-        System.out.flush();
-      } catch (IOException err) {
-        err.printStackTrace();
-        throw new RuntimeException(err);
-      }
+        System.out.println("WROTE_TO_TEST_STORAGE:emulator-screenshot.png");
     }
 
-    private static byte[] readAll(InputStream in) throws IOException {
+    private static byte[] readAll(InputStream in) throws Exception {
         byte[] buf = new byte[64 * 1024];
         int n;
-        java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
         while ((n = in.read(buf)) != -1) out.write(buf, 0, n);
         return out.toByteArray();
     }
 }
 EOF
+sed -i "s|@PACKAGE@|$PACKAGE_NAME|g" "$TEST_CLASS"
 ba_log "Created instrumentation test at $TEST_CLASS"
 
 DEFAULT_ANDROID_TEST="$GRADLE_PROJECT_DIR/app/src/androidTest/java/com/example/myapplication2/ExampleInstrumentedTest.java"