MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gui-test] Simplified test configuration: isConfiguredManually removed, if kotlin.artifact.version not specified kotlin.plugin.version.main is used

Browse Source
This commit is contained in:
Viktoria.Shirunova
2018-04-18 14:33:41 +03:00
parent c1074bef42
commit 7c5ded616d
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/KotlinTestProperties.kt
+1 -8
View File
@@ -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
*/
community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt
+6 -5
View File
@@ -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 {