Add outputDir parameter for WMFlickerTestRule
Add two parameters to WMFlickerTestRule: outputDir and testTag. OutputDir is set default to defaultFlickerOutputDir and testTag to fass.
Bug: 195121324
Test: atest FlickerLibTest:FassMockTest
Change-Id: I7df566f8d35c3c14f34c36ef2a04ed07286b2541
diff --git a/libraries/flicker/src/com/android/server/wm/flicker/rules/WMFlickerServiceRule.kt b/libraries/flicker/src/com/android/server/wm/flicker/rules/WMFlickerServiceRule.kt
index a07fcf8..71dae06 100644
--- a/libraries/flicker/src/com/android/server/wm/flicker/rules/WMFlickerServiceRule.kt
+++ b/libraries/flicker/src/com/android/server/wm/flicker/rules/WMFlickerServiceRule.kt
@@ -16,6 +16,7 @@
package com.android.server.wm.flicker.rules
+import com.android.server.wm.flicker.getDefaultFlickerOutputDir
import com.android.server.wm.flicker.monitor.LayersTraceMonitor
import com.android.server.wm.flicker.monitor.TraceMonitor
import com.android.server.wm.flicker.monitor.TransitionMonitor.Companion.WINSCOPE_EXT
@@ -29,12 +30,14 @@
import org.junit.runner.Description
import java.nio.file.Files
import java.nio.file.Path
-import java.nio.file.Paths
/**
* Collect the WM and SF traces, parse them and call the WM Flicker Service after the test
*/
-open class WMFlickerServiceRule : TestWatcher() {
+open class WMFlickerServiceRule @JvmOverloads constructor(
+ private val outputDir: Path = getDefaultFlickerOutputDir(),
+ private val testTag: String = "fass"
+) : TestWatcher() {
private val traceMonitors = mutableListOf<TraceMonitor>()
protected var wmTrace: WindowManagerTrace? = null
protected var layersTrace: LayersTrace? = null
@@ -98,10 +101,4 @@
val layersTraceByteArray: ByteArray = Files.readAllBytes(traceFilePath)
return LayersTraceParser.parseFromTrace(layersTraceByteArray)
}
-
- companion object {
- @JvmStatic
- private val outputDir = Paths.get("/sdcard/fass")
- private val testTag = "fass"
- }
}
\ No newline at end of file
