From b8d1398bdb3fecf3a169b5c4a3220a338981c80f Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Tue, 14 Nov 2023 16:20:13 +0100
Subject: [PATCH] [Daemon] Use JUnit Vintage engine to run JUnit4 tests

---
 compiler/daemon/daemon-tests/build.gradle.kts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/daemon/daemon-tests/build.gradle.kts b/compiler/daemon/daemon-tests/build.gradle.kts
index 01e034ce547..7c6e333ec58 100644
--- a/compiler/daemon/daemon-tests/build.gradle.kts
+++ b/compiler/daemon/daemon-tests/build.gradle.kts
@@ -11,8 +11,11 @@ dependencies {
     testImplementation(project(":kotlin-daemon"))
     testImplementation(project(":kotlin-daemon-client"))
     testImplementation(libs.junit4)
+    testImplementation(libs.junit.jupiter.api)
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(intellijCore())
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testRuntimeOnly(libs.junit.vintage.engine)
 }
 
 sourceSets {
@@ -20,10 +23,12 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-projectTest(parallel = true) {
+projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
     dependsOn(":dist")
     workingDir = rootDir
 
+    useJUnitPlatform()
+
     val testClassesDirs = testSourceSet.output.classesDirs
     doFirst {
         systemProperty("kotlin.test.script.classpath", testClassesDirs.joinToString(File.pathSeparator))