Detect Abstract project config after applying config from system prop…

…erties (#3204) (#3208) Co-authored-by: Prat T <pt2121@users.noreply.github.com> Co-authored-by: Sam <sam@sksamuel.com>
kotest · Sep 26, 2022 · ff48295 · ff48295
1 parent b256370
commit ff48295
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...work/kotest-framework-engine/src/commonMain/kotlin/io/kotest/engine/TestEngineLauncher.kt b/...work/kotest-framework-engine/src/commonMain/kotlin/io/kotest/engine/TestEngineLauncher.kt
@@ -167,9 +167,8 @@ class TestEngineLauncher(
          ),
          interceptors = testEngineInterceptors(),
          configuration = ConfigManager.initialize(
-            projectConfiguration,
-            configs + detectAbstractProjectConfigs() + listOfNotNull(loadProjectConfigFromClassname())
-         ),
+            projectConfiguration
+         ) { configs + detectAbstractProjectConfigs() + listOfNotNull(loadProjectConfigFromClassname()) },
          tagExpression,
       )
    }

diff --git a/...rk/kotest-framework-engine/src/commonMain/kotlin/io/kotest/engine/config/ConfigManager.kt b/...rk/kotest-framework-engine/src/commonMain/kotlin/io/kotest/engine/config/ConfigManager.kt
@@ -15,17 +15,17 @@ object ConfigManager {
     *
     * @return the initialized input
     */
-   fun initialize(configuration: ProjectConfiguration, projectConfigs: List<AbstractProjectConfig>): ProjectConfiguration {
+   fun initialize(configuration: ProjectConfiguration, projectConfigs: () -> List<AbstractProjectConfig>): ProjectConfiguration {
       compile(configuration, projectConfigs).getOrThrow()
       return configuration
    }
 
-   fun compile(configuration: ProjectConfiguration, projectConfigs: List<AbstractProjectConfig>) = runCatching {
+   fun compile(configuration: ProjectConfiguration, projectConfigs: () -> List<AbstractProjectConfig>) = runCatching {
       log { "ConfigManager: compiling config projectConfigs=$projectConfigs" }
       applyPlatformDefaults(configuration)
       applyConfigFromSystemProperties(configuration)
       applyConfigFromAutoScan(configuration)
-      projectConfigs.forEach { applyConfigFromProjectConfig(it, configuration) }
+      projectConfigs().forEach { applyConfigFromProjectConfig(it, configuration) }
    }.mapError { ConfigurationException(it) }
 }
 

diff --git a/...otlin/com/sksamuel/kotest/engine/properties/InvalidDuplicateNameModeSystemPropertyTest.kt b/...otlin/com/sksamuel/kotest/engine/properties/InvalidDuplicateNameModeSystemPropertyTest.kt
@@ -11,7 +11,7 @@ class InvalidDuplicateNameModeSystemPropertyTest : FunSpec() {
    init {
       test("invalid duplicate name mode value should error") {
          withSystemProperty(KotestEngineProperties.duplicateTestNameMode, "qwerty") {
-            ConfigManager.compile(ProjectConfiguration(), emptyList()).shouldBeFailure()
+            ConfigManager.compile(ProjectConfiguration()) { emptyList() }.shouldBeFailure()
          }
       }
    }