From 62be688eb759e76c5888996260a0ed242d4c5fa5 Mon Sep 17 00:00:00 2001
From: Kirill Shmakov <kirill.shmakov@jetbrains.com>
Date: Thu, 20 Aug 2020 14:48:50 +0300
Subject: [PATCH] Wizard: add missing test dependency

---
 .../moduleConfigurators/AndroidModuleConfigurator.kt       | 7 ++++++-
 .../moduleConfigurators/ModuleConfiguratorWithTests.kt     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt
index 4e6a5dc2699..23db8612a21 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt
@@ -139,6 +139,7 @@ object AndroidTargetConfigurator : TargetConfigurator,
     SimpleTargetConfigurator,
     AndroidModuleConfigurator,
     SingleCoexistenceTargetConfigurator,
+    ModuleConfiguratorWithTests,
     ModuleConfiguratorSettings() {
     override val moduleSubType = ModuleSubType.android
     override val moduleType = ModuleType.android
@@ -152,7 +153,8 @@ object AndroidTargetConfigurator : TargetConfigurator,
         inContextOfModuleConfigurator(module) { androidPlugin.reference.settingValue }
 
     override fun getConfiguratorSettings() = buildList<ModuleConfiguratorSetting<*, *>> {
-        +super.getConfiguratorSettings()
+        +super<AndroidModuleConfigurator>.getConfiguratorSettings()
+        +super<ModuleConfiguratorWithTests>.getConfiguratorSettings()
         +androidPlugin
     }
 
@@ -181,8 +183,11 @@ object AndroidTargetConfigurator : TargetConfigurator,
         )
     }
 
+    override fun defaultTestFramework(): KotlinTestFramework = KotlinTestFramework.JUNIT4
+
     override fun createModuleIRs(reader: Reader, configurationData: ModulesToIrConversionData, module: Module): List<BuildSystemIR> =
         buildList {
+            +super<ModuleConfiguratorWithTests>.createModuleIRs(reader, configurationData, module)
             +super<AndroidModuleConfigurator>.createModuleIRs(reader, configurationData, module)
             +ArtifactBasedLibraryDependencyIR(
                 MavenArtifact(DefaultRepository.MAVEN_CENTRAL, "junit", "junit"),
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfiguratorWithTests.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfiguratorWithTests.kt
index e08b188cdd0..1d3401fd868 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfiguratorWithTests.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfiguratorWithTests.kt
@@ -86,7 +86,7 @@ enum class KotlinTestFramework(
     ),
     JUNIT4(
         KotlinNewProjectWizardBundle.message("module.configurator.tests.setting.framework.junit4"),
-        listOf(ModuleType.jvm),
+        listOf(ModuleType.jvm, ModuleType.android),
         listOf("test-junit")
     ),
     JUNIT5(