diff options
| author | Ilya Kirillov <ilya.kirillov@jetbrains.com> | 2020-10-15 21:33:55 +0300 |
|---|---|---|
| committer | kotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com> | 2020-10-19 11:29:01 +0000 |
| commit | 59f1883348b92bd3f963a6539041159714b98bbc (patch) | |
| tree | 26cd0a4c12b02bfd9aadcaffa8171f5390df060e /project-wizard | |
| parent | d28275d4e6a43b67eafe22cb0b5e2dc681ab1e98 (diff) | |
| download | intellij-kotlin-59f1883348b92bd3f963a6539041159714b98bbc.tar.gz | |
Wizard: do not run compose tests for Groovy dsl
Original commit: 394245ba4c5e7a12e580f8f517a22c21a86c7e14
GitOrigin-RevId: aa58b1e5a26181dde6ea643234650eb7ad2297ae
Diffstat (limited to 'project-wizard')
4 files changed, 5 insertions, 2 deletions
diff --git a/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectImportingTestParameters.kt b/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectImportingTestParameters.kt index d74f54290229..94ec880eb356 100644 --- a/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectImportingTestParameters.kt +++ b/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectImportingTestParameters.kt @@ -7,11 +7,11 @@ package org.jetbrains.kotlin.tools.projectWizard.cli import java.nio.file.Path -data class DefaultTestParameters(val runForMaven: Boolean = false) : TestParameters { +data class DefaultTestParameters(val runForMaven: Boolean = false, val runForGradleGroovy: Boolean = true) : TestParameters { companion object { fun fromTestDataOrDefault(directory: Path): DefaultTestParameters = TestParameters.fromTestDataOrDefault(directory, PARAMETERS_FILE_NAME) - private const val PARAMETERS_FILE_NAME = "parameters.txt" + private const val PARAMETERS_FILE_NAME = "importParameters.txt" } }
\ No newline at end of file diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/importParameters.txt b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/importParameters.txt new file mode 100644 index 000000000000..f98b8dca2f3c --- /dev/null +++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/importParameters.txt @@ -0,0 +1 @@ +// runForGradleGroovy false
\ No newline at end of file diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/importParameters.txt b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/importParameters.txt new file mode 100644 index 000000000000..f98b8dca2f3c --- /dev/null +++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/importParameters.txt @@ -0,0 +1 @@ +// runForGradleGroovy false
\ No newline at end of file diff --git a/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt b/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt index dad71239efb6..eb4cbf4e780c 100644 --- a/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt +++ b/project-wizard/idea/test/org/jetbrains/kotlin/tools/projectWizard/wizard/AbstractNewWizardProjectImportTest.kt @@ -88,6 +88,7 @@ abstract class AbstractNewWizardProjectImportTest : PlatformTestCase() { val parameters = DefaultTestParameters.fromTestDataOrDefault(directory) if (!parameters.runForMaven && buildSystem == BuildSystem.MAVEN) return + if (!parameters.runForGradleGroovy && buildSystem == BuildSystem.GRADLE_GROOVY_DSL) return val tempDirectory = Files.createTempDirectory(null) if (buildSystem.isGradle) { |