From e346df26d3e0832f6cf13559dfb98f2a4c9a64e6 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Fri, 26 Nov 2021 14:02:24 -0600 Subject: [PATCH] Switch to JUnit 5 as test runner --- kotlin-power-assert-plugin/build.gradle.kts | 6 +++++- .../kotlin/com/bnorm/power/ArithmeticExpressionTest.kt | 2 +- .../test/kotlin/com/bnorm/power/AssertLibraryTest.kt | 10 +++++----- .../test/kotlin/com/bnorm/power/DebugFunctionTest.kt | 2 +- .../src/test/kotlin/com/bnorm/power/LamdaTest.kt | 2 +- .../com/bnorm/power/MultiParameterFunctionTest.kt | 2 +- .../src/test/kotlin/com/bnorm/power/RegexMatchTest.kt | 2 +- .../src/test/kotlin/com/bnorm/power/compiler.kt | 2 +- .../src/test/kotlin/com/bnorm/power/test.kt | 2 +- sample/build.gradle.kts | 6 +++++- 10 files changed, 22 insertions(+), 14 deletions(-) diff --git a/kotlin-power-assert-plugin/build.gradle.kts b/kotlin-power-assert-plugin/build.gradle.kts index eedd1cb82d7..8be2694da57 100644 --- a/kotlin-power-assert-plugin/build.gradle.kts +++ b/kotlin-power-assert-plugin/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { kapt("com.google.auto.service:auto-service:1.0.1") compileOnly("com.google.auto.service:auto-service-annotations:1.0.1") - testImplementation(kotlin("test-junit")) + testImplementation(kotlin("test-junit5")) testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable") testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.4.6") } @@ -24,6 +24,10 @@ tasks.withType { kotlinOptions.jvmTarget = "1.8" } +tasks.withType { + useJUnitPlatform() +} + tasks.dokka { outputFormat = "html" outputDirectory = "$buildDir/javadoc" diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/ArithmeticExpressionTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/ArithmeticExpressionTest.kt index 1b9c9c30ae4..54adad9f94b 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/ArithmeticExpressionTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/ArithmeticExpressionTest.kt @@ -16,7 +16,7 @@ package com.bnorm.power -import org.junit.Test +import kotlin.test.Test import kotlin.test.assertEquals class ArithmeticExpressionTest { diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertLibraryTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertLibraryTest.kt index 4f67a686e1f..adfd7dec779 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertLibraryTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertLibraryTest.kt @@ -16,8 +16,8 @@ package com.bnorm.power +import kotlin.test.Test import org.jetbrains.kotlin.name.FqName -import org.junit.Test class AssertLibraryTest { @Test @@ -111,7 +111,7 @@ class AssertLibraryTest { assertEquals(greeting, name) | | | World - Hello expected:<[Hello]> but was:<[World]> + Hello ==> expected: but was: """.trimIndent(), PowerAssertComponentRegistrar(setOf(FqName("kotlin.test.assertEquals"))) ) @@ -133,7 +133,7 @@ class AssertLibraryTest { assertEquals(greeting, name, "Message:") | | | World - Hello expected:<[Hello]> but was:<[World]> + Hello ==> expected: but was: """.trimIndent(), PowerAssertComponentRegistrar(setOf(FqName("kotlin.test.assertEquals"))) ) @@ -152,7 +152,7 @@ class AssertLibraryTest { """ assertNotNull(name) | - null + null ==> expected: not """.trimIndent(), PowerAssertComponentRegistrar(setOf(FqName("kotlin.test.assertNotNull"))) ) @@ -172,7 +172,7 @@ class AssertLibraryTest { Message: assertNotNull(name, "Message:") | - null + null ==> expected: not """.trimIndent(), PowerAssertComponentRegistrar(setOf(FqName("kotlin.test.assertNotNull"))) ) diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/DebugFunctionTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/DebugFunctionTest.kt index d720e3e744d..bf2c63669ea 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/DebugFunctionTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/DebugFunctionTest.kt @@ -19,10 +19,10 @@ package com.bnorm.power import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.SourceFile import org.jetbrains.kotlin.name.FqName -import org.junit.Test import java.io.ByteArrayOutputStream import java.io.PrintStream import java.lang.reflect.InvocationTargetException +import kotlin.test.Test import kotlin.test.assertEquals class DebugFunctionTest { diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt index 9e2dce2f85e..4769e631efa 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt @@ -16,8 +16,8 @@ package com.bnorm.power +import kotlin.test.Test import org.jetbrains.kotlin.name.FqName -import org.junit.Test class LamdaTest { @Test diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/MultiParameterFunctionTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/MultiParameterFunctionTest.kt index 1a2ce2b21d1..88072af6064 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/MultiParameterFunctionTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/MultiParameterFunctionTest.kt @@ -19,10 +19,10 @@ package com.bnorm.power import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.SourceFile import org.jetbrains.kotlin.name.FqName -import org.junit.Test import java.io.ByteArrayOutputStream import java.io.PrintStream import java.lang.reflect.InvocationTargetException +import kotlin.test.Test import kotlin.test.assertEquals class MultiParameterFunctionTest { diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/RegexMatchTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/RegexMatchTest.kt index 8207d6bfd29..ca23e36f646 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/RegexMatchTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/RegexMatchTest.kt @@ -16,7 +16,7 @@ package com.bnorm.power -import org.junit.Test +import kotlin.test.Test import kotlin.test.assertEquals class RegexMatchTest { diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt index cfc28e034e9..01570df154a 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt @@ -62,7 +62,7 @@ fun executeAssertion( } fail("should have thrown assertion") } catch (t: Throwable) { - return t.message!! + return t.message ?: "" } } diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/test.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/test.kt index 556305bea79..d8904dcea70 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/test.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/test.kt @@ -16,8 +16,8 @@ package com.bnorm.power +import kotlin.test.Test import org.jetbrains.kotlin.name.FqName -import org.junit.Test class CompilerTest { @Test diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 09de93c4719..da6a027d5b1 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -32,7 +32,7 @@ kotlin { } val jvmTest by getting { dependencies { - implementation(kotlin("test-junit")) + implementation(kotlin("test-junit5")) } } val jsTest by getting { @@ -49,6 +49,10 @@ kotlin { } } +tasks.withType { + useJUnitPlatform() +} + configure { functions = listOf( "kotlin.assert",