From 3a6011fae9b8e8ec25e1a5199da831ccfe9d783a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 8 Sep 2020 16:59:43 +0300 Subject: [PATCH] Wizard: always generate android MPP tests #KT-40940 fixed --- .../moduleConfigurators/MppModuleConfigurator.kt | 4 +--- .../settings/buildsystem/ModuleDependency.kt | 14 +++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/MppModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/MppModuleConfigurator.kt index 18fd45aca12..6e649b35cc1 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/MppModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/MppModuleConfigurator.kt @@ -54,13 +54,11 @@ object MppModuleConfigurator : ModuleConfigurator, override fun getConfiguratorProperties(): List> = listOf(mppSources) + // TODO remove when be removed in KMM wizard val generateTests by booleanSetting("Generate Tests", GenerationPhase.PROJECT_GENERATION) { defaultValue = value(false) } - override fun getConfiguratorSettings(): List> = - super.getConfiguratorSettings() + generateTests - override fun Writer.runArbitraryTask( configurationData: ModulesToIrConversionData, module: Module, diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt index 4e80ed37b0f..4d49399ea95 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt @@ -222,16 +222,12 @@ private fun Writer.addExpectFilesForMppModuleForAndroidAndIos(mppModule: Module, file(FileTemplateDescriptor("mppCommon/Greeting.kt.vm", relativePath = null), "Greeting.kt", SourcesetType.main) } - inContextOfModuleConfigurator(mppModule) { - if (MppModuleConfigurator.generateTests.reference.settingValue) { - filesFor(ModuleSubType.android) { - file(FileTemplateDescriptor("android/androidTest.kt.vm", relativePath = null), "androidTest.kt", SourcesetType.test) - } + filesFor(ModuleSubType.android) { + file(FileTemplateDescriptor("android/androidTest.kt.vm", relativePath = null), "androidTest.kt", SourcesetType.test) + } - filesFor(ModuleSubType.iosArm64, ModuleSubType.iosX64, ModuleSubType.ios) { - file(FileTemplateDescriptor("ios/iosTest.kt.vm", relativePath = null), "iosTest.kt", SourcesetType.test) - } - } + filesFor(ModuleSubType.iosArm64, ModuleSubType.iosX64, ModuleSubType.ios) { + file(FileTemplateDescriptor("ios/iosTest.kt.vm", relativePath = null), "iosTest.kt", SourcesetType.test) } }