Diagnostic info for when tests hang.

TWiStErRob · Aug 9, 2023 · ccb1232 · ccb1232
1 parent c78ffbc
commit ccb1232
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 1 deletion.
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,6 +2,7 @@ plugins {
 	id("net.twisterrob.inventory.android.app")
 	id("net.twisterrob.inventory.mapping")
 	id("net.twisterrob.inventory.upgradeTest")
+	id("net.twisterrob.inventory.build.tests.instrumentation")
 }
 
 dependencies {
@@ -149,8 +150,13 @@ tasks.withType(Test).configureEach {
 
 // CONSIDER a rewrite of plugin "android-reporting" (see Color Filters repo)
 def copyAndroidTestResults = tasks.register("copyAndroidTestResults", Sync) {
+	// No SingleArtifact/InternalArtifactType in AGP 8.1 for androidTest results/reports, so hardcode.
 	from(layout.buildDirectory.dir("reports/androidTests/connected/debug"))
 	from(layout.buildDirectory.dir("outputs/androidTest-results/connected/debug"))
 	into(rootProject.layout.buildDirectory.dir("androidTest-results"))
 }
-tasks.named("connectedDebugAndroidTest").configure { finalizedBy(copyAndroidTestResults) }
+afterEvaluate {
+	tasks.named("connectedDebugAndroidTest").configure {
+		finalizedBy(copyAndroidTestResults)
+	}
+}
diff --git a/gradle/plugins-inventory/build.gradle.kts b/gradle/plugins-inventory/build.gradle.kts
@@ -36,6 +36,10 @@ dependencies {
 	compileOnly(libs.plugin.android.tools.ddmlib)
 	// UpgradeTestTask: FileUtils, StdLogger, ILogger
 	compileOnly(libs.plugin.android.tools.common)
+	// instrumentation.gradle.kts
+	compileOnly("com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0")
+	compileOnly("com.google.testing.platform:core-proto:0.0.8-alpha08")
+	compileOnly("com.google.protobuf:protobuf-java:3.19.3")
 	// endregion
 
 	// TODEL https://github.com/gradle/gradle/issues/15383

diff --git a/...inventory/src/main/kotlin/net/twisterrob/inventory/build/tests/instrumentation.gradle.kts b/...inventory/src/main/kotlin/net/twisterrob/inventory/build/tests/instrumentation.gradle.kts
@@ -0,0 +1,9 @@
+package net.twisterrob.inventory.build.tests
+
+import com.android.build.gradle.internal.tasks.DeviceProviderInstrumentTestTask
+import net.twisterrob.inventory.build.tests.instrumentation.LoggingUtpTestResultListener
+
+// TODEL https://issuetracker.google.com/issues/37056080
+tasks.withType<DeviceProviderInstrumentTestTask>().configureEach {
+	setUtpTestResultListener(LoggingUtpTestResultListener(logger))
+}
diff --git a/...tlin/net/twisterrob/inventory/build/tests/instrumentation/LoggingUtpTestResultListener.kt b/...tlin/net/twisterrob/inventory/build/tests/instrumentation/LoggingUtpTestResultListener.kt
@@ -0,0 +1,42 @@
+package net.twisterrob.inventory.build.tests.instrumentation
+
+import com.android.build.gradle.internal.testing.utp.UtpTestResultListener
+import com.android.tools.utp.plugins.result.listener.gradle.proto.GradleAndroidTestResultListenerProto.TestResultEvent
+import com.android.tools.utp.plugins.result.listener.gradle.proto.GradleAndroidTestResultListenerProto.TestResultEvent.StateCase
+import com.google.testing.platform.proto.api.core.TestCaseProto.TestCase
+import com.google.testing.platform.proto.api.core.TestResultProto.TestResult
+import com.google.testing.platform.proto.api.core.TestStatusProto.TestStatus
+import org.gradle.api.logging.Logger
+
+/**
+ * See https://issuetracker.google.com/issues/37056080#comment12.
+ */
+class LoggingUtpTestResultListener(
+	private val logger: Logger
+) : UtpTestResultListener {
+	// See com.android.build.gradle.internal.testing.utp.DdmlibTestResultAdapter.onTestResultEvent
+	// See com.android.build.gradle.internal.testing.CustomTestRunListener.testEnded
+	override fun onTestResultEvent(testResultEvent: TestResultEvent) {
+		//logger.lifecycle("UTP: {}", testResultEvent)
+		when (testResultEvent.stateCase) {
+			StateCase.TEST_CASE_STARTED -> {
+				val tc = testResultEvent.testCaseStarted.testCase.unpack(TestCase::class.java)
+				logger.lifecycle("${tc.testPackage}.${tc.testClass} > ${tc.testMethod} \u001b[34mSTARTED\u001b[0m")
+			}
+			StateCase.TEST_CASE_FINISHED -> {
+				val result = testResultEvent.testCaseFinished.testCaseResult.unpack(TestResult::class.java)
+				val status = when (result.testStatus) {
+					TestStatus.PASSED -> "\u001b[32mSUCCESS\u001b[0m"
+					// Already handled by AGP.
+					TestStatus.FAILED, TestStatus.ERROR, TestStatus.IGNORED -> null
+					else -> "\u001b[31${result.testStatus.name}\u001b[0m"
+				}
+				if (status != null) {
+					val tc = result.testCase
+					logger.lifecycle("${tc.testPackage}.${tc.testClass} > ${tc.testMethod} ${status}")
+				}
+			}
+			else -> {}
+		}
+	}
+}