try coverage folder with test name

agoda-com · Oct 9, 2023 · da331ab · da331ab
1 parent 9709a68
commit da331ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/vendor/vendor-android/src/main/kotlin/com/malinskiy/marathon/android/BaseAndroidDevice.kt b/vendor/vendor-android/src/main/kotlin/com/malinskiy/marathon/android/BaseAndroidDevice.kt
@@ -124,7 +124,7 @@ abstract class BaseAndroidDevice(
  FileSyncEntry(
  relativePath = "coverage",
  pathRoot = PathRoot.APP_DATA,
- aggregationMode = AggregationMode.POOL
+ aggregationMode = AggregationMode.TEST_RUN
  )
  )
  }
@@ -269,7 +269,7 @@ abstract class BaseAndroidDevice(
  )
 
  val fileSyncTestRunListener =
- FileSyncTestRunListener(devicePoolId, this, this@BaseAndroidDevice.androidConfiguration.fileSyncConfiguration, fileManager)
+ FileSyncTestRunListener(devicePoolId, this, this@BaseAndroidDevice.androidConfiguration.fileSyncConfiguration, fileManager, testBatch)
 
  val adamScreenCaptureTestRunListener = AdamScreenCaptureTestRunListener(devicePoolId, this, fileManager, testBatch.id)
  attachmentProviders.add(adamScreenCaptureTestRunListener)

diff --git a/...lin/com/malinskiy/marathon/android/executor/listeners/filesync/FileSyncTestRunListener.kt b/...lin/com/malinskiy/marathon/android/executor/listeners/filesync/FileSyncTestRunListener.kt
@@ -13,13 +13,15 @@ import com.malinskiy.marathon.device.toDeviceInfo
 import com.malinskiy.marathon.io.FileManager
 import com.malinskiy.marathon.io.FolderType
 import com.malinskiy.marathon.log.MarathonLogging
+import com.malinskiy.marathon.test.TestBatch
 import java.io.File
 
 class FileSyncTestRunListener(
  private val pool: DevicePoolId,
  private val device: AndroidDevice,
  private val configuration: FileSyncConfiguration,
  private val fileManager: FileManager,
+ private val testBatch: TestBatch = TestBatch(tests = emptyList()),
 ) : AndroidTestRunListener {
 
  private val logger = MarathonLogging.logger("FileSyncTestRunListener")
@@ -106,7 +108,11 @@ class FileSyncTestRunListener(
  AggregationMode.TEST_RUN -> fileManager.createFolder(FolderType.DEVICE_FILES)
  }
 
- val basename = entry.relativePath.removeSuffix("/").substringAfterLast('/')
+ var basename = entry.relativePath.removeSuffix("/").substringAfterLast('/')
+ if (testBatch.tests.size == 1) {
+ val test = testBatch.tests.first()
+ basename.plus("/${test.pkg}.${test.clazz}#${test.method}")
+ }
  val subfolder = File(localFolder, basename).apply { mkdirs() }
  logger.debug { "Pulling into ${subfolder.absolutePath}" }
  when (entry.pathRoot) {