diff --git a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java index fc3153edb60..869cf7d41fc 100644 --- a/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java +++ b/idea/idea-new-project-wizard/tests/org/jetbrains/kotlin/tools/projectWizard/wizard/ProjectTemplateNewWizardProjectImportTestGenerated.java @@ -30,34 +30,29 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("emptyMultiplatform") - public void testEmptyMultiplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); + @TestMetadata("backendApplication") + public void testBackendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/"); } - @TestMetadata("emptySingleplatform") - public void testEmptySingleplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/"); + @TestMetadata("consoleApplication") + public void testConsoleApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/"); } - @TestMetadata("jsBrowserApplication") - public void testJsBrowserApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/"); + @TestMetadata("frontendApplication") + public void testFrontendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/"); } - @TestMetadata("jvmConsoleApplication") - public void testJvmConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/"); + @TestMetadata("fullStackWebApplication") + public void testFullStackWebApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/"); } - @TestMetadata("jvmServerJsClient") - public void testJvmServerJsClient() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); - } - - @TestMetadata("mppMobileApplication") - public void testMppMobileApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + @TestMetadata("multiplatformApplication") + public void testMultiplatformApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/"); } @TestMetadata("multiplatformLibrary") @@ -65,14 +60,19 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); } + @TestMetadata("multiplatformMobileApplication") + public void testMultiplatformMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/"); + } + @TestMetadata("multiplatformMobileLibrary") public void testMultiplatformMobileLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/"); } - @TestMetadata("nativeConsoleApplication") - public void testNativeConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/"); + @TestMetadata("nativeApplication") + public void testNativeApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/"); } } @@ -88,34 +88,29 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("emptyMultiplatform") - public void testEmptyMultiplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); + @TestMetadata("backendApplication") + public void testBackendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/"); } - @TestMetadata("emptySingleplatform") - public void testEmptySingleplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/"); + @TestMetadata("consoleApplication") + public void testConsoleApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/"); } - @TestMetadata("jsBrowserApplication") - public void testJsBrowserApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/"); + @TestMetadata("frontendApplication") + public void testFrontendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/"); } - @TestMetadata("jvmConsoleApplication") - public void testJvmConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/"); + @TestMetadata("fullStackWebApplication") + public void testFullStackWebApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/"); } - @TestMetadata("jvmServerJsClient") - public void testJvmServerJsClient() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); - } - - @TestMetadata("mppMobileApplication") - public void testMppMobileApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + @TestMetadata("multiplatformApplication") + public void testMultiplatformApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/"); } @TestMetadata("multiplatformLibrary") @@ -123,14 +118,19 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); } + @TestMetadata("multiplatformMobileApplication") + public void testMultiplatformMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/"); + } + @TestMetadata("multiplatformMobileLibrary") public void testMultiplatformMobileLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/"); } - @TestMetadata("nativeConsoleApplication") - public void testNativeConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/"); + @TestMetadata("nativeApplication") + public void testNativeApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/"); } } @@ -146,34 +146,29 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("emptyMultiplatform") - public void testEmptyMultiplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); + @TestMetadata("backendApplication") + public void testBackendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/"); } - @TestMetadata("emptySingleplatform") - public void testEmptySingleplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/"); + @TestMetadata("consoleApplication") + public void testConsoleApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/"); } - @TestMetadata("jsBrowserApplication") - public void testJsBrowserApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/"); + @TestMetadata("frontendApplication") + public void testFrontendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/"); } - @TestMetadata("jvmConsoleApplication") - public void testJvmConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/"); + @TestMetadata("fullStackWebApplication") + public void testFullStackWebApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/"); } - @TestMetadata("jvmServerJsClient") - public void testJvmServerJsClient() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); - } - - @TestMetadata("mppMobileApplication") - public void testMppMobileApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + @TestMetadata("multiplatformApplication") + public void testMultiplatformApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/"); } @TestMetadata("multiplatformLibrary") @@ -181,14 +176,19 @@ public class ProjectTemplateNewWizardProjectImportTestGenerated extends Abstract runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); } + @TestMetadata("multiplatformMobileApplication") + public void testMultiplatformMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/"); + } + @TestMetadata("multiplatformMobileLibrary") public void testMultiplatformMobileLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/"); } - @TestMetadata("nativeConsoleApplication") - public void testNativeConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/"); + @TestMetadata("nativeApplication") + public void testNativeApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/"); } } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/importParameters.txt b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/importParameters.txt similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/importParameters.txt rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/importParameters.txt diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/pom.xml rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/pom.xml diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle new file mode 100644 index 00000000000..96aa3bf410d --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'BackendApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts new file mode 100644 index 00000000000..917496846d5 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "BackendApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/importParameters.txt b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/importParameters.txt similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/importParameters.txt rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/importParameters.txt diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/pom.xml rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle new file mode 100644 index 00000000000..cd1904a2a86 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'ConsoleApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts new file mode 100644 index 00000000000..30416383d23 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "ConsoleApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/settings.gradle deleted file mode 100644 index 2d4e59d339b..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'EmptyMultiplatform' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/settings.gradle.kts deleted file mode 100644 index 20ce23febd5..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "EmptyMultiplatform" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/settings.gradle deleted file mode 100644 index 6e79e40028b..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'EmptySingleplatform' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/settings.gradle.kts deleted file mode 100644 index f46e6fc3ad1..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "EmptySingleplatform" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle new file mode 100644 index 00000000000..ceaddd4efbc --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'FrontendApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts new file mode 100644 index 00000000000..bb6dfe60569 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "FrontendApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle new file mode 100644 index 00000000000..0aefdcede68 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'FullStackWebApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts new file mode 100644 index 00000000000..a54f67a8bea --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "FullStackWebApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/settings.gradle deleted file mode 100644 index 912569f7902..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'JsBrowserApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/settings.gradle.kts deleted file mode 100644 index 1f1137503ab..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "JsBrowserApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/settings.gradle deleted file mode 100644 index cb28affaeee..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'JvmConsoleApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/settings.gradle.kts deleted file mode 100644 index f48e2d46cbd..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "JvmConsoleApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/settings.gradle deleted file mode 100644 index c20ce09cb88..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'JvmServerJsClient' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/settings.gradle.kts deleted file mode 100644 index ddf297a3294..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "JvmServerJsClient" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle new file mode 100644 index 00000000000..42b0fa88e9c --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'MultiplatformApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts new file mode 100644 index 00000000000..4dc9d554d96 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "MultiplatformApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/androidApp/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle similarity index 84% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle index 96e604b340a..5d9aff1fa79 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle @@ -13,9 +13,8 @@ pluginManagement { } } } -rootProject.name = 'MPPMobileApplication' +rootProject.name = 'MultiplatformMobileApplication' include(':shared') -include(':androidApp') - +include(':androidApp') \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts similarity index 84% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts index 0bb95ab4330..e97cad0b27e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts @@ -13,9 +13,8 @@ pluginManagement { } } } -rootProject.name = "MPPMobileApplication" +rootProject.name = "MultiplatformMobileApplication" include(":shared") -include(":androidApp") - +include(":androidApp") \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/expected/shared/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/settings.yaml b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/settings.yaml similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/settings.yaml rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/settings.yaml diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts similarity index 100% rename from libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/build.gradle.kts rename to libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/build.gradle.kts diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle new file mode 100644 index 00000000000..a272e232532 --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'NativeApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts new file mode 100644 index 00000000000..896c89ad3ba --- /dev/null +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "NativeApplication" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/settings.gradle deleted file mode 100644 index 0bb5b3b94b2..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'NativeConsoleApplication' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/settings.gradle.kts deleted file mode 100644 index 8399b10ce57..00000000000 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "NativeConsoleApplication" \ 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/ProjectTemplateBuildFileGenerationTestGenerated.java b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java index 1633755533b..a5239d8e659 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/ProjectTemplateBuildFileGenerationTestGenerated.java @@ -28,34 +28,29 @@ public class ProjectTemplateBuildFileGenerationTestGenerated extends AbstractPro KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration"), Pattern.compile("^([^\\.]+)$"), null, false); } - @TestMetadata("emptyMultiplatform") - public void testEmptyMultiplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptyMultiplatform/"); + @TestMetadata("backendApplication") + public void testBackendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/backendApplication/"); } - @TestMetadata("emptySingleplatform") - public void testEmptySingleplatform() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/emptySingleplatform/"); + @TestMetadata("consoleApplication") + public void testConsoleApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/"); } - @TestMetadata("jsBrowserApplication") - public void testJsBrowserApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jsBrowserApplication/"); + @TestMetadata("frontendApplication") + public void testFrontendApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/"); } - @TestMetadata("jvmConsoleApplication") - public void testJvmConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmConsoleApplication/"); + @TestMetadata("fullStackWebApplication") + public void testFullStackWebApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/"); } - @TestMetadata("jvmServerJsClient") - public void testJvmServerJsClient() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/jvmServerJsClient/"); - } - - @TestMetadata("mppMobileApplication") - public void testMppMobileApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/mppMobileApplication/"); + @TestMetadata("multiplatformApplication") + public void testMultiplatformApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformApplication/"); } @TestMetadata("multiplatformLibrary") @@ -63,13 +58,18 @@ public class ProjectTemplateBuildFileGenerationTestGenerated extends AbstractPro runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformLibrary/"); } + @TestMetadata("multiplatformMobileApplication") + public void testMultiplatformMobileApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/"); + } + @TestMetadata("multiplatformMobileLibrary") public void testMultiplatformMobileLibrary() throws Exception { runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/"); } - @TestMetadata("nativeConsoleApplication") - public void testNativeConsoleApplication() throws Exception { - runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeConsoleApplication/"); + @TestMetadata("nativeApplication") + public void testNativeApplication() throws Exception { + runTest("libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/nativeApplication/"); } } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt index b63173c3a3b..6bd0215086f 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/projectTemplates/ProjectTemplate.kt @@ -65,15 +65,15 @@ sealed class ProjectTemplate : DisplayableSettingItem { companion object { val ALL = listOf( - EmptySingleplatformProjectTemplate, - JvmConsoleApplication, - MPPMobileApplication, - MultiplatformMobileLibrary, - EmptyMultiplatformProjectTemplate, - MultiplatformLibrary, - NativeConsoleApplication, - JsBrowserApplication, - JvmServerJsClient + BackendApplicationProjectTemplate, + ConsoleApplicationProjectTemplate, + MultiplatformMobileApplicationProjectTemplate, + MultiplatformMobileLibraryProjectTemplate, + MultiplatformApplicationProjectTemplate, + MultiplatformLibraryProjectTemplate, + NativeApplicationProjectTemplate, + FrontendApplicationProjectTemplate, + FullStackWebApplicationProjectTemplate ) fun byId(id: String): ProjectTemplate? = ALL.firstOrNull { @@ -134,7 +134,7 @@ private fun ModuleType.createDefaultTarget( name: String = this.name ) = MultiplatformTargetModule(name, defaultTarget, createDefaultSourcesets()) -object EmptySingleplatformProjectTemplate : ProjectTemplate() { +object BackendApplicationProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.empty.singleplatform.title") override val description = KotlinNewProjectWizardBundle.message("project.template.empty.singleplatform.description") @@ -150,7 +150,7 @@ object EmptySingleplatformProjectTemplate : ProjectTemplate() { ) } -object EmptyMultiplatformProjectTemplate : ProjectTemplate() { +object MultiplatformApplicationProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.empty.mpp.title") override val description = KotlinNewProjectWizardBundle.message("project.template.empty.mpp.description") @@ -166,7 +166,7 @@ object EmptyMultiplatformProjectTemplate : ProjectTemplate() { ) } -object JvmConsoleApplication : ProjectTemplate() { +object ConsoleApplicationProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.empty.jvm.console.title") override val description = KotlinNewProjectWizardBundle.message("project.template.empty.jvm.console.description") @@ -187,7 +187,7 @@ object JvmConsoleApplication : ProjectTemplate() { ) } -object MultiplatformLibrary : ProjectTemplate() { +object MultiplatformLibraryProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.lib.title") override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.lib.description") @@ -211,7 +211,7 @@ object MultiplatformLibrary : ProjectTemplate() { ) } -object JvmServerJsClient : ProjectTemplate() { +object FullStackWebApplicationProjectTemplate : ProjectTemplate() { override val title: String = KotlinNewProjectWizardBundle.message("project.template.full.stack.title") override val description: String = KotlinNewProjectWizardBundle.message("project.template.full.stack.description") @@ -237,7 +237,7 @@ object JvmServerJsClient : ProjectTemplate() { ) } -object NativeConsoleApplication : ProjectTemplate() { +object NativeApplicationProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.native.console.title") override val description = KotlinNewProjectWizardBundle.message("project.template.native.console.description") @@ -263,7 +263,7 @@ object NativeConsoleApplication : ProjectTemplate() { ) } -object JsBrowserApplication : ProjectTemplate() { +object FrontendApplicationProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.frontend.title") override val description = KotlinNewProjectWizardBundle.message("project.template.frontend.description") @@ -287,7 +287,7 @@ object JsBrowserApplication : ProjectTemplate() { ) } -object MPPMobileApplication : ProjectTemplate() { +object MultiplatformMobileApplicationProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.title") override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.description") @@ -338,7 +338,7 @@ object MPPMobileApplication : ProjectTemplate() { } } -object MultiplatformMobileLibrary : ProjectTemplate() { +object MultiplatformMobileLibraryProjectTemplate : ProjectTemplate() { override val title = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.lib.title") override val description = KotlinNewProjectWizardBundle.message("project.template.mpp.mobile.lib.description")