Update to JUnit 6.0.0

Author: freya022

BotCommands-core/src/test/kotlin/io/github/freya022/botcommands/components/ComponentTests.kt

@@ -11,7 +11,6 @@ import io.github.freya022.botcommands.helpers.config.Environment
 import io.github.freya022.botcommands.helpers.db.TestH2Source
 import io.github.freya022.botcommands.helpers.utils.createTest
 import io.github.freya022.botcommands.internal.components.controller.ComponentController
-import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
@@ -36,7 +35,7 @@ object ComponentTests {
     }
 
     @Test
-    fun `Group delete results in owned components deleted`(): Unit = runBlocking {
+    suspend fun `Group delete results in owned components deleted`() {
         val button = buttons.primary("test").persistent { }
         val group = buttons.group(button).ephemeral { }
 
@@ -47,7 +46,7 @@ object ComponentTests {
     }
 
     @Test
-    fun `Component delete results in owner group deleted`(): Unit = runBlocking {
+    suspend fun `Component delete results in owner group deleted`() {
         val button = buttons.primary("test").persistent { }
         val group = buttons.group(button).ephemeral { }
 

BotCommands-core/src/test/kotlin/io/github/freya022/botcommands/modals/ModalInputResolverTests.kt

@@ -17,7 +17,6 @@ import io.github.freya022.botcommands.internal.modals.resolvers.ModalStringResol
 import io.github.freya022.botcommands.internal.parameters.ResolverContainer
 import io.mockk.every
 import io.mockk.mockk
-import kotlinx.coroutines.runBlocking
 import net.dv8tion.jda.api.entities.*
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel
 import net.dv8tion.jda.api.interactions.modals.ModalMapping
@@ -57,7 +56,7 @@ object ModalInputResolverTests {
 
     @MethodSource("modalInputs")
     @ParameterizedTest
-    fun `Modal input parameter can be resolved`(index: Int, expected: Any?) {
+    suspend fun `Modal input parameter can be resolved`(index: Int, expected: Any?) {
         val serviceContainer = mockk<ServiceContainer> {
             every { getServiceNamesForAnnotation(Resolver::class) } returns listOf(
                 "modalMentionsResolver",
@@ -84,13 +83,11 @@ object ModalInputResolverTests {
             every { asMentions } returns mentions
         }
 
-        val value = runBlocking {
-            resolver.resolveSuspend(
-                mockk<ModalOption>(),
-                mockk<ModalEvent>(),
-                modalMapping,
-            )
-        }
+        val value = resolver.resolveSuspend(
+            mockk<ModalOption>(),
+            mockk<ModalEvent>(),
+            modalMapping,
+        )
 
         assertEquals(expected, value)
     }

BotCommands-jda-ktx/src/test/kotlin/dev/freya02/botcommands/jda/ktx/RestResultTest.kt

@@ -3,7 +3,6 @@ package dev.freya02.botcommands.jda.ktx
 import dev.freya02.botcommands.jda.ktx.requests.awaitCatching
 import dev.freya02.botcommands.jda.ktx.requests.ignore
 import dev.freya02.botcommands.jda.ktx.requests.recover
-import kotlinx.coroutines.runBlocking
 import net.dv8tion.jda.api.exceptions.ErrorResponseException
 import net.dv8tion.jda.api.requests.ErrorResponse
 import net.dv8tion.jda.api.requests.Response
@@ -19,7 +18,7 @@ object RestResultTest {
     }
 
     @Test
-    fun `Recover error response`() = runBlocking {
+    suspend fun `Recover error response`() {
         val restResult = restException()
             .awaitCatching()
             .recover(ErrorResponse.ALREADY_CROSSPOSTED) {
@@ -33,7 +32,7 @@ object RestResultTest {
     }
 
     @Test
-    fun `Ignore error responses`() = runBlocking {
+    suspend fun `Ignore error responses`() {
         val restResult = restException()
             .awaitCatching()
             .ignore(ErrorResponse.ALREADY_CROSSPOSTED)
@@ -45,7 +44,7 @@ object RestResultTest {
     }
 
     @Test
-    fun `Handle error responses`() = runBlocking {
+    suspend fun `Handle error responses`() {
         val restResult = restException()
             .awaitCatching()
             .ignore(ErrorResponse.ALREADY_CROSSPOSTED)

BotCommands-method-accessors/src/test/kotlin/dev/freya02/botcommands/method/accessors/MethodAccessorTest.kt

@@ -5,7 +5,6 @@ import dev.freya02.botcommands.method.accessors.internal.KotlinReflectMethodAcce
 import dev.freya02.botcommands.method.accessors.internal.MethodAccessorFactory
 import dev.freya02.botcommands.method.accessors.internal.exceptions.IllegalSuspendCallException
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
@@ -19,28 +18,24 @@ object MethodAccessorTest {
 
     @MethodSource("testCallers")
     @ParameterizedTest
-    fun `Generate ClassFile method accessors and call them`(instance: Any?, function: KFunction<*>, args: List<Any?>) {
-        runBlocking {
-            val methodAccessor = ClassFileMethodAccessorFactory().create(instance, function)
-            val args = methodAccessor.createBlankArguments().also {
-                args.forEach { arg -> it.push(arg) }
-            }
-
-            methodAccessor.callSuspend(args)
+    suspend fun `Generate ClassFile method accessors and call them`(instance: Any?, function: KFunction<*>, args: List<Any?>) {
+        val methodAccessor = ClassFileMethodAccessorFactory().create(instance, function)
+        val args = methodAccessor.createBlankArguments().also {
+            args.forEach { arg -> it.push(arg) }
         }
+
+        methodAccessor.callSuspend(args)
     }
 
     @MethodSource("testCallers")
     @ParameterizedTest
-    fun `Generate kotlin-reflect method accessors and call them`(instance: Any?, function: KFunction<*>, args: List<Any?>) {
-        runBlocking {
-            val methodAccessor = KotlinReflectMethodAccessorFactory().create(instance, function)
-            val args = methodAccessor.createBlankArguments().also {
-                args.forEach { arg -> it.push(arg) }
-            }
-
-            methodAccessor.callSuspend(args)
+    suspend fun `Generate kotlin-reflect method accessors and call them`(instance: Any?, function: KFunction<*>, args: List<Any?>) {
+        val methodAccessor = KotlinReflectMethodAccessorFactory().create(instance, function)
+        val args = methodAccessor.createBlankArguments().also {
+            args.forEach { arg -> it.push(arg) }
         }
+
+        methodAccessor.callSuspend(args)
     }
 
     @JvmStatic
@@ -102,7 +97,7 @@ object MethodAccessorTest {
 
     @MethodSource("factories")
     @ParameterizedTest
-    fun `Coroutine return type of inline class returns an inline class instance`(factory: MethodAccessorFactory) = runBlocking {
+    suspend fun `Coroutine return type of inline class returns an inline class instance`(factory: MethodAccessorFactory) {
         val accessor = factory.create(TestClass(), TestClass::coRunWithInlineClassReturnType as KFunction<*>)
         val result = accessor.callSuspend(accessor.createBlankArguments())
         assertIs<InlineDouble>(result)

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ jemoji = "1.7.4"
 jetbrains-annotations = "26.0.2"
 jetbrains-markdown = "0.7.3"
 jsr305 = "3.0.2"
-junit = "5.13.4"
+junit = "6.0.0"
 konsist = "0.17.3"
 kotlin = "2.2.20"
 kotlin-logging = "7.0.3"