Debug json data

Author: runningcode

gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/NoVcsEmergePluginTest.kt

@@ -77,6 +77,7 @@ class NoVcsEmergePluginTest : EmergePluginTest() {
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("logExtension")
       .withGithubPR()
+      .withJavaVersionFromAgp(project.agpVersion)
       .build()
 
     assertThat(runner).task(":app:logExtension").succeeded()
@@ -101,6 +102,7 @@ class NoVcsEmergePluginTest : EmergePluginTest() {
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("logExtension")
       .withGitHubPushEvent()
+      .withJavaVersionFromAgp(project.agpVersion)
       .build()
 
     assertThat(runner).apply {

gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/SimpleEmergePluginTest.kt

@@ -5,17 +5,16 @@ import com.emergetools.android.gradle.base.EmergeGradleRunner.Companion.LATEST_A
 import com.emergetools.android.gradle.base.EmergeGradleRunner2
 import com.emergetools.android.gradle.mocks.assertSuccessfulUploadRequests
 import com.emergetools.android.gradle.projects.SimpleGradleProject
-import com.google.common.truth.Truth.assertThat
 import org.gradle.util.GradleVersion
 import org.junit.jupiter.api.Test
-import java.io.File
 
 class SimpleEmergePluginTest : EmergePluginTest() {
   @Test
   fun simpleBundle() {
     val project = SimpleGradleProject.createWithVcsInExtension(this)
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("emergeUploadReleaseAab")
+      .withJavaVersionFromAgp(project.agpVersion)
       .build()
 
     assertSuccessfulUploadRequests(server)
@@ -27,6 +26,7 @@ class SimpleEmergePluginTest : EmergePluginTest() {
     val project = SimpleGradleProject.createWithVcsInExtension(this, LATEST_AGP_7_VERSION)
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir, GradleVersion.version("7.5.1"))
       .withArguments("emergeUploadReleaseAab")
+      .withJavaVersionFromAgp(LATEST_AGP_7_VERSION)
       .build()
 
     assertSuccessfulUploadRequests(server)
@@ -39,6 +39,7 @@ class SimpleEmergePluginTest : EmergePluginTest() {
     val project = SimpleGradleProject.createWithVcsInExtension(this)
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("emergeUploadReleaseAab")
+      .withJavaVersionFromAgp(project.agpVersion)
       .buildAndFail()
 
     assertThat(runner).task(":app:emergeUploadReleaseAab").failed()
@@ -49,6 +50,7 @@ class SimpleEmergePluginTest : EmergePluginTest() {
     val project = SimpleGradleProject.createWithVcsInExtension(this)
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("emergeUploadReleaseApk")
+      .withJavaVersionFromAgp(project.agpVersion)
       .build()
 
     assertSuccessfulUploadRequests(server)
@@ -61,6 +63,7 @@ class SimpleEmergePluginTest : EmergePluginTest() {
     val project = SimpleGradleProject.createWithVcsInExtension(this)
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("emergeUploadReleaseApk")
+      .withJavaVersionFromAgp(project.agpVersion)
       .buildAndFail()
 
     assertThat(runner).task(":app:emergeUploadReleaseApk").failed()
@@ -71,6 +74,7 @@ class SimpleEmergePluginTest : EmergePluginTest() {
     val project = SimpleGradleProject.createWithVcsInExtension(this)
     val runner = EmergeGradleRunner2(project.gradleProject.rootDir)
       .withArguments("logExtension")
+      .withJavaVersionFromAgp(project.agpVersion)
       .withGithubPR()
       .build()
 
@@ -85,6 +89,4 @@ class SimpleEmergePluginTest : EmergePluginTest() {
       ╠═ previousSha: testPreviousSha
       """.trimIndent())
   }
-
-
 }

gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/base/EmergeGradleRunner2.kt

@@ -2,41 +2,69 @@ package com.emergetools.android.gradle.base
 
 import com.autonomousapps.kit.GradleBuilder
 import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.GradleRunner
 import org.gradle.util.GradleVersion
 import java.io.File
 
 /**
  * Like EmergeGradleRunner but decouples the runner from the server and the gradle project
  */
 class EmergeGradleRunner2(projectDir: File, gradleVersion: GradleVersion = GradleVersion.current()) {
+  private val runner = GradleBuilder.runner(gradleVersion, projectDir)
 
-  val runner = GradleBuilder.runner(gradleVersion, projectDir)
+  init {
+    appendEnvironment(System.getenv())
+  }
 
   fun withArguments(vararg args: String): EmergeGradleRunner2 {
     runner.withArguments(*args)
     return this
   }
 
-  fun withGithubPR() : EmergeGradleRunner2 {
+  // TODO we should stop using this and instead use Java toolchain support
+  fun withJavaVersionFromAgp(agpVersion: String): EmergeGradleRunner2 {
+    val javaVersion = if (agpVersion.startsWith("7")) {
+      "11"
+    } else {
+      "17"
+    }
+    return apply {
+      val arch = if (System.getProperty("os.arch") == "aarch64") "aarch64" else "X64"
+      val javaHomeEnvKey = "JAVA_HOME_${javaVersion}_$arch"
+      runner.withArguments(runner.arguments + "-Dorg.gradle.java.home=${System.getenv(javaHomeEnvKey)}")
+    }
+  }
+
+  fun withGithubPR(): EmergeGradleRunner2 {
     val resource = this.javaClass.getResource("/github-event-mocks/mock_pr_event.json")!!
     val jsonFile = File(resource.toURI())
 
-    runner.withEnvironment(mapOf(
+    return appendEnvironment(
       "GITHUB_EVENT_NAME" to "pull_request",
       "GITHUB_EVENT_PATH" to jsonFile.path,
-    ))
-    return this
+    )
   }
 
   fun withGitHubPushEvent(): EmergeGradleRunner2 {
     val resource = this.javaClass.getResource("/github-event-mocks/mock_push_event.json")!!
     val jsonFile = File(resource.toURI())
 
-    runner.withEnvironment(mapOf(
+    return appendEnvironment(
       "GITHUB_EVENT_NAME" to "push",
       "GITHUB_EVENT_PATH" to jsonFile.path,
       "GITHUB_SHA" to "github_env_sha",
-    ))
+    )
+  }
+
+  private fun appendEnvironment(vararg pairs: Pair<String, String>) : EmergeGradleRunner2 {
+    val currentEnv = runner.environment?.toMutableMap() ?: mutableMapOf()
+    runner.withEnvironment(currentEnv.plus(pairs))
+    return this
+  }
+
+  private fun appendEnvironment(map: Map<String, String>) : EmergeGradleRunner2 {
+    val currentEnv = runner.environment?.toMutableMap() ?: mutableMapOf()
+    runner.withEnvironment(currentEnv.plus(map))
     return this
   }
 

gradle-plugin/plugin/src/functionalTest/kotlin/com/emergetools/android/gradle/projects/SimpleGradleProject.kt

@@ -13,7 +13,7 @@ import com.emergetools.android.gradle.EmergePluginTest
 import com.emergetools.android.gradle.base.EmergeGradleRunner
 
 class SimpleGradleProject(
-  agpVersion: String,
+  val agpVersion: String,
   private val baseUrl: String,
   private val emergeExtension: String
 ) : AbstractGradleProject() {