Use newer junit.

laech · Oct 6, 2023 · a404fe4 · a404fe4
1 parent 2acc4c4
commit a404fe4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,13 @@ version = "0.2.3-SNAPSHOT"
 
 repositories { mavenCentral() }
 
+dependencies {
+  testImplementation("nz.lae.stacksrc:stacksrc-junit5:0.5.0")
+  testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+  testImplementation("org.junit.vintage:junit-vintage-engine:5.10.0")
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.0")
+}
+
 kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(11)) } }
 
 intellij { version.set("2021.1") }
@@ -22,6 +29,10 @@ spotless {
 }
 
 tasks {
-  test { testLogging { exceptionFormat = TestExceptionFormat.FULL } }
+  test {
+    useJUnitPlatform()
+    systemProperty("junit.jupiter.extensions.autodetection.enabled", true)
+    testLogging { exceptionFormat = TestExceptionFormat.FULL }
+  }
   patchPluginXml { untilBuild.set("") }
 }
diff --git a/src/test/java/com/gitlab/lae/intellij/jump/EditorsTest.kt b/src/test/java/com/gitlab/lae/intellij/jump/EditorsTest.kt
@@ -2,10 +2,15 @@ package com.gitlab.lae.intellij.jump
 
 import com.intellij.openapi.fileTypes.FileTypes
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
 
+@RunWith(JUnit4::class)
 class EditorsTest : BasePlatformTestCase() {
 
-  fun `test search offsets returns offsets matching query`() {
+  @Test
+  fun `search offsets returns offsets matching query`() {
     myFixture.configureByText(FileTypes.PLAIN_TEXT, "HelloWorld")
     val editor = myFixture.editor
     assertOrderedEquals(
@@ -14,7 +19,8 @@ class EditorsTest : BasePlatformTestCase() {
         EditorOffset(editor, 6))
   }
 
-  fun `test search offsets skip fold regions`() {
+  @Test
+  fun `search offsets skip fold regions`() {
     myFixture.configureByText(
         FileTypes.PLAIN_TEXT,
         """
@@ -40,7 +46,8 @@ class EditorsTest : BasePlatformTestCase() {
         EditorOffset(editor, 28))
   }
 
-  fun `test search offsets sorts by distance from caret`() {
+  @Test
+  fun `search offsets sorts by distance from caret`() {
     val text = "ABAB          A"
     myFixture.configureByText(FileTypes.PLAIN_TEXT, text)
     val editor = myFixture.editor

diff --git a/src/test/java/com/gitlab/lae/intellij/jump/TreeTest.kt b/src/test/java/com/gitlab/lae/intellij/jump/TreeTest.kt
@@ -1,7 +1,11 @@
 package com.gitlab.lae.intellij.jump
 
-class TreeTest : junit.framework.TestCase() {
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
+class TreeTest {
+
+  @Test
   fun `test to tree`() {
     val actual = treeOf(listOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), 2)
     val expected =