azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: fix 192 tests

Browse Source
This commit is contained in:
Ilya Kirillov
2020-03-25 02:50:20 +03:00
parent f767fd50e8
commit 927ccf2ab1
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt
+16 -9
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard package org.jetbrains.kotlin.tools.projectWizard.wizard
import com.intellij.openapi.application.impl.ApplicationInfoImpl
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.projectRoots.ProjectJdkTable
import com.intellij.openapi.projectRoots.SimpleJavaSdkType import com.intellij.openapi.projectRoots.SimpleJavaSdkType
@@ -79,23 +80,29 @@ abstract class AbstractNewWizardProjectImportTest : PlatformTestCase() {
} }
private fun prepareGradleBuildSystem(directory: Path) { private fun prepareGradleBuildSystem(directory: Path) {
project.getService(GradleSettings::class.java)?.apply { com.intellij.openapi.components.ServiceManager.getService(project, GradleSettings::class.java)?.apply {
gradleVmOptions = GradleEnvironment.Headless.GRADLE_VM_OPTIONS ?: gradleVmOptions
isOfflineWork = GradleEnvironment.Headless.GRADLE_OFFLINE?.toBoolean() ?: isOfflineWork isOfflineWork = GradleEnvironment.Headless.GRADLE_OFFLINE?.toBoolean() ?: isOfflineWork
serviceDirectoryPath = GradleEnvironment.Headless.GRADLE_SERVICE_DIRECTORY ?: serviceDirectoryPath serviceDirectoryPath = GradleEnvironment.Headless.GRADLE_SERVICE_DIRECTORY ?: serviceDirectoryPath
storeProjectFilesExternally = true storeProjectFilesExternally = true
} }
val settings = GradleProjectSettings().apply { // not needed on <= 192 (and causes error on <= 192 ):
externalProjectPath = directory.toString() if (!is192orLess()) {
isUseAutoImport = false val settings = GradleProjectSettings().apply {
isUseQualifiedModuleNames = true externalProjectPath = directory.toString()
gradleJvm = SDK_NAME isUseAutoImport = false
distributionType = DistributionType.WRAPPED isUseQualifiedModuleNames = true
gradleJvm = SDK_NAME
distributionType = DistributionType.WRAPPED
}
ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID).linkProject(settings)
} }
ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID).linkProject(settings)
} }
private fun is192orLess() =
ApplicationInfoImpl.getShadowInstance().minorVersionMainPart.toIntOrNull()?.let { it <= 2 } == true
&& ApplicationInfoImpl.getShadowInstance().majorVersion == "2019"
companion object { companion object {
private const val SDK_NAME = "defaultSdk" private const val SDK_NAME = "defaultSdk"