From fa3556e841fab4b0da60c76f397aef381982e55c Mon Sep 17 00:00:00 2001 From: Louis Vignier Date: Thu, 1 Feb 2024 09:13:35 +0100 Subject: [PATCH] [jdk] Fix leaking SDK in test The NPW JDK combo can register a JDK if none were registered. This needs to be taken into account in tests #tearDown. GitOrigin-RevId: bc407e3d7e18e192ab8bacc3e3e4f24803ca9de7 --- .../intellij/ide/projectWizard/SaveProjectAsTemplateTest.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/idea-ui/testSrc/com/intellij/ide/projectWizard/SaveProjectAsTemplateTest.kt b/java/idea-ui/testSrc/com/intellij/ide/projectWizard/SaveProjectAsTemplateTest.kt index c9d57e98dfd2..1536d4bb61b6 100644 --- a/java/idea-ui/testSrc/com/intellij/ide/projectWizard/SaveProjectAsTemplateTest.kt +++ b/java/idea-ui/testSrc/com/intellij/ide/projectWizard/SaveProjectAsTemplateTest.kt @@ -15,6 +15,7 @@ import com.intellij.openapi.module.BasePackageParameterFactory import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx +import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.vfs.LocalFileSystem @@ -138,6 +139,9 @@ public class Bar { override fun tearDown() { try { + ProjectJdkTable.getInstance().apply { + allJdks.forEach { removeJdk(it) } + } (FileTemplateManager.getDefaultInstance() as FileTemplateManagerImpl).setTestDate(null) PropertiesComponent.getInstance().unsetValue(ProjectTemplateParameterFactory.IJ_BASE_PACKAGE) }