Migrate ImageVector PSI to JUnit 5

Author: egorikftp

sdk/intellij/psi/imagevector/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.valkyrie.compose)
     alias(libs.plugins.jetbrains.intellij.module)
     alias(libs.plugins.valkyrie.kover)
+    alias(libs.plugins.buildconfig)
 }
 
 sourceSets {
@@ -14,6 +15,20 @@ sourceSets {
     }
 }
 
+buildConfig.sourceSets.getByName("test") {
+    useKotlinOutput {
+        topLevelConstants = true
+    }
+    packageName = "io.github.composegears.valkyrie.psi"
+
+    val path = project.layout.buildDirectory.dir("resources/test").get().asFile.absolutePath
+    buildConfigField<String>("TEST_DATA_PATH", path)
+}
+
+tasks.test {
+    systemProperty("idea.kotlin.plugin.use.k2", "true")
+}
+
 configurations {
     testImplementation {
         exclude(group = "org.jetbrains.kotlinx")
@@ -26,15 +41,13 @@ dependencies {
 
     compileOnly(compose.runtime)
 
+    testImplementation(testFixtures(projects.sdk.intellij.testFixtures))
     testImplementation(compose.ui)
     testImplementation(projects.sdk.ir.compose)
     testImplementation(projects.components.test.resourceLoader)
-    testImplementation(libs.bundles.test)
+    testImplementation(libs.assertk)
     testRuntimeOnly(libs.junit.launcher)
 
-    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#junit5-test-framework-refers-to-junit4
-    testRuntimeOnly(libs.junit4)
-
     intellijPlatform {
         testFramework(TestFrameworkType.Platform)
         testFramework(TestFrameworkType.JUnit5)

sdk/intellij/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/KtFileToImageVectorParserTest.kt

@@ -2,12 +2,10 @@ package io.github.composegears.valkyrie.sdk.intellij.psi.imagevector
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import com.intellij.openapi.project.Project
-import com.intellij.testFramework.ProjectExtension
+import com.intellij.testFramework.junit5.TestApplication
 import com.intellij.testFramework.runInEdtAndGet
+import io.github.composegears.valkyrie.psi.TEST_DATA_PATH
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.common.ParseType
-import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.common.createKtFile
-import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.common.toKtFile
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.ExpectedAllGroupParams
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.ExpectedAllPathParams
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.ExpectedClipPathGradient
@@ -24,31 +22,21 @@ import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.Exp
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.ExpectedMaterialIconWithoutParam2
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.ExpectedRadialGradient
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.expected.ExpectedSinglePath
+import io.github.composegears.valkyrie.sdk.intellij.testfixtures.KotlinCodeInsightTest
 import io.github.composegears.valkyrie.sdk.ir.compose.toComposeImageVector
+import org.jetbrains.kotlin.psi.KtFile
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
 import org.junit.jupiter.params.ParameterizedClass
 import org.junit.jupiter.params.provider.EnumSource
 
+@TestApplication
 @ParameterizedClass
 @EnumSource(value = ParseType::class)
-class KtFileToImageVectorParserTest(
-    private val parseType: ParseType,
-) {
-
-    companion object {
-        @JvmField
-        @RegisterExtension
-        val projectExtension = ProjectExtension()
-    }
-
-    private val project: Project
-        get() = projectExtension.project
+class KtFileToImageVectorParserTest(private val parseType: ParseType) : KotlinCodeInsightTest() {
 
     @Test
     fun `empty image vector`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "lazy/EmptyImageVector.kt",
             pathToBacking = "backing/EmptyImageVector.kt",
         )
@@ -60,7 +48,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `empty paths`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "lazy/EmptyPaths.kt",
             pathToBacking = "backing/EmptyPaths.kt",
         )
@@ -72,7 +59,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse all path params`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "lazy/AllPathParams.kt",
             pathToBacking = "backing/AllPathParams.kt",
         )
@@ -83,39 +69,39 @@ class KtFileToImageVectorParserTest(
 
     @Test
     fun `parse material icon`() = runInEdtAndGet {
-        val ktFile = project.createKtFile(from = "backing/MaterialIcon.all.kt")
+        val ktFile = loadKtFile("backing/MaterialIcon.all.kt")
         val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
 
         assertThat(imageVector).isEqualTo(ExpectedMaterialIcon)
     }
 
     @Test
     fun `parse material icon without param`() = runInEdtAndGet {
-        val ktFile = project.createKtFile(from = "backing/MaterialIcon.all.without.param.kt")
+        val ktFile = loadKtFile("backing/MaterialIcon.all.without.param.kt")
         val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
 
         assertThat(imageVector).isEqualTo(ExpectedMaterialIconWithoutParam)
     }
 
     @Test
     fun `parse material icon with several materialPath`() = runInEdtAndGet {
-        val ktFile = project.createKtFile(from = "backing/MaterialIcon.several.materialpath.kt")
+        val ktFile = loadKtFile("backing/MaterialIcon.several.materialpath.kt")
         val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
 
         assertThat(imageVector).isEqualTo(ExpectedMaterialIconWithoutParam2)
     }
 
     @Test
     fun `parse material icon only with materialPath`() = runInEdtAndGet {
-        val ktFile = project.createKtFile(from = "backing/MaterialIcon.material.path.kt")
+        val ktFile = loadKtFile("backing/MaterialIcon.material.path.kt")
         val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
 
         assertThat(imageVector).isEqualTo(ExpectedMaterialIconOnlyWithPath)
     }
 
     @Test
     fun `parse icon with import member`() = runInEdtAndGet {
-        val ktFile = project.createKtFile(from = "backing/IconWithImportMember.kt")
+        val ktFile = loadKtFile("backing/IconWithImportMember.kt")
         val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
 
         assertThat(imageVector).isEqualTo(ExpectedIconWithImportMember)
@@ -124,7 +110,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse icon with group`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "lazy/IconWithGroup.kt",
             pathToBacking = "backing/IconWithGroup.kt",
         )
@@ -136,7 +121,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse single path property`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "lazy/SinglePath.kt",
             pathToBacking = "backing/SinglePath.kt",
         )
@@ -148,7 +132,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse all group params`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "imagevector/kt/lazy/AllGroupParams.kt",
             pathToBacking = "imagevector/kt/backing/AllGroupParams.kt",
         )
@@ -160,7 +143,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse compose color`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "imagevector/kt/lazy/ComposeColor.kt",
             pathToBacking = "imagevector/kt/backing/ComposeColor.kt",
         )
@@ -172,7 +154,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse icon with linear gradient`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "imagevector/kt/backing/LinearGradient.kt",
             pathToBacking = "imagevector/kt/lazy/LinearGradient.kt",
         )
@@ -184,7 +165,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse icon with linear gradient and stroke`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "imagevector/kt/backing/LinearGradientWithStroke.kt",
             pathToBacking = "imagevector/kt/lazy/LinearGradientWithStroke.kt",
         )
@@ -196,7 +176,6 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse linear gradient with clip path`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "imagevector/kt/lazy/ClipPathGradient.kt",
             pathToBacking = "imagevector/kt/backing/ClipPathGradient.kt",
         )
