From ba5fe6cda94a4fdf91dea11ee583b0afec874752 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 19 May 2020 17:12:01 +0300 Subject: [PATCH] Testing: Avoid creating duplicated SDKs --- .../org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java index 6a5c0d9e375..7f060044289 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java @@ -94,6 +94,12 @@ public class PluginTestCaseBase { @NotNull public static Sdk addJdk(@NotNull Disposable disposable, @NotNull Function0 getJdk) { Sdk jdk = getJdk.invoke(); + Sdk[] allJdks = IjPlatformUtil.getProjectJdkTableSafe().getAllJdks(); + for (Sdk existingJdk : allJdks) { + if (existingJdk == jdk) { + return existingJdk; + } + } ApplicationManager.getApplication().runWriteAction(() -> IjPlatformUtil.getProjectJdkTableSafe().addJdk(jdk, disposable)); return jdk; }