improve sharding

Author: Piotr Mądry

plugin/build.gradle

@@ -6,7 +6,7 @@ apply plugin: "com.gradle.plugin-publish"
 apply plugin: "org.gradle.kotlin.kotlin-dsl"
 
 group = "firebase.test.lab"
-version = "1.1.6.23"
+version = "1.1.7"
 
 gradlePlugin {
     plugins {

plugin/src/main/java/com/appunite/firebasetestlabplugin/FirebaseTestLabPlugin.kt

@@ -277,6 +277,8 @@ class FirebaseTestLabPlugin : Plugin<Project> {
                     })
                 }
 
+        val testResultFile = File(project.buildDir, "TestResults.txt")
+        
         val instrumentationTasks: List<Task> = combineAll(appVersions, variant.outputs)
         { deviceAndMap, testApk -> Test(deviceAndMap.device, deviceAndMap.apk, testApk) }
             .map { test ->
@@ -286,8 +288,6 @@ class FirebaseTestLabPlugin : Plugin<Project> {
                 val taskName = "$runTestsTaskInstrumentation$devicePart$apkPart$testApkPart"
                 val numShards = test.device.numShards
 
-                val file = File(project.buildDir, "TestResults.txt")
-    
                 if (numShards > 0) {
                     project.tasks.create(taskName, InstrumentationShardingTask::class.java) {
                         group = Constants.FIREBASE_TEST_LAB
@@ -300,17 +300,32 @@ class FirebaseTestLabPlugin : Plugin<Project> {
                             apk = test.apk.outputFile,
                             testType = TestType.Instrumentation(test.testApk.outputFile)
                         )
-                        this.stateFile = file
+                        this.stateFile = testResultFile
 
                         if (downloader != null) {
                             mustRunAfter(cleanTask)
                         }
                         dependsOn(taskSetup)
                         dependsOn(arrayOf(test.apk.assemble, test.testApk.assemble))
+    
+                        doFirst {
+                            testResultFile.writeText("")
+                        }
 
                         doLast {
-                            val resultCode = file.readText().toInt()
-                            processResult(resultCode, ignoreFailures)
+                            val testResults = testResultFile.readText()
+                            val resultCode: Int? = testResults.toIntOrNull()
+    
+                            logger.lifecycle("TESTS RESULTS: Every digit represents single shard.")
+                            logger.lifecycle("\"0\" means -> tests for particular shard passed.")
+                            logger.lifecycle("\"1\" means -> tests for particular shard failed.")
+    
+                            logger.lifecycle("RESULTS_CODE: $resultCode")
+                            logger.lifecycle("When result code is equal to 0 means that all tests for all shards passed, otherwise some of them failed.")
+    
+                            if (resultCode != null) {
+                                processResult(resultCode, ignoreFailures)
+                            }
                         }
                     }
 
@@ -419,6 +434,7 @@ class FirebaseTestLabPlugin : Plugin<Project> {
             project.logger.lifecycle("SUCCESS: All tests passed.")
         } else {
             if (ignoreFailures) {
+                println("FAILURE: Tests failed.")
                 project.logger.error("FAILURE: Tests failed.")
             } else {
                 throw GradleException("FAILURE: Tests failed.")

plugin/src/main/java/com/appunite/firebasetestlabplugin/cloud/FirebaseTestLabProcessCreator.kt

@@ -56,7 +56,7 @@ object FirebaseTestLabProcessCreator {
                 "firebase", "test", "android", "run",
                 "--format=json",
                 "--device-ids=${device.deviceIds.joinArgs()}",
-                "--app=$processData.apk",
+                "--app=${processData.apk}",
                 "--locales=${device.locales.joinArgs()}",
                 "--os-version-ids=${device.androidApiLevels.joinArgs()}",
                 "--orientations=${device.screenOrientations.map { orientation -> orientation.gcloudName }.joinArgs()}")

plugin/src/main/java/com/appunite/firebasetestlabplugin/tasks/TestProcess.kt

@@ -0,0 +1,18 @@
+package com.appunite.firebasetestlabplugin.tasks
+
+import org.gradle.api.GradleException
+import java.io.File
+import javax.inject.Inject
+
+class TestProcess @Inject constructor(
+    private val stateFile: File,
+    private val value: Int
+) : Runnable {
+    override fun run() {
+           try {
+               stateFile.appendText(text = "0")
+           } catch (e: Exception){
+               throw GradleException("There was a problem with processing ${e.message} $value")
+           }
+    }
+}

plugin/src/main/java/com/appunite/firebasetestlabplugin/tasks/TestTask.kt

@@ -0,0 +1,24 @@
+package com.appunite.firebasetestlabplugin.tasks
+
+import org.gradle.api.Action
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.TaskAction
+import org.gradle.workers.WorkerConfiguration
+import org.gradle.workers.WorkerExecutor
+import java.io.File
+import javax.inject.Inject
+
+open class TestTask @Inject constructor(private val workerExecutor: WorkerExecutor) : DefaultTask() {
+    lateinit var stateFile: File
+    
+    @TaskAction
+    fun runAction() {
+        (0 until 4).map { shardIndex ->
+            workerExecutor.submit(TestProcess::class.java, object : Action<WorkerConfiguration> {
+                override fun execute(config: WorkerConfiguration) {
+                    config.params(stateFile, shardIndex)
+                }
+            })
+        }
+    }
+}