(#291) Tests: fix CodeInsight tests and add EdtInterceptor

Author: Fantoom

src/main/kotlin/com/intellij/plugin/powershell/lang/lsp/LSPInitMain.kt

@@ -129,7 +129,12 @@ class LSPInitMain : PersistentStateComponent<LSPInitMain.PowerShellInfo>, Dispos
   }
 
   override fun dispose() {
-    psEditorLanguageServer.clear()
-    psConsoleLanguageServer.clear()
+    fun ConcurrentHashMap<Project, LanguageServerEndpoint>.shutdownAndClear() {
+      //forEach { it.value.shutdown() }
+      clear()
+    }
+
+    psEditorLanguageServer.shutdownAndClear()
+    psConsoleLanguageServer.shutdownAndClear()
   }
 }

src/test/kotlin/com/intellij/plugin/powershell/lang/PSLanguageHostUtilsTests.kt

@@ -4,16 +4,22 @@ import com.intellij.execution.configurations.PathEnvironmentVariableUtil
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.plugin.powershell.isOnCiServer
 import com.intellij.plugin.powershell.lang.lsp.languagehost.PSLanguageHostUtils
+import com.intellij.plugin.powershell.lang.lsp.languagehost.PSVersionInfo
 import com.intellij.plugin.powershell.lang.lsp.languagehost.PowerShellEdition
-import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import com.intellij.testFramework.junit5.TestApplication
 import kotlinx.coroutines.future.await
 import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
 import java.nio.file.Path
 import kotlin.io.path.pathString
 import kotlin.test.assertTrue
+import kotlin.test.fail
 
-class PSLanguageHostUtilsTests : BasePlatformTestCase() {
+@TestApplication
+class PSLanguageHostUtilsTests {
 
+  @Test
   fun testPowerShell5VersionDetector() {
     if (!SystemInfo.isWindows)
       return
@@ -33,6 +39,7 @@ class PSLanguageHostUtilsTests : BasePlatformTestCase() {
     doTest(executable, "5\\..+".toRegex(), PowerShellEdition.Desktop)
   }
 
+  @Test
   fun testPowerShellCoreVersionDetector() {
     val executable = findExecutable("pwsh")
     if (executable == null) {
@@ -53,11 +60,11 @@ class PSLanguageHostUtilsTests : BasePlatformTestCase() {
   }
 
   private fun doTest(executable: Path, expectedVersionRegex: Regex, expectedEdition: PowerShellEdition) {
-    val version = runBlocking { PSLanguageHostUtils.getPowerShellVersion(executable.pathString).await() }
+    val version: PSVersionInfo = runBlocking { PSLanguageHostUtils.getPowerShellVersion(executable.pathString).await() }
     assertTrue(
       expectedVersionRegex.matches(version.versionString),
       "Version string ${version.versionString} is expected to satisfy a regular expression $expectedVersionRegex."
     )
-    assertEquals(expectedEdition, version.edition)
+    Assertions.assertEquals(expectedEdition, version.edition)
   }
 }

src/test/kotlin/com/intellij/plugin/powershell/lang/PowerShellCodeInsightTest.kt

@@ -3,12 +3,14 @@ package com.intellij.plugin.powershell.lang
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.plugin.powershell.psi.PowerShellStringLiteralExpression
 import com.intellij.plugin.powershell.testFramework.PowerShellCodeInsightTestBase
+import com.intellij.plugin.powershell.testFramework.RunInEdt
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.testFramework.junit5.TestApplication
 import org.junit.jupiter.api.Test
 import java.io.File
 
 @TestApplication
+@RunInEdt
 class PowerShellCodeInsightTest : PowerShellCodeInsightTestBase() {
 
   private val TEST_DATA_PATH = "src" + File.separatorChar + "test" + File.separatorChar + "resources" + File.separatorChar +

src/test/kotlin/com/intellij/plugin/powershell/testFramework/EdtInterceptor.kt

@@ -0,0 +1,21 @@
+package com.intellij.plugin.powershell.testFramework
+
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.jupiter.api.extension.InvocationInterceptor
+import org.junit.jupiter.api.extension.ReflectiveInvocationContext
+import java.lang.reflect.Method
+
+class EdtInterceptor: InvocationInterceptor {
+  override fun interceptTestMethod(
+    invocation: InvocationInterceptor.Invocation<Void?>,
+    invocationContext: ReflectiveInvocationContext<Method?>,
+    extensionContext: ExtensionContext
+  ) {
+    if(invocationContext.executable?.getAnnotation(RunInEdt::class.java) != null || invocationContext.targetClass?.getAnnotation(RunInEdt::class.java) != null)
+      runInEdt { invocation.proceed() }
+    else invocation.proceed()
+  }
+}
+
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
+annotation class RunInEdt

src/test/kotlin/com/intellij/plugin/powershell/testFramework/PowerShellCodeInsightTestBase.kt

@@ -1,7 +1,9 @@
 package com.intellij.plugin.powershell.testFramework
 
 import com.intellij.plugin.powershell.lang.lsp.LSPInitMain
+import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
+import com.intellij.testFramework.fixtures.IdeaProjectTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.testFramework.fixtures.impl.TempDirTestFixtureImpl
 import com.intellij.testFramework.junit5.fixture.tempPathFixture
@@ -10,23 +12,25 @@ import kotlinx.coroutines.withTimeout
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.TestInfo
+import org.junit.jupiter.api.extension.ExtendWith
 import java.nio.file.Path
 import kotlin.time.Duration.Companion.seconds
 
+@ExtendWith(EdtInterceptor::class)
 open class PowerShellCodeInsightTestBase {
   val tempPathFixture = tempPathFixture()
   lateinit var tempPath: Path
   lateinit var codeInsightTestFixture: CodeInsightTestFixture
-
+  lateinit var ideaProjectTestFixture: IdeaProjectTestFixture
   val project get() = codeInsightTestFixture.project
 
   @BeforeEach
   fun setupFixture(testInfo: TestInfo){
     tempPath = tempPathFixture.get()
     val factory = IdeaTestFixtureFactory.getFixtureFactory()
     val fixtureBuilder = factory.createLightFixtureBuilder(null, testInfo.displayName)
-    val fixture = fixtureBuilder.getFixture()
-    codeInsightTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture,
+    ideaProjectTestFixture = fixtureBuilder.getFixture()
+    codeInsightTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(ideaProjectTestFixture,
       TempDirTestFixtureImpl())
     codeInsightTestFixture.testDataPath = getTestDataPath()
     codeInsightTestFixture.setUp()
@@ -37,6 +41,7 @@ open class PowerShellCodeInsightTestBase {
     runInEdt {
       LSPInitMain.getInstance().dispose() // TODO: Remove this after LSPInitMain is refactored
       codeInsightTestFixture.tearDown()
+      LightPlatformTestCase.closeAndDeleteProject()
       tearDownInEdt()
     }
   }