Migrate to JUnit 5 and Kotlintest

jankotek · Sep 11, 2017 · 519df44 · 519df44
1 parent 59fd37c
commit 519df44
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -103,6 +103,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.0.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections-testutils</artifactId>
@@ -118,12 +125,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
-            <version>${kotlin.version}</version>
+            <groupId>io.kotlintest</groupId>
+            <artifactId>kotlintest</artifactId>
+            <version>2.0.5</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -258,7 +264,26 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19</version>
+                <version>2.19.1</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>1.0.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>5.0.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.vintage</groupId>
+                        <artifactId>junit-vintage-engine</artifactId>
+                        <version>4.12.0</version>
+                    </dependency>
+                </dependencies>
+
                 <configuration>
                     <properties>
                         <property>
@@ -274,7 +299,7 @@
                     <argLine>${testArgLine}</argLine>
 
                     <includes>
-                        <include>**/*</include>
+                        <include>**/**</include>
                     </includes>
                     <excludes>
                         <!-- must be here, otherwise inner classes are ignored-->

diff --git a/src/test/java/org/mapdb/tree/BTreeMap_PumpTest.kt b/src/test/java/org/mapdb/tree/BTreeMap_PumpTest.kt
@@ -1,5 +1,6 @@
 package org.mapdb.tree
 
+import io.kotlintest.matchers.fail
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -8,7 +9,6 @@ import org.mapdb.serializer.GroupSerializer
 import org.mapdb.store.StoreTrivial
 import java.io.IOException
 import java.util.*
-import kotlin.test.fail
 
 
 @RunWith(Parameterized::class)
@@ -52,7 +52,7 @@ class BTreeMap_PumpTest(
                         // map should use Comparator for comparations, not this serializers
                         object : GroupSerializer<Int> by Serializer.INTEGER {
                             override fun valueArrayBinaryGet(input: DataInput2?, keysLen: Int, pos: Int): Int {
-                                fail()
+                                fail("should not be used")
                             }
 
                             //TODO this needs more testing
@@ -61,11 +61,11 @@ class BTreeMap_PumpTest(
 //                        }
 
                             override fun compare(first: Int?, second: Int?): Int {
-                                fail()
+                                fail("should not be used")
                             }
 
                             override fun valueArraySearch(keys: Any?, key: Int?): Int {
-                                fail()
+                                fail("should not be used")
                             }
 
 //                        override fun valueArraySearch(keys: Any?, key: Int?, comparator: Comparator<*>?): Int {