Updating result storage path (#73)

* Updating result storage path

* linting

* addressing feedback

* linting

* renaming method

* adding test

Author: rnakade

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/TestMatrixStore.kt

@@ -16,6 +16,7 @@
 
 package dev.androidx.ci.testRunner
 
+import com.google.common.annotations.VisibleForTesting
 import dev.androidx.ci.datastore.DatastoreApi
 import dev.androidx.ci.firebase.FirebaseTestLabApi
 import dev.androidx.ci.firebase.ToolsResultApi
@@ -299,7 +300,7 @@ internal class TestMatrixStore(
         )
         val resultStorage = ResultStorage(
             googleCloudStorage = GoogleCloudStorage(
-                gcsPath = testRunKey.resultGcsPath().path
+                gcsPath = createUniqueResultGcsPath(testRunKey).path
             ),
             toolResultsHistory = ToolResultsHistory(
                 projectId = firebaseProjectId,
@@ -337,7 +338,7 @@ internal class TestMatrixStore(
 
         val resultStorage = ResultStorage(
             googleCloudStorage = GoogleCloudStorage(
-                gcsPath = testRunKey.resultGcsPath().path
+                gcsPath = createUniqueResultGcsPath(testRunKey).path
             ),
             toolResultsHistory = testMatrix.resultStorage.toolResultsHistory
         )
@@ -375,5 +376,8 @@ internal class TestMatrixStore(
         )
     }
 
-    private fun TestRun.Id.resultGcsPath() = (resultsGcsPrefix + key.name)
+    @VisibleForTesting
+    internal fun createUniqueResultGcsPath(testRunKey: TestRun.Id): GcsPath {
+        return resultsGcsPrefix + testRunKey.key.name + UUID.randomUUID().toString()
+    }
 }

AndroidXCI/lib/src/test/kotlin/dev/androidx/ci/testRunner/TestMatrixStoreTest.kt

@@ -30,16 +30,17 @@ import dev.androidx.ci.generated.ftl.FileReference
 import dev.androidx.ci.generated.ftl.ShardingOption
 import dev.androidx.ci.generated.ftl.TestMatrix
 import dev.androidx.ci.generated.ftl.UniformSharding
+import dev.androidx.ci.testRunner.dto.TestRun
 import dev.androidx.ci.testRunner.vo.ApkInfo
 import dev.androidx.ci.testRunner.vo.DeviceSetup
 import dev.androidx.ci.testRunner.vo.UploadedApk
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 
 internal class TestMatrixStoreTest {
-    val firebaseTestLabApi = FakeFirebaseTestLabApi()
-    val datastoreApi = FakeDatastore()
-    val toolsResultApi = FakeToolsResultApi()
+    private val firebaseTestLabApi = FakeFirebaseTestLabApi()
+    private val datastoreApi = FakeDatastore()
+    private val toolsResultApi = FakeToolsResultApi()
     private val store = TestMatrixStore(
         firebaseProjectId = "p1",
         firebaseTestLabApi = firebaseTestLabApi,
@@ -329,6 +330,28 @@ internal class TestMatrixStoreTest {
             ).containsExactly("/sdcard/Android/data/$testPackageName/cache/androidx_screenshots")
         }
     }
+
+    @Test
+    fun createUniqueResultGcsPath() = runBlocking {
+        val testRunId = TestRun.createId(
+            datastoreApi = datastoreApi,
+            environment = envMatrix1,
+            clientInfo = ClientInfo(name = "test"),
+            sharding = ShardingOption(),
+            appApk = createFakeApk("app.pak").apkInfo,
+            testApk = createFakeApk("test.apk").apkInfo,
+            deviceSetup = DeviceSetup()
+        )
+
+        val resultGcsPath1 = store.createUniqueResultGcsPath(testRunId)
+        val resultGcsPath2 = store.createUniqueResultGcsPath(testRunId)
+
+        assertThat(
+            resultGcsPath1
+        ).isNotEqualTo(
+            resultGcsPath2
+        )
+    }
     private fun createFakeApk(name: String) = UploadedApk(
         gcsPath = GcsPath("gs://foo/bar/$name"),
         apkInfo = ApkInfo(