@@ -208,12 +187,22 @@ class KtFileToImageVectorParserTest(
     @Test
     fun `parse icon with radial gradient`() = runInEdtAndGet {
         val ktFile = parseType.toKtFile(
-            project = project,
             pathToLazy = "imagevector/kt/backing/RadialGradient.kt",
             pathToBacking = "imagevector/kt/lazy/RadialGradient.kt",
         )
         val imageVector = ImageVectorPsiParser.parseToIrImageVector(ktFile)?.toComposeImageVector()
 
         assertThat(imageVector).isEqualTo(ExpectedRadialGradient)
     }
+
+    // Use path for build folder with all generated test resources
+    override val testDataPath: String = TEST_DATA_PATH
+
+    fun ParseType.toKtFile(
+        pathToLazy: String,
+        pathToBacking: String,
+    ): KtFile = when (this) {
+        ParseType.Lazy -> loadKtFile(pathToLazy)
+        ParseType.Backing -> loadKtFile(pathToBacking)
+    }
 }

sdk/intellij/psi/imagevector/src/test/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/common/ParseType.kt

@@ -1,18 +1,6 @@
 package io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.common
 
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.psi.KtFile
-
 enum class ParseType {
     Lazy,
     Backing,
 }
-
-fun ParseType.toKtFile(
-    project: Project,
-    pathToLazy: String,
-    pathToBacking: String,
-): KtFile = when (this) {
-    ParseType.Lazy -> project.createKtFile(pathToLazy)
-    ParseType.Backing -> project.createKtFile(pathToBacking)
-}

sdk/intellij/test-fixtures/src/testFixtures/kotlin/io/github/composegears/valkyrie/sdk/intellij/testfixtures/KotlinCodeInsightTest.kt

@@ -1,8 +1,6 @@
 package io.github.composegears.valkyrie.sdk.intellij.testfixtures
 
-import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.vfs.LocalFileSystem
-import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.testFramework.fixtures.impl.TempDirTestFixtureImpl
@@ -45,10 +43,7 @@ abstract class KotlinCodeInsightTest {
 
     @AfterEach
     internal fun tearDownEdt() {
-        runInEdt {
-            fixture.tearDown()
-            LightPlatformTestCase.closeAndDeleteProject()
-        }
+        fixture.tearDown()
     }
 
     protected fun loadKtFile(fileName: String): KtFile {