From ba3d3c7f09acf91aed83b89b641f1f607b2c4cd6 Mon Sep 17 00:00:00 2001 From: anstarovoyt Date: Wed, 15 Jan 2020 19:52:46 +0300 Subject: [PATCH] dynamic plugins: twice check that plugin can be unloaded GitOrigin-RevId: c5744bd40b194af06334a5a7a72fe97c9a014bc2 --- .../com/intellij/ide/plugins/DynamicPluginsTestUtil.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/DynamicPluginsTestUtil.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/DynamicPluginsTestUtil.kt index 1f8621162de8..6b1cf7d7a76c 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/DynamicPluginsTestUtil.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/DynamicPluginsTestUtil.kt @@ -7,6 +7,7 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.assertions.Assertions import java.io.File +import java.lang.AssertionError import java.nio.file.Files import java.nio.file.Path import kotlin.math.abs @@ -56,7 +57,12 @@ fun loadPluginWithText(pluginXml: String, loader: ClassLoader): Disposable { return Disposable { descriptor = loadDescriptorInTest(plugin.toPath().parent.parent) + val canBeUnloaded = DynamicPlugins.allowLoadUnloadWithoutRestart(descriptor) unloadPlugin(descriptor, false) + + if (!canBeUnloaded) { + throw AssertionError("'Allow unload without restart' returned false, why expected true") + } } }