Migration to JUnit 5

Author: svtk

build.gradle

@@ -24,5 +24,5 @@ repositories {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile 'com.google.guava:guava:16.0'
-    testCompile 'junit:junit:4.12'
+    testCompile 'org.junit.jupiter:junit-jupiter:5.4.0'
 }

test/i_introduction/_0_Hello_World/N00StartKtTest.kt

@@ -1,10 +1,11 @@
 package i_introduction._0_Hello_World
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N00StartKtTest {
-    @Test fun testOk() {
+    @Test
+    fun testOk() {
         assertEquals("OK", task0())
     }
 }

test/i_introduction/_10_Object_Expressions/N10ObjectExpressionsKtTest.kt

@@ -1,10 +1,11 @@
 package i_introduction._10_Object_Expressions
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N10ObjectExpressionsKtTest {
-    @Test fun testSort() {
+    @Test
+    fun testSort() {
         assertEquals(listOf(5, 2, 1), task10())
     }
 }

test/i_introduction/_11_SAM_Conversions/N11SAMConversionsKtTest.kt

@@ -1,10 +1,11 @@
 package i_introduction._11_SAM_Conversions
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N11SAMConversionsKtTest {
-    @Test fun testSort() {
+    @Test
+    fun testSort() {
         assertEquals(listOf(5, 2, 1), task11())
     }
 }

test/i_introduction/_12_Extensions_On_Collections/N12ExtensionsOnCollectionsKtTest.kt

@@ -1,10 +1,11 @@
 package i_introduction._12_Extensions_On_Collections
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N12ExtensionsOnCollectionsKtTest {
-    @Test fun testSort() {
+    @Test
+    fun testSort() {
         assertEquals(listOf(5, 2, 1), task12())
     }
 }

test/i_introduction/_1_Java_To_Kotlin_Converter/N01JavaToKotlinConverterKtTest.kt

@@ -1,10 +1,11 @@
 package i_introduction._1_Java_To_Kotlin_Converter
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N01JavaToKotlinConverterKtTest {
-    @Test fun collection() {
+    @Test
+    fun collection() {
         assertEquals("{1, 2, 3, 42, 555}", task1(listOf(1, 2, 3, 42, 555)))
     }
 }

test/i_introduction/_2_Named_Arguments/N02NamedArgumentsKtTest.kt

@@ -1,10 +1,12 @@
 package i_introduction._2_Named_Arguments
 
-import org.junit.Assert.assertEquals
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N02NamedArgumentsKtTest {
 
-    @org.junit.Test fun testJoinToString() {
+    @Test
+    fun testJoinToString() {
         assertEquals("{1, 2, 3, 42, 555}", task2(listOf(1, 2, 3, 42, 555)))
     }
 

test/i_introduction/_3_Default_Arguments/N03DefaultArgumentsKtTest.kt

@@ -1,11 +1,12 @@
 package i_introduction._3_Default_Arguments
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 
 class N03DefaultArgumentsKtTest {
 
-    @Test fun testDefaultAndNamedParams() {
+    @Test
+    fun testDefaultAndNamedParams() {
         assertEquals("a42b1C42D2", task3())
     }
 }

test/i_introduction/_4_Lambdas/N04LambdasKtTest.kt

@@ -1,15 +1,17 @@
 package i_introduction._4_Lambdas
 
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 
 class N04LambdasKtTest {
-    @Test fun contains() {
+    @Test
+    fun contains() {
         assertTrue(task4(listOf(1, 2, 3)))
     }
 
-    @Test fun notContains() {
+    @Test
+    fun notContains() {
         assertFalse(task4(listOf(1, 3, 5)))
     }
 }

test/i_introduction/_5_String_Templates/N05StringTemplatesKtTest.kt

@@ -1,20 +1,22 @@
 package i_introduction._5_String_Templates
 
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import java.util.regex.Pattern
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 
 class N05StringTemplatesKtTest {
-    @Test fun match() {
+    @Test
+    fun match() {
         assertTrue("11 MAR 1952".matches(task5().toRegex()))
     }
 
-    @Test fun match1() {
+    @Test
+    fun match1() {
         assertTrue("24 AUG 1957".matches(task5().toRegex()))
     }
 
-    @Test fun doNotMatch() {
+    @Test
+    fun doNotMatch() {
         assertFalse("24 RRR 1957".matches(task5().toRegex()))
     }
 }