Upgrade to JUnit 5

Author: sandjelkovic

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/CombiningCommandCallbackTest.kt

@@ -23,8 +23,8 @@ import org.axonframework.commandhandling.GenericCommandMessage
 import org.axonframework.commandhandling.GenericCommandResultMessage
 import org.axonframework.commandhandling.distributed.CommandDispatchException
 import org.axonframework.messaging.MetaData
-import org.junit.Test
 import java.util.*
+import kotlin.test.Test
 import kotlin.test.fail
 
 class CombiningCommandCallbackTest {

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/CommandGatewayExtensionsTest.kt

@@ -24,8 +24,8 @@ import org.axonframework.commandhandling.CommandCallback
 import org.axonframework.commandhandling.CommandMessage
 import org.axonframework.commandhandling.gateway.CommandGateway
 import org.axonframework.messaging.MetaData
-import org.junit.Test
 import java.util.concurrent.TimeUnit
+import kotlin.test.Test
 
 class CommandGatewayExtensionsTest {
     private val subjectGateway = mockk<CommandGateway>()

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/QueryGatewayExtensionsTest.kt

@@ -22,11 +22,11 @@ import io.mockk.verify
 import org.axonframework.messaging.responsetypes.AbstractResponseType
 import org.axonframework.messaging.responsetypes.InstanceResponseType
 import org.axonframework.queryhandling.QueryGateway
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
 import java.util.*
 import java.util.concurrent.CompletableFuture
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+import kotlin.test.Test
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 
@@ -39,14 +39,14 @@ class QueryGatewayExtensionsTest {
     private val listReturnValue: CompletableFuture<List<String>> = CompletableFuture.completedFuture(listOf("Value", "Second value"))
     private val subjectGateway = mockk<QueryGateway>()
 
-    @Before
+    @BeforeTest
     fun before() {
         every { subjectGateway.query(queryName, exampleQuery, matchInstanceResponseType<String>()) } returns instanceReturnValue
         every { subjectGateway.query(queryName, exampleQuery, matchOptionalResponseType<String>()) } returns optionalReturnValue
         every { subjectGateway.query(queryName, exampleQuery, matchMultipleInstancesResponseType<String>()) } returns listReturnValue
     }
 
-    @After
+    @AfterTest
     fun after() {
         clearMocks(subjectGateway)
     }

pom.xml

@@ -38,6 +38,7 @@
     <kotlin-logging.version>1.7.7</kotlin-logging.version>
     <jackson-kotlin.version>2.10.0</jackson-kotlin.version>
     <mockk.version>1.9.3</mockk.version>
+    <junit.jupiter.version>5.5.2</junit.jupiter.version>
   </properties>
 
   <dependencyManagement>
@@ -78,9 +79,24 @@
         </exclusions>
       </dependency>
 
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit.jupiter.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-test-junit</artifactId>
+        <artifactId>kotlin-test-junit5</artifactId>
         <version>${kotlin.version}</version>
         <scope>test</scope>
       </dependency>
@@ -118,20 +134,28 @@
 
     <!-- Test dependencies -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test-junit</artifactId>
+      <artifactId>kotlin-test-junit5</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.mockk</groupId>
       <artifactId>mockk</artifactId>
-      <version>${mockk.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>