From 8867b57c84c3c03bbecfcfd279c55ce208c75cfa Mon Sep 17 00:00:00 2001 From: "Victoria.Petrakovich" Date: Tue, 26 Mar 2024 17:15:08 +0000 Subject: [PATCH] [kotlin] Replace Java version with placeholders in testNewModuleInJavaProject to make it work on any version ^KTIJ-29188 Fixed Merge-request: IJ-MR-130054 Merged-by: Victoria Petrakovich GitOrigin-RevId: ab7c48fbf745e6bdb5047ee4111a85f8397659d8 --- .../wizard/MavenNewKotlinModuleTest.kt | 16 +++++++++++++++- .../newModuleInJavaProject/pom.xml | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt index 127a7305ecb3..4d550562f97f 100644 --- a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt +++ b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/MavenNewKotlinModuleTest.kt @@ -329,7 +329,8 @@ class MavenNewKotlinModuleTest : MavenNewProjectWizardTestCase(), NewKotlinProje } override fun postprocessOutputFile(relativePath: String, fileContents: String): String { - return substituteArtifactsVersions(fileContents) + val result = substituteCompilerSourceAndTargetLevels(fileContents) + return substituteArtifactsVersions(result) } override fun getTestFolderName(): String { @@ -367,4 +368,17 @@ class MavenNewKotlinModuleTest : MavenNewProjectWizardTestCase(), NewKotlinProje } return result } + + private fun substituteCompilerSourceAndTargetLevels(fileContents: String): String { + val compilerSourceRegex = Regex("(\\d\\d)") + val compilerTargetRegex = Regex("(\\d\\d)") + var result = fileContents + if (result.contains(compilerSourceRegex)) { + result = result.replace(compilerSourceRegex, "VERSION") + } + if (result.contains(compilerTargetRegex)) { + result = result.replace(compilerTargetRegex, "VERSION") + } + return result + } } \ No newline at end of file diff --git a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/pom.xml b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/pom.xml index 971e7f621601..5c913e20dabf 100644 --- a/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/pom.xml +++ b/plugins/kotlin/project-wizard/tests/testData/mavenNewProjectWizard/newModuleInJavaProject/pom.xml @@ -13,8 +13,8 @@ - 17 - 17 + VERSION + VERSION UTF-8