From 7c5ded616dccf2871a0f7b2c828a25dae2f544a3 Mon Sep 17 00:00:00 2001
From: "Viktoria.Shirunova" <viktoria.shirunova@jetbrains.com>
Date: Tue, 17 Apr 2018 17:15:48 +0300
Subject: [PATCH] [gui-test] Simplified test configuration:
 isConfiguredManually removed, if kotlin.artifact.version not specified
 kotlin.plugin.version.main is used

---
 .../kotlin/model/KotlinTestProperties.kt              |  9 +--------
 .../projectWizard/kotlin/model/ProjectsWithKotlin.kt  | 11 ++++++-----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/KotlinTestProperties.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/KotlinTestProperties.kt
index ebc3b88b2871..fbfe1cf54789 100644
--- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/KotlinTestProperties.kt
+++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/KotlinTestProperties.kt
@@ -27,7 +27,7 @@ object KotlinTestProperties {
    * in the variable `kotlin_version`
    */
   private val art_version_from_env = getPropertyValue(
-    "kotlin.artifact.version")
+    "kotlin.artifact.version", kotlin_plugin_version_main)
   private var art_version_from_test: String? = null
   var kotlin_artifact_version: String
     set(value) {
@@ -48,13 +48,6 @@ object KotlinTestProperties {
     get() = getPropertyValue("kotlin.artifact.isPresentInConfigureDialog",
                                                                                               "true").toBoolean()
 
-  /**
-   * @return true - if artifact with version specified by kotlin_artifact_version is present in the `Configure Kotlin` dialog
-   */
-  val isArtifactConfiguredManually: Boolean
-    get() = getPropertyValue("kotlin.artifact.isConfiguredManually",
-                                                                                              "false").toBoolean()
-
   /**
    * @return true - if artifact with version specified by kotlin_artifact_version is uploaded to the bintray, so no additional repositories are required
    */
diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt
index f0c4b17c1833..b92fb16c1882 100644
--- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt
+++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt
@@ -698,23 +698,24 @@ fun KotlinGuiTestCase.editBuildGradle(kotlinVersion: String,
                                       vararg projectName: String) {
 //   if project is configured to old Kotlin version, it must be released and no changes are required in the build.gradle file
   if (!KotlinTestProperties.isActualKotlinUsed()) return
-  if (KotlinTestProperties.isArtifactConfiguredManually || KotlinTestProperties.isArtifactOnlyInDevRep || isKotlinDslUsed)
+  if (KotlinTestProperties.isArtifactOnlyInDevRep || isKotlinDslUsed || KotlinTestProperties.kotlin_plugin_version_main != KotlinTestProperties.kotlin_artifact_version)
     openBuildGradle(isKotlinDslUsed, *projectName)
   if (isKotlinDslUsed) changePluginsInBuildGradle(kotlinKind)
   if (KotlinTestProperties.isArtifactOnlyInDevRep) addDevRepositoryToBuildGradle(isKotlinDslUsed)
-  if (KotlinTestProperties.isArtifactConfiguredManually && KotlinTestProperties.kotlin_artifact_version != KotlinTestProperties.kotlin_plugin_version_main)
+  if (KotlinTestProperties.kotlin_plugin_version_main != KotlinTestProperties.kotlin_artifact_version)
     changeKotlinVersionInBuildGradle(isKotlinDslUsed, kotlinVersion)
 }
 
 fun KotlinGuiTestCase.editPomXml(kotlinVersion: String,
                                  kotlinKind: KotlinKind,
                                  vararg projectName: String) {
-//   if project is configured to old Kotlin version, it must be released and no changes are required in the build.gradle file
+//   if project is configured to old Kotlin version, it must be released and no changes are required in the pom.xml file
   if (!KotlinTestProperties.isActualKotlinUsed()) return
-  if (KotlinTestProperties.isArtifactConfiguredManually || KotlinTestProperties.isArtifactOnlyInDevRep)
+  if (KotlinTestProperties.isArtifactOnlyInDevRep || KotlinTestProperties.kotlin_plugin_version_main != KotlinTestProperties.kotlin_artifact_version)
     openPomXml(*projectName)
   if (KotlinTestProperties.isArtifactOnlyInDevRep) addDevRepositoryToPomXml()
-  if (KotlinTestProperties.isArtifactConfiguredManually) changeKotlinVersionInPomXml(kotlinVersion)
+  if (KotlinTestProperties.kotlin_plugin_version_main != KotlinTestProperties.kotlin_artifact_version)
+    changeKotlinVersionInPomXml(kotlinVersion)
 }
 
 fun getVersionFromString(versionString: String): LanguageVersion {