From af367b01ec69980b2368f46940f55ae2667dc618 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 21 Jul 2020 14:59:09 +0300 Subject: [PATCH] [Gradle, JS] Add test on node js single platform project ^KT-40527 fixed --- ...mlNewWizardProjectImportTestGenerated.java | 7 +++++- .../expected/build.gradle | 22 +++++++++++++++++++ .../expected/build.gradle.kts | 22 +++++++++++++++++++ .../expected/settings.gradle | 11 ++++++++++ .../expected/settings.gradle.kts | 11 ++++++++++ .../singlePlatformJsNode/settings.yaml | 5 +++++ .../YamlBuildFileGenerationTestGenerated.java | 7 +++++- .../moduleConfigurators/ModuleConfigurator.kt | 1 + .../settings/buildsystem/Module.kt | 3 ++- 9 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts create mode 100644 libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/settings.yaml diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/YamlNewWizardProjectImportTestGenerated.java b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/YamlNewWizardProjectImportTestGenerated.java index bd82c965df4..f31d344a45d 100644 --- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/YamlNewWizardProjectImportTestGenerated.java +++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/YamlNewWizardProjectImportTestGenerated.java @@ -217,8 +217,13 @@ public class YamlNewWizardProjectImportTestGenerated extends AbstractYamlNewWiza } @TestMetadata("singlePlatformJsBrowser") - public void testSingleplatformJs() throws Exception { + public void testSingleplatformJsBrowser() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/"); } + + @TestMetadata("singlePlatformJsNode") + public void testSingleplatformJsNode() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/"); + } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle new file mode 100644 index 00000000000..063a5da7d3a --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle @@ -0,0 +1,22 @@ +plugins { + id 'org.jetbrains.kotlin.js' version 'KOTLIN_VERSION' +} +group = 'testGroupId' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } +} +dependencies { + testImplementation 'org.jetbrains.kotlin:kotlin-test-js' +} +kotlin { + js { + nodejs { + binaries.executable() + } + } +} \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts new file mode 100644 index 00000000000..e93518a01ec --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + kotlin("js") version "KOTLIN_VERSION" +} +group = "testGroupId" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } +} +dependencies { + testImplementation(kotlin("test-js")) +} +kotlin { + js { + nodejs { + binaries.executable() + } + } +} \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle new file mode 100644 index 00000000000..4ad35a8a45d --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven { + url 'https://dl.bintray.com/kotlin/kotlin-dev' + } + } + +} +rootProject.name = 'generatedProject' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts new file mode 100644 index 00000000000..17195bc567e --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/expected/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven { + url = uri("https://dl.bintray.com/kotlin/kotlin-dev") + } + } + +} +rootProject.name = "generatedProject" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/settings.yaml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/settings.yaml new file mode 100644 index 00000000000..cd9b6710e7b --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/settings.yaml @@ -0,0 +1,5 @@ +kotlin: + projectKind: js + modules: + - type: jsNodeSinglePlatform + name: a \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/YamlBuildFileGenerationTestGenerated.java b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/YamlBuildFileGenerationTestGenerated.java index 5698e0334e8..21f59961901 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/YamlBuildFileGenerationTestGenerated.java +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/YamlBuildFileGenerationTestGenerated.java @@ -79,7 +79,12 @@ public class YamlBuildFileGenerationTestGenerated extends AbstractYamlBuildFileG } @TestMetadata("singlePlatformJsBrowser") - public void testSingleplatformJs() throws Exception { + public void testSingleplatformJsBrowser() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsBrowser/"); } + + @TestMetadata("singlePlatformJsNode") + public void testSingleplatformJsNode() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/singlePlatformJsNode/"); + } } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt index ded3e6535d3..53b568d9d7d 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfigurator.kt @@ -264,6 +264,7 @@ interface ModuleConfigurator : DisplayableSettingItem, EntitiesOwnerDescriptor { +AndroidSinglePlatformModuleConfigurator +IOSSinglePlatformModuleConfigurator +BrowserJsSinglePlatformModuleConfigurator + +NodeJsSinglePlatformModuleConfigurator } init { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt index bfb1090d614..b2de8d904b6 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt @@ -67,7 +67,8 @@ class Module( configurator == MppModuleConfigurator -> KotlinNewProjectWizardBundle.message("module.kind.mpp.module") configurator == AndroidSinglePlatformModuleConfigurator -> KotlinNewProjectWizardBundle.message("module.kind.android.module") configurator == IOSSinglePlatformModuleConfigurator -> KotlinNewProjectWizardBundle.message("module.kind.ios.module") - configurator == BrowserJsSinglePlatformModuleConfigurator -> KotlinNewProjectWizardBundle.message("module.kind.js.module") + configurator == BrowserJsSinglePlatformModuleConfigurator || + configurator == NodeJsSinglePlatformModuleConfigurator -> KotlinNewProjectWizardBundle.message("module.kind.js.module") else -> KotlinNewProjectWizardBundle.message("module.kind.module") }