[testing] Switch to junit5

MODULE.bazel

@@ -53,29 +53,34 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     name = "kotlin_rules_maven",
     artifacts = [
-        "com.google.code.findbugs:jsr305:3.0.2",
-        "junit:junit:4.13-beta-3",
-        "com.google.protobuf:protobuf-java:3.6.0",
-        "com.google.protobuf:protobuf-java-util:3.6.0",
-        "com.google.guava:guava:27.1-jre",
-        "com.google.truth:truth:0.45",
-        "com.google.auto.service:auto-service:1.0.1",
+        "org.junit.jupiter:junit-jupiter-api:5.4.2",
+        "org.junit.jupiter:junit-jupiter-engine:5.4.2",
+        "org.junit.jupiter:junit-jupiter-params:5.4.2",
+        "org.junit.platform:junit-platform-console:1.4.2",
         "com.google.auto.service:auto-service-annotations:1.0.1",
-        "com.google.auto.value:auto-value:1.10.1",
+        "com.google.auto.service:auto-service-annotations:jar:1.1.1",
+        "com.google.auto.service:auto-service:1.0.1",
         "com.google.auto.value:auto-value-annotations:1.10.1",
-        "com.google.dagger:dagger:2.43.2",
+        "com.google.auto.value:auto-value:1.10.1",
+        "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.dagger:dagger-compiler:2.43.2",
         "com.google.dagger:dagger-producers:2.43.2",
+        "com.google.dagger:dagger:2.43.2",
+        "com.google.guava:guava:27.1-jre",
+        "com.google.protobuf:protobuf-java-util:3.6.0",
+        "com.google.protobuf:protobuf-java:3.6.0",
+        "com.google.truth:truth:0.45",
+        "com.squareup.moshi:moshi-kotlin-codegen:1.15.0",
+        "com.squareup.moshi:moshi-kotlin:1.15.0",
+        "com.squareup.moshi:moshi:1.15.0",
+        "commons-lang:commons-lang:2.6",
+        "dev.zacsweers.autoservice:auto-service-ksp:jar:1.1.0",
         "javax.annotation:javax.annotation-api:1.3.2",
         "javax.inject:javax.inject:1",
-        "org.pantsbuild:jarjar:1.7.2",
+        "junit:junit:4.13-beta-3",
         "org.jetbrains.kotlinx:atomicfu-js:0.15.2",
         "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc",
-        "dev.zacsweers.autoservice:auto-service-ksp:jar:1.1.0",
-        "com.squareup.moshi:moshi:1.15.0",
-        "com.squareup.moshi:moshi-kotlin:1.15.0",
-        "com.squareup.moshi:moshi-kotlin-codegen:1.15.0",
-        "com.google.auto.service:auto-service-annotations:jar:1.1.1",
+        "org.pantsbuild:jarjar:1.7.2",
     ],
     fetch_sources = True,
     repositories = [

docs/kotlin.md

@@ -206,7 +206,7 @@ kt_jvm_library(<a href="#kt_jvm_library-name">name</a>, <a href="#kt_jvm_library
 
 kt_jvm_test(<a href="#kt_jvm_test-name">name</a>, <a href="#kt_jvm_test-associates">associates</a>, <a href="#kt_jvm_test-data">data</a>, <a href="#kt_jvm_test-deps">deps</a>, <a href="#kt_jvm_test-env">env</a>, <a href="#kt_jvm_test-javac_opts">javac_opts</a>, <a href="#kt_jvm_test-jvm_flags">jvm_flags</a>, <a href="#kt_jvm_test-kotlinc_opts">kotlinc_opts</a>, <a href="#kt_jvm_test-main_class">main_class</a>,
             <a href="#kt_jvm_test-module_name">module_name</a>, <a href="#kt_jvm_test-plugins">plugins</a>, <a href="#kt_jvm_test-resource_jars">resource_jars</a>, <a href="#kt_jvm_test-resource_strip_prefix">resource_strip_prefix</a>, <a href="#kt_jvm_test-resources">resources</a>, <a href="#kt_jvm_test-runtime_deps">runtime_deps</a>, <a href="#kt_jvm_test-srcs">srcs</a>,
-            <a href="#kt_jvm_test-test_class">test_class</a>)
+            <a href="#kt_jvm_test-test_class">test_class</a>, <a href="#kt_jvm_test-use_testrunner">use_testrunner</a>)
 
 
     Setup a simple kotlin_test.
@@ -238,6 +238,7 @@ kt_jvm_test(<a href="#kt_jvm_test-name">name</a>, <a href="#kt_jvm_test-associat
 |<a id="kt_jvm_test-runtime_deps"></a>runtime_deps |  Libraries to make available to the final binary or test at runtime only. Like ordinary deps, these will         appear on the runtime classpath, but unlike them, not on the compile-time classpath.   | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | [] |
 |<a id="kt_jvm_test-srcs"></a>srcs |  The list of source files that are processed to create the target, this can contain both Java and Kotlin         files. Java analysis occurs first so Kotlin classes may depend on Java classes in the same compilation unit.   | <a href="https://bazel.build/concepts/labels">List of labels</a> | optional | [] |
 |<a id="kt_jvm_test-test_class"></a>test_class |  The Java class to be loaded by the test runner.   | String | optional | "" |
+|<a id="kt_jvm_test-use_testrunner"></a>use_testrunner |  Use bazel test runner   | Boolean | optional | True |
 
 
 <!-- Generated with Stardoc: http://skydoc.bazel.build -->

kotlin/internal/jvm/impl.bzl

@@ -263,7 +263,10 @@ _SPLIT_STRINGS = [
 
 def kt_jvm_junit_test_impl(ctx):
     providers = _kt_jvm_produce_jar_actions(ctx, "kt_jvm_test")
-    runtime_jars = depset(ctx.files._bazel_test_runner, transitive = [providers.java.transitive_runtime_jars])
+    runtime_jars = depset(
+        ctx.files._bazel_test_runner if ctx.attr.use_testrunner else [],
+        transitive = [providers.java.transitive_runtime_jars],
+    )
 
     coverage_runfiles = []
     if ctx.configuration.coverage_enabled:
@@ -293,6 +296,7 @@ def kt_jvm_junit_test_impl(ctx):
         main_class = ctx.attr.main_class,
         jvm_flags = [
             "-ea",
+            "-Djava.security.manager=allow",
             "-Dbazel.test_suite=%s" % test_class,
         ] + jvm_flags,
     )

kotlin/internal/jvm/jvm.bzl

@@ -344,6 +344,11 @@ Setup a simple kotlin_test.
             default = Label("@bazel_tools//tools/jdk:TestRunner_deploy.jar"),
             allow_files = True,
         ),
+        "use_testrunner": attr.bool(
+            doc = "Use bazel test runner. When disabled, an alternative test runner " +
+                  "implementation should be provided and selected via `main_class`.",
+            default = True,
+        ),
         "test_class": attr.string(
             doc = "The Java class to be loaded by the test runner.",
             default = "",

src/main/starlark/core/repositories/setup.bzl

@@ -56,6 +56,11 @@ def kt_configure():
             "com.squareup.moshi:moshi-kotlin:1.15.0",
             "com.squareup.moshi:moshi-kotlin-codegen:1.15.0",
             "com.google.auto.service:auto-service-annotations:jar:1.1.1",
+            "commons-lang:commons-lang:2.6",
+            "org.junit.jupiter:junit-jupiter-api:5.4.2",
+            "org.junit.jupiter:junit-jupiter-params:5.4.2",
+            "org.junit.jupiter:junit-jupiter-engine:5.4.2",
+            "org.junit.platform:junit-platform-console:1.4.2",
         ],
         repositories = [
             "https://maven-central.storage.googleapis.com/repos/central/data/",

src/test/kotlin/io/bazel/kotlin/KotlinJvm13Test.kt

@@ -1,6 +1,6 @@
 package io.bazel.kotlin
 
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class KotlinJvm13Test {
   @Test

src/test/kotlin/io/bazel/kotlin/KotlinJvmAssociatesBasicVisibilityTest.kt

@@ -1,5 +1,6 @@
 package io.bazel.kotlin
 
+import org.junit.jupiter.api.Test
 import test.DEFAULT_FRIEND
 import test.Service
 
@@ -10,7 +11,7 @@ import test.Service
 class KotlinJvmAssociatesBasicVisibilityTest {
   val service: Service = Service()
 
-  @org.junit.Test
+  @Test
   fun testCanAccessFriendMembers() {
     println(service.value)
     println(service.iSayHolla(DEFAULT_FRIEND))

src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt

@@ -15,7 +15,7 @@
  */
 package io.bazel.kotlin
 
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class KotlinJvmBasicAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/basic") {
   @Test

src/test/kotlin/io/bazel/kotlin/KotlinJvmKaptAssertionTest.kt

@@ -15,7 +15,7 @@
  */
 package io.bazel.kotlin
 
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class KotlinJvmKaptAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/kapt") {
   @Test

src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt

@@ -1,6 +1,6 @@
 package io.bazel.kotlin
 
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 

src/test/kotlin/io/bazel/kotlin/KotlinNormalizationAssertionTest.kt

@@ -16,7 +16,7 @@
 package io.bazel.kotlin
 
 import org.junit.Ignore
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class KotlinNormalizationAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/basic") {
   /*

src/test/kotlin/io/bazel/kotlin/builder/tasks/js/KotlinBuilderJsTest.java

@@ -2,7 +2,7 @@
 
 import io.bazel.kotlin.builder.Deps.Dep;
 import io.bazel.kotlin.builder.KotlinJsTestBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMergerTest.kt

@@ -11,7 +11,7 @@ import io.bazel.kotlin.builder.utils.jars.JarCreator
 import io.bazel.worker.Status
 import io.bazel.worker.Status.SUCCESS
 import io.bazel.worker.WorkerContext
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import java.io.*

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsParserTest.java

@@ -19,7 +19,7 @@
 
 import com.google.devtools.build.lib.view.proto.Deps;
 import com.google.devtools.build.lib.view.proto.Deps.Dependency.Kind;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmAbiTest.java

@@ -18,7 +18,7 @@
 
 import io.bazel.kotlin.builder.Deps;
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmBasicTest.java

@@ -19,7 +19,7 @@
 import io.bazel.kotlin.builder.Deps;
 import io.bazel.kotlin.builder.DirectoryType;
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmCoverageTest.kt

@@ -18,7 +18,7 @@ package io.bazel.kotlin.builder.tasks.jvm;
 
 import io.bazel.kotlin.builder.DirectoryType
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import java.util.function.Consumer

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmJdepsTest.kt

@@ -20,7 +20,7 @@ import com.google.common.truth.Truth.assertThat
 import com.google.devtools.build.lib.view.proto.Deps
 import io.bazel.kotlin.builder.Deps.*
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 import java.io.BufferedInputStream

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmKaptTest.java

@@ -19,7 +19,7 @@
 import io.bazel.kotlin.builder.Deps.Dep;
 import io.bazel.kotlin.builder.DirectoryType;
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmStrictDepsTest.kt

@@ -19,7 +19,7 @@ package io.bazel.kotlin.builder.tasks.jvm;
 import com.google.common.truth.Truth.assertThat
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder
 import org.junit.After
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import java.util.function.Consumer

src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinJvmTaskExecutorTest.kt

@@ -1,7 +1,7 @@
 package io.bazel.kotlin.builder.tasks.jvm
 
 import io.bazel.kotlin.builder.KotlinJvmTestBuilder
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull

src/test/kotlin/io/bazel/kotlin/builder/utils/ArgMapTest.kt

@@ -19,7 +19,7 @@ package io.bazel.kotlin.builder.utils
 
 import com.google.common.truth.Truth
 import org.junit.Assert
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 

src/test/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel

@@ -1,4 +1,4 @@
-load("//kotlin:jvm.bzl", "kt_jvm_test")
+load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test")
 load("//src/test/kotlin/io/bazel/kotlin:defs.bzl", "kt_rules_test")
 
 # Copyright 2020 The Bazel Authors. All rights reserved.

src/test/kotlin/io/bazel/kotlin/builder/utils/jars/JarCreatorTest.kt

@@ -2,7 +2,7 @@ package io.bazel.kotlin.builder.utils.jars
 
 import com.google.common.truth.Truth.assertThat
 import io.bazel.testing.Temporary
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import java.util.zip.ZipFile
 
 class JarCreatorTest {

src/test/kotlin/io/bazel/kotlin/builder/utils/jars/SourceJarCreatorTest.java

@@ -16,7 +16,7 @@
 package io.bazel.kotlin.builder.utils.jars;
 
 import com.google.common.truth.StandardSubjectBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;

src/test/kotlin/io/bazel/kotlin/defs.bzl

@@ -11,8 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-load("@rules_java//java:defs.bzl", "java_test")
-load("//kotlin:jvm.bzl", "kt_jvm_test")
+load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test")
 
 def _get_class_name(kwargs):
     if len(kwargs.get("srcs", [])) == 1:
@@ -50,11 +49,7 @@ def kt_rules_test(name, **kwargs):
         args["jvm_flags"].append("-D%s=$(rlocationpath %s)" % (dep.replace("/", ".").replace(":", "."), dep))
 
     args.setdefault("test_class", _get_class_name(kwargs))
-    for f in args.get("srcs"):
-        if f.endswith(".kt"):
-            kt_jvm_test(name = name, **args)
-            return
-    java_test(name = name, **args)
+    kt_jvm_test(name = name, **args)
 
 def kt_rules_e2e_test(name, **kwargs):
     kwargs.setdefault("size", "small")

src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel

@@ -1,4 +1,5 @@
-load("//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test")
+load("//kotlin:jvm.bzl", "kt_jvm_library")
+load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test")
 
 kt_jvm_library(
     name = "lib",

src/test/kotlin/io/bazel/kotlin/integration/MixedSourceCompileTest.kt

@@ -3,7 +3,7 @@ package io.bazel.kotlin.integration
 import com.google.common.truth.Truth
 import com.google.common.truth.Truth.assertWithMessage
 import io.bazel.kotlin.integration.RulesKotlinWorkspace.Companion.build
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import java.nio.file.Files
 
 class MixedSourceCompileTest {

src/test/kotlin/io/bazel/kotlin/integration/WriteWorkspaceTest.kt

@@ -3,7 +3,7 @@ package io.bazel.kotlin.integration
 import com.google.common.truth.Truth.assertThat
 import io.bazel.kotlin.integration.WriteWorkspace.Indenting
 import io.bazel.kotlin.integration.WriteWorkspace.Text
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import java.nio.file.Files.exists
 
 class WriteWorkspaceTest {

src/test/kotlin/io/bazel/worker/BUILD.bazel

@@ -1,4 +1,5 @@
-load("//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test")
+load("//kotlin:jvm.bzl", "kt_jvm_library")
+load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test")
 
 kt_jvm_test(
     name = "IOTest",

src/test/kotlin/io/bazel/worker/IOTest.kt

@@ -20,7 +20,7 @@ package io.bazel.worker
 import com.google.common.truth.Truth.assertThat
 import org.junit.After
 import org.junit.Before
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import java.io.BufferedInputStream
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream

src/test/kotlin/io/bazel/worker/InvocationWorkerTest.kt

@@ -18,7 +18,7 @@
 package io.bazel.worker
 
 import com.google.common.truth.Truth.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class InvocationWorkerTest {
   @Test

src/test/kotlin/io/bazel/worker/JavaPersistentWorkerTest.kt

@@ -20,7 +20,7 @@ package io.bazel.worker
 import com.google.common.truth.Truth.assertThat
 import com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest
 import com.google.devtools.build.lib.worker.WorkerProtocol.WorkResponse
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 import java.nio.charset.StandardCharsets.UTF_8
 import java.util.concurrent.Executors
 

src/test/kotlin/io/bazel/worker/WorkerContextTest.kt

@@ -20,7 +20,7 @@ package io.bazel.worker
 import com.google.common.truth.Truth.assertThat
 import io.bazel.worker.ContextLog.Granularity.DEBUG
 import io.bazel.worker.Status.SUCCESS
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class WorkerContextTest {
   @Test

src/test/kotlin/io/bazel/worker/WorkerEnvironmentTest.kt

@@ -20,7 +20,7 @@ package io.bazel.worker
 import com.google.common.truth.Truth.assertThat
 import com.google.devtools.build.lib.worker.WorkerProtocol
 import com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest
-import org.junit.Test
+import org.junit.jupiter.api.Test;
 
 class WorkerEnvironmentTest {