Skip to content

Commit 5d1311a

Browse files
committed
Fix Compose recommended config
1 parent af50104 commit 5d1311a

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ kotlin.mpp.enableCInteropCommonization=true
1414

1515
GROUP=com.atiurin
1616
POM_ARTIFACT_ID=ultron
17-
VERSION_NAME=2.5.0-alpha09
17+
VERSION_NAME=2.5.0-alpha10

sample-app/src/androidTest/java/com/atiurin/sampleapp/tests/BaseTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ abstract class BaseTest {
3131
@JvmStatic
3232
fun config() {
3333
UltronConfig.applyRecommended()
34-
UltronAllureConfig.applyRecommended()
3534
UltronComposeConfig.applyRecommended()
35+
UltronAllureConfig.applyRecommended()
3636
UltronAllureConfig.setAllureResultsDirectory(Environment.DIRECTORY_DOWNLOADS)
3737
}
3838
}

ultron-android/src/main/kotlin/com/atiurin/ultron/core/config/UltronConfig.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ object UltronConfig {
7373
private fun modify() {
7474
Espresso.ACTION_TIMEOUT = params.operationTimeoutMs
7575
Espresso.ASSERTION_TIMEOUT = params.operationTimeoutMs
76+
UiAutomator.OPERATION_TIMEOUT = params.operationTimeoutMs
7677
UltronCommonConfig.addListener(LogLifecycleListener())
7778
if (params.logToFile) {
7879
UltronLog.addLogger(UltronLog.fileLogger)

ultron-compose/src/commonMain/kotlin/com/atiurin/ultron/core/compose/config/UltronComposeConfig.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,21 @@ object UltronComposeConfig {
7979

8080
fun applyRecommended() {
8181
params = UltronComposeConfigParams()
82+
modify()
8283
}
8384

8485
fun apply(block: UltronComposeConfigParams.() -> Unit) {
8586
params.block()
87+
modify()
88+
}
89+
90+
private fun modify(){
91+
UltronCommonConfig.addListener(LogLifecycleListener())
92+
if (UltronCommonConfig.logToFile) {
93+
UltronLog.addLogger(UltronLog.fileLogger)
94+
} else {
95+
UltronLog.removeLogger(UltronLog.fileLogger.id)
96+
}
8697
UltronLog.info("UltronComposeConfig applied with params $params}")
8798
}
8899
}

0 commit comments

Comments
 (0)