From 2b1102df5a889a6a95a05fbe204d9044befc4ced Mon Sep 17 00:00:00 2001 From: Viktoria Shirunova Date: Thu, 21 Mar 2019 16:43:13 +0300 Subject: [PATCH] [gui-test] Create kotlin projects from different groups: process new template names --- .../kotlin/model/CommonKotlinConstants.kt | 12 ++++++------ .../util/scenarios/NewProjectDialogModel.kt | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/CommonKotlinConstants.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/CommonKotlinConstants.kt index 5d2b9bc21833..41a71f0b7445 100644 --- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/CommonKotlinConstants.kt +++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/CommonKotlinConstants.kt @@ -70,14 +70,14 @@ val kotlinProjects = mapOf( ), Projects.KotlinProjectJvm to ProjectProperties( group = NewProjectDialogModel.Groups.Kotlin, - frameworkName = NewProjectDialogModel.Constants.itemKotlinJvm, + frameworkName = NewProjectDialogModel.Constants.itemGradleKotlinJvm, libName = "KotlinJavaRuntime", jars = kotlinJvmJavaKotlinJars, buildSystem = BuildSystem.IDEA ), Projects.KotlinProjectJs to ProjectProperties( group = NewProjectDialogModel.Groups.Kotlin, - frameworkName = NewProjectDialogModel.Constants.itemKotlinJs, + frameworkName = NewProjectDialogModel.Constants.itemGradleKotlinJs, libName = "KotlinJavaScript", jars = kotlinJsJavaKotlinLibs, buildSystem = BuildSystem.IDEA @@ -120,14 +120,14 @@ val kotlinProjects = mapOf( ), Projects.GradleGProjectJvm to ProjectProperties( group = NewProjectDialogModel.Groups.Gradle, - frameworkName = NewProjectDialogModel.Constants.itemGradleKotlinJvm, + frameworkName = NewProjectDialogModel.Constants.itemKotlinJvm, modules = setOf(TargetPlatform.JVM18), jars = kotlinJvmGradleLibs, buildSystem = BuildSystem.Gradle ), Projects.GradleGProjectJs to ProjectProperties( group = NewProjectDialogModel.Groups.Gradle, - frameworkName = NewProjectDialogModel.Constants.itemGradleKotlinJs, + frameworkName = NewProjectDialogModel.Constants.itemKotlinJs, modules = setOf(TargetPlatform.JavaScript), // TODO: change back to kotlinJsGradleLibs after KT-21166 fixing jars = kotlinJsGradleKLibs, @@ -135,7 +135,7 @@ val kotlinProjects = mapOf( ), Projects.GradleKProjectJvm to ProjectProperties( group = NewProjectDialogModel.Groups.Gradle, - frameworkName = NewProjectDialogModel.Constants.itemGradleKotlinJvm, + frameworkName = NewProjectDialogModel.Constants.itemKotlinJvm, isKotlinDsl = true, modules = setOf(TargetPlatform.JVM18), jars = kotlinJvmGradleLibs, @@ -143,7 +143,7 @@ val kotlinProjects = mapOf( ), Projects.GradleKProjectJs to ProjectProperties( group = NewProjectDialogModel.Groups.Gradle, - frameworkName = NewProjectDialogModel.Constants.itemGradleKotlinJs, + frameworkName = NewProjectDialogModel.Constants.itemKotlinJs, isKotlinDsl = true, modules = setOf(TargetPlatform.JavaScript), jars = kotlinJsGradleKLibs, diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt index c2079898bc49..8880da4848e7 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt @@ -107,15 +107,15 @@ class NewProjectDialogModel(val testCase: GuiTestCase) : TestUtilsClass(testCase const val libWebApplication = "Web Application" const val itemKotlinMppDeprecated = "Kotlin (Multiplatform - Deprecated)" const val itemKotlinMppExperimental = "Kotlin (Multiplatform - Experimental)" - const val itemKotlinMppLibrary = "Kotlin (Multiplatform Library)" - const val itemKotlinMppClientServer = "Kotlin (JS Client/JVM Server)" - const val itemKotlinMppMobileAndroidIos = "Kotlin (Mobile Android/iOS)" - const val itemKotlinMppMobileSharedLibrary = "Kotlin (Mobile Shared Library)" + const val itemKotlinMppLibrary = "Multiplatform Library | Gradle" + const val itemKotlinMppClientServer = "JS Client and JVM Server | Gradle" + const val itemKotlinMppMobileAndroidIos = "Mobile Android/iOS | Gradle" + const val itemKotlinMppMobileSharedLibrary = "Mobile Shared Library | Gradle" const val itemKotlinJvm = "Kotlin/JVM" const val itemKotlinJs = "Kotlin/JS" - const val itemKotlinNative = "Kotlin/Native" - const val itemGradleKotlinJvm = "Kotlin (Java)" - const val itemGradleKotlinJs = "Kotlin (JavaScript)" + const val itemKotlinNative = "Native | Gradle" + const val itemGradleKotlinJvm = "JVM | IDEA" + const val itemGradleKotlinJs = "JS | IDEA" } enum class Groups(private val title: String) {