Improve Android UI test dependency logging

Author: shai-almog

scripts/build-android-app.sh

@@ -293,7 +293,16 @@ if [ ! -f "$APP_BUILD_GRADLE" ]; then
   exit 1
 fi
 
-"$SCRIPT_DIR/update_android_ui_test_gradle.py" "$APP_BUILD_GRADLE"
+GRADLE_UPDATE_OUTPUT="$("$SCRIPT_DIR/update_android_ui_test_gradle.py" "$APP_BUILD_GRADLE")"
+if [ -n "$GRADLE_UPDATE_OUTPUT" ]; then
+  while IFS= read -r line; do
+    [ -n "$line" ] && ba_log "$line"
+  done <<<"$GRADLE_UPDATE_OUTPUT"
+fi
+
+ba_log "Dependencies block after instrumentation update:"
+awk '/^\s*dependencies\s*\{/{flag=1} flag{print} /^\s*\}/{if(flag){exit}}' "$APP_BUILD_GRADLE" \
+  | sed 's/^/[build-android-app] | /'
 
 FINAL_ARTIFACT_DIR="${CN1_TEST_SCREENSHOT_EXPORT_DIR:-$REPO_ROOT/build-artifacts}"
 mkdir -p "$FINAL_ARTIFACT_DIR"

scripts/update_android_ui_test_gradle.py

@@ -24,6 +24,8 @@
 class GradleFile:
     def __init__(self, content: str) -> None:
         self.content = content
+        self.configuration_used: str | None = None
+        self.added_dependencies: list[str] = []
 
     def find_block(self, name: str) -> tuple[int, int] | None:
         pattern = re.compile(rf"(^\s*{re.escape(name)}\s*\{{)", re.MULTILINE)
@@ -88,6 +90,7 @@ def ensure_dependencies(self) -> None:
             raise SystemExit("Unable to locate dependencies block in Gradle file")
         existing_block = self.content[block[0]:block[1]]
         configuration = self._select_configuration(existing_block, self.content)
+        self.configuration_used = configuration
         insertion_point = block[1] - 1
         for coordinate in ANDROID_TEST_DEPENDENCIES:
             if self._has_dependency(existing_block, coordinate):
@@ -100,6 +103,7 @@ def ensure_dependencies(self) -> None:
             )
             insertion_point += len(combined)
             existing_block += combined
+            self.added_dependencies.append(coordinate)
 
     @staticmethod
     def _has_dependency(block: str, coordinate: str) -> bool:
@@ -119,18 +123,38 @@ def _select_configuration(block: str, content: str) -> str:
             return "androidTestImplementation"
         if re.search(r"^\s*androidTestCompile\b", content, re.MULTILINE):
             return "androidTestCompile"
-        return "androidTestCompile"
+        if re.search(r"^\s*implementation\b", block, re.MULTILINE) or re.search(
+            r"^\s*implementation\b", content, re.MULTILINE
+        ):
+            return "androidTestImplementation"
+        if re.search(r"^\s*compile\b", block, re.MULTILINE) or re.search(
+            r"^\s*compile\b", content, re.MULTILINE
+        ):
+            return "androidTestCompile"
+        return "androidTestImplementation"
 
     def apply(self) -> None:
         self.ensure_test_options()
         self.ensure_instrumentation_runner()
         self.ensure_dependencies()
 
+    def summary(self) -> str:
+        configuration = self.configuration_used or "<unknown>"
+        if self.added_dependencies:
+            deps = ", ".join(self.added_dependencies)
+        else:
+            deps = "none (already present)"
+        return (
+            "Instrumentation dependency configuration: "
+            f"{configuration}; added dependencies: {deps}"
+        )
+
 
 def process(path: pathlib.Path) -> None:
     editor = GradleFile(path.read_text(encoding="utf-8"))
     editor.apply()
     path.write_text(editor.content, encoding="utf-8")
+    print(editor.summary())
 
 
 def main(argv: list[str] | None = None) -> int: