Wizard: rename project templates to their corresponding titles

This commit is contained in:
Ilya Kirillov
2020-04-03 19:37:30 +03:00
parent 588034e124
commit 445ca97486
52 changed files with 126 additions and 128 deletions
@@ -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/");
}
}
}
@@ -0,0 +1 @@
rootProject.name = 'FullStackWebApplication'
@@ -0,0 +1 @@
rootProject.name = 'MultiplatformApplication'
@@ -13,9 +13,8 @@ pluginManagement {
}
}
}
rootProject.name = 'MPPMobileApplication'
rootProject.name = 'MultiplatformMobileApplication'
include(':shared')
include(':androidApp')
include(':androidApp')
@@ -13,9 +13,8 @@ pluginManagement {
}
}
}
rootProject.name = "MPPMobileApplication"
rootProject.name = "MultiplatformMobileApplication"
include(":shared")
include(":androidApp")
include(":androidApp")
@@ -1 +0,0 @@
rootProject.name = 'NativeConsoleApplication'
@@ -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/");
}
}
@@ -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")