Skip to content

Commit f5f74a5

Browse files
ddolovovSpace Team
authored andcommitted
[Test] Migrate tests in ':compiler:ir:ir.validation' to JUnit5
1 parent 9a80572 commit f5f74a5

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

compiler/ir/ir.validation/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ plugins {
22
kotlin("jvm")
33
id("jps-compatible")
44
id("test-inputs-check")
5+
id("project-tests-convention")
56
}
67

7-
tasks.test {
8-
useJUnitPlatform()
8+
projectTests {
9+
testTask(jUnitMode = JUnitMode.JUnit5)
910
}
1011

1112
dependencies {
@@ -19,7 +20,8 @@ dependencies {
1920

2021
compileOnly(intellijCore())
2122

22-
testImplementation(project.kotlinTest("junit5"))
23+
testImplementation(libs.junit.jupiter.api)
24+
testRuntimeOnly(libs.junit.jupiter.engine)
2325
testRuntimeOnly(testFixtures(project(":compiler:tests-common-new")))
2426
testImplementation(project(":compiler:ir.backend.common"))
2527
}

compiler/ir/ir.validation/test/org/jetbrains/kotlin/ir/validation/IrValidatorTest.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ import org.jetbrains.kotlin.name.Name
4444
import org.jetbrains.kotlin.name.SpecialNames
4545
import org.jetbrains.kotlin.storage.LockBasedStorageManager
4646
import org.jetbrains.kotlin.types.Variance
47+
import org.junit.jupiter.api.Assertions.assertEquals
48+
import org.junit.jupiter.api.Assertions.fail
49+
import org.junit.jupiter.api.BeforeEach
50+
import org.junit.jupiter.api.Test
51+
import org.junit.jupiter.api.assertThrows
4752
import kotlin.reflect.KProperty
48-
import kotlin.test.*
4953

5054
class IrValidatorTest {
5155

@@ -55,7 +59,7 @@ class IrValidatorTest {
5559
.withAllChecks()
5660
.withInlineFunctionCallsiteCheck { it.symbol.owner.name.toString() != "inlineFunctionUseSiteNotPermitted" }
5761

58-
@BeforeTest
62+
@BeforeEach
5963
fun setUp() {
6064
messageCollector = MessageCollectorImpl()
6165

@@ -147,7 +151,7 @@ class IrValidatorTest {
147151

148152
private inline fun runValidationAndAssert(mode: IrVerificationMode, block: () -> Unit) {
149153
if (mode == IrVerificationMode.ERROR) {
150-
assertFailsWith<IrValidationException>(block = block)
154+
assertThrows<IrValidationException>(executable = block)
151155
} else {
152156
block()
153157
}

0 commit comments

Comments
 (0)