From 7a2638eedab40cb337227529ec73c95d15611b2b Mon Sep 17 00:00:00 2001 From: Corbin McNeely-Smith <58151731+restingbull@users.noreply.github.com> Date: Fri, 22 Mar 2024 08:11:29 -0500 Subject: [PATCH] Revert "[testing] Switch to junit5 (#1128)" This reverts commit 60e1636b050c40bbccccc07d2735a4156b6ca7ca. --- MODULE.bazel | 35 ++++++++----------- docs/kotlin.md | 3 +- kotlin/internal/jvm/impl.bzl | 5 +-- kotlin/internal/jvm/jvm.bzl | 5 --- src/main/starlark/core/repositories/setup.bzl | 5 --- src/test/kotlin/BUILD.bazel | 0 .../kotlin/io/bazel/kotlin/KotlinJvm13Test.kt | 2 +- .../KotlinJvmAssociatesBasicVisibilityTest.kt | 3 +- .../kotlin/KotlinJvmBasicAssertionTest.kt | 2 +- .../kotlin/KotlinJvmKaptAssertionTest.kt | 2 +- .../bazel/kotlin/KotlinJvmKspAssertionTest.kt | 2 +- .../KotlinNormalizationAssertionTest.kt | 2 +- .../builder/tasks/js/KotlinBuilderJsTest.java | 2 +- .../builder/tasks/jvm/JdepsMergerTest.kt | 2 +- .../builder/tasks/jvm/JdepsParserTest.java | 2 +- .../tasks/jvm/KotlinBuilderJvmAbiTest.java | 2 +- .../tasks/jvm/KotlinBuilderJvmBasicTest.java | 2 +- .../tasks/jvm/KotlinBuilderJvmCoverageTest.kt | 2 +- .../tasks/jvm/KotlinBuilderJvmJdepsTest.kt | 2 +- .../tasks/jvm/KotlinBuilderJvmKaptTest.java | 2 +- .../jvm/KotlinBuilderJvmStrictDepsTest.kt | 2 +- .../tasks/jvm/KotlinJvmTaskExecutorTest.kt | 2 +- .../bazel/kotlin/builder/utils/ArgMapTest.kt | 2 +- .../io/bazel/kotlin/builder/utils/BUILD.bazel | 2 +- .../builder/utils/jars/JarCreatorTest.kt | 2 +- .../utils/jars/SourceJarCreatorTest.java | 2 +- src/test/kotlin/io/bazel/kotlin/defs.bzl | 9 +++-- .../io/bazel/kotlin/integration/BUILD.bazel | 3 +- .../integration/MixedSourceCompileTest.kt | 2 +- .../kotlin/integration/WriteWorkspaceTest.kt | 2 +- src/test/kotlin/io/bazel/worker/BUILD.bazel | 3 +- src/test/kotlin/io/bazel/worker/IOTest.kt | 2 +- .../io/bazel/worker/InvocationWorkerTest.kt | 2 +- .../bazel/worker/JavaPersistentWorkerTest.kt | 2 +- .../io/bazel/worker/WorkerContextTest.kt | 2 +- .../io/bazel/worker/WorkerEnvironmentTest.kt | 2 +- src/test/kotlin/kt_junit5_test.bzl | 20 ----------- 37 files changed, 53 insertions(+), 90 deletions(-) delete mode 100644 src/test/kotlin/BUILD.bazel delete mode 100644 src/test/kotlin/kt_junit5_test.bzl diff --git a/MODULE.bazel b/MODULE.bazel index 333ef17fd..18fa33121 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -53,34 +53,29 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( name = "kotlin_rules_maven", artifacts = [ - "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.service:auto-service-annotations:jar:1.1.1", + "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", - "com.google.auto.value:auto-value-annotations:1.10.1", + "com.google.auto.service:auto-service-annotations:1.0.1", "com.google.auto.value:auto-value:1.10.1", - "com.google.code.findbugs:jsr305:3.0.2", + "com.google.auto.value:auto-value-annotations:1.10.1", + "com.google.dagger:dagger:2.43.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", - "junit:junit:4.13-beta-3", + "org.pantsbuild:jarjar:1.7.2", "org.jetbrains.kotlinx:atomicfu-js:0.15.2", "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc", - "org.pantsbuild:jarjar:1.7.2", + "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", ], fail_if_repin_required = True, fetch_sources = True, diff --git a/docs/kotlin.md b/docs/kotlin.md index 15987c55d..293e3e7c0 100755 --- a/docs/kotlin.md +++ b/docs/kotlin.md @@ -206,7 +206,7 @@ kt_jvm_library(name, name, associates, data, deps, env, javac_opts, jvm_flags, kotlinc_opts, main_class, module_name, plugins, resource_jars, resource_strip_prefix, resources, runtime_deps, srcs, - test_class, use_testrunner) + test_class) Setup a simple kotlin_test. @@ -238,7 +238,6 @@ kt_jvm_test(name, 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. | List of labels | optional | [] | |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. | List of labels | optional | [] | |test_class | The Java class to be loaded by the test runner. | String | optional | "" | -|use_testrunner | Use bazel test runner. When disabled, an alternative test runner implementation should be provided and selected via main_class. | Boolean | optional | True | diff --git a/kotlin/internal/jvm/impl.bzl b/kotlin/internal/jvm/impl.bzl index b764289cb..252361bb7 100644 --- a/kotlin/internal/jvm/impl.bzl +++ b/kotlin/internal/jvm/impl.bzl @@ -264,10 +264,7 @@ _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 if ctx.attr.use_testrunner else [], - transitive = [providers.java.transitive_runtime_jars], - ) + runtime_jars = depset(ctx.files._bazel_test_runner, transitive = [providers.java.transitive_runtime_jars]) coverage_runfiles = [] if ctx.configuration.coverage_enabled: diff --git a/kotlin/internal/jvm/jvm.bzl b/kotlin/internal/jvm/jvm.bzl index 8d373ce8b..bef495e43 100644 --- a/kotlin/internal/jvm/jvm.bzl +++ b/kotlin/internal/jvm/jvm.bzl @@ -344,11 +344,6 @@ 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 = "", diff --git a/src/main/starlark/core/repositories/setup.bzl b/src/main/starlark/core/repositories/setup.bzl index b4db8b665..72afe746a 100644 --- a/src/main/starlark/core/repositories/setup.bzl +++ b/src/main/starlark/core/repositories/setup.bzl @@ -56,11 +56,6 @@ 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/", diff --git a/src/test/kotlin/BUILD.bazel b/src/test/kotlin/BUILD.bazel deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinJvm13Test.kt b/src/test/kotlin/io/bazel/kotlin/KotlinJvm13Test.kt index 593b8e191..df50858b6 100644 --- a/src/test/kotlin/io/bazel/kotlin/KotlinJvm13Test.kt +++ b/src/test/kotlin/io/bazel/kotlin/KotlinJvm13Test.kt @@ -1,6 +1,6 @@ package io.bazel.kotlin -import org.junit.jupiter.api.Test; +import org.junit.Test class KotlinJvm13Test { @Test diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinJvmAssociatesBasicVisibilityTest.kt b/src/test/kotlin/io/bazel/kotlin/KotlinJvmAssociatesBasicVisibilityTest.kt index c9c4d469a..84edcc504 100644 --- a/src/test/kotlin/io/bazel/kotlin/KotlinJvmAssociatesBasicVisibilityTest.kt +++ b/src/test/kotlin/io/bazel/kotlin/KotlinJvmAssociatesBasicVisibilityTest.kt @@ -1,6 +1,5 @@ package io.bazel.kotlin -import org.junit.jupiter.api.Test import test.DEFAULT_FRIEND import test.Service @@ -11,7 +10,7 @@ import test.Service class KotlinJvmAssociatesBasicVisibilityTest { val service: Service = Service() - @Test + @org.junit.Test fun testCanAccessFriendMembers() { println(service.value) println(service.iSayHolla(DEFAULT_FRIEND)) diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt b/src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt index 52d3de683..33a7b76b8 100644 --- a/src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt +++ b/src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt @@ -15,7 +15,7 @@ */ package io.bazel.kotlin -import org.junit.jupiter.api.Test; +import org.junit.Test class KotlinJvmBasicAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/basic") { @Test diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinJvmKaptAssertionTest.kt b/src/test/kotlin/io/bazel/kotlin/KotlinJvmKaptAssertionTest.kt index 190722ff1..f4cba09dd 100644 --- a/src/test/kotlin/io/bazel/kotlin/KotlinJvmKaptAssertionTest.kt +++ b/src/test/kotlin/io/bazel/kotlin/KotlinJvmKaptAssertionTest.kt @@ -15,7 +15,7 @@ */ package io.bazel.kotlin -import org.junit.jupiter.api.Test; +import org.junit.Test class KotlinJvmKaptAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/kapt") { @Test diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt b/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt index 91dc80f93..4966df3bd 100644 --- a/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt +++ b/src/test/kotlin/io/bazel/kotlin/KotlinJvmKspAssertionTest.kt @@ -1,6 +1,6 @@ package io.bazel.kotlin -import org.junit.jupiter.api.Test; +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 diff --git a/src/test/kotlin/io/bazel/kotlin/KotlinNormalizationAssertionTest.kt b/src/test/kotlin/io/bazel/kotlin/KotlinNormalizationAssertionTest.kt index 60a92dab7..1124c21f1 100644 --- a/src/test/kotlin/io/bazel/kotlin/KotlinNormalizationAssertionTest.kt +++ b/src/test/kotlin/io/bazel/kotlin/KotlinNormalizationAssertionTest.kt @@ -16,7 +16,7 @@ package io.bazel.kotlin import org.junit.Ignore -import org.junit.jupiter.api.Test; +import org.junit.Test class KotlinNormalizationAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/basic") { /* diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/js/KotlinBuilderJsTest.java b/src/test/kotlin/io/bazel/kotlin/builder/tasks/js/KotlinBuilderJsTest.java index ab6d51fbc..56450d0e7 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/js/KotlinBuilderJsTest.java +++ b/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.jupiter.api.Test; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMergerTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMergerTest.kt index 94985629b..2f4e2b187 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsMergerTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import java.io.* diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsParserTest.java b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsParserTest.java index 88bca6c39..827486db3 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/JdepsParserTest.java +++ b/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.jupiter.api.Test; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmAbiTest.java b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmAbiTest.java index 13b2b0f83..7f11c07ea 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmAbiTest.java +++ b/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.jupiter.api.Test; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmBasicTest.java b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmBasicTest.java index ee28704ab..d428f5778 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmBasicTest.java +++ b/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.jupiter.api.Test; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmCoverageTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmCoverageTest.kt index fc9b586b6..e07b5424d 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmCoverageTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import java.util.function.Consumer diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmJdepsTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmJdepsTest.kt index 1a0253a48..30a1dcea8 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmJdepsTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized import java.io.BufferedInputStream diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmKaptTest.java b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmKaptTest.java index f32fd22d0..a1f0bfdf7 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmKaptTest.java +++ b/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.jupiter.api.Test; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmStrictDepsTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmStrictDepsTest.kt index edddb226c..a1d6cd842 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinBuilderJvmStrictDepsTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import java.util.function.Consumer diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinJvmTaskExecutorTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinJvmTaskExecutorTest.kt index 19f229962..94f705af2 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/tasks/jvm/KotlinJvmTaskExecutorTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotNull diff --git a/src/test/kotlin/io/bazel/kotlin/builder/utils/ArgMapTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/utils/ArgMapTest.kt index 0dadd3d32..0567055bf 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/utils/ArgMapTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 diff --git a/src/test/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel b/src/test/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel index 89b0a0cea..c6d6ef16f 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel +++ b/src/test/kotlin/io/bazel/kotlin/builder/utils/BUILD.bazel @@ -1,4 +1,4 @@ -load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test") +load("//kotlin:jvm.bzl", "kt_jvm_test") load("//src/test/kotlin/io/bazel/kotlin:defs.bzl", "kt_rules_test") # Copyright 2020 The Bazel Authors. All rights reserved. diff --git a/src/test/kotlin/io/bazel/kotlin/builder/utils/jars/JarCreatorTest.kt b/src/test/kotlin/io/bazel/kotlin/builder/utils/jars/JarCreatorTest.kt index 4cd537cfb..cac85cbf3 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/utils/jars/JarCreatorTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import java.util.zip.ZipFile class JarCreatorTest { diff --git a/src/test/kotlin/io/bazel/kotlin/builder/utils/jars/SourceJarCreatorTest.java b/src/test/kotlin/io/bazel/kotlin/builder/utils/jars/SourceJarCreatorTest.java index a928a8300..fbaa6c5f7 100644 --- a/src/test/kotlin/io/bazel/kotlin/builder/utils/jars/SourceJarCreatorTest.java +++ b/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.jupiter.api.Test; +import org.junit.Test; import java.util.Arrays; import java.util.List; diff --git a/src/test/kotlin/io/bazel/kotlin/defs.bzl b/src/test/kotlin/io/bazel/kotlin/defs.bzl index 8de197dd5..a94783daf 100644 --- a/src/test/kotlin/io/bazel/kotlin/defs.bzl +++ b/src/test/kotlin/io/bazel/kotlin/defs.bzl @@ -11,7 +11,8 @@ # 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("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test") +load("@rules_java//java:defs.bzl", "java_test") +load("//kotlin:jvm.bzl", "kt_jvm_test") def _get_class_name(kwargs): if len(kwargs.get("srcs", [])) == 1: @@ -49,7 +50,11 @@ 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)) - kt_jvm_test(name = name, **args) + for f in args.get("srcs"): + if f.endswith(".kt"): + kt_jvm_test(name = name, **args) + return + java_test(name = name, **args) def kt_rules_e2e_test(name, **kwargs): kwargs.setdefault("size", "small") diff --git a/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel b/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel index 4be9827ab..8ae74f48b 100644 --- a/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel +++ b/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel @@ -1,5 +1,4 @@ -load("//kotlin:jvm.bzl", "kt_jvm_library") -load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test") +load("//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") kt_jvm_library( name = "lib", diff --git a/src/test/kotlin/io/bazel/kotlin/integration/MixedSourceCompileTest.kt b/src/test/kotlin/io/bazel/kotlin/integration/MixedSourceCompileTest.kt index 181313077..98f735e66 100644 --- a/src/test/kotlin/io/bazel/kotlin/integration/MixedSourceCompileTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import java.nio.file.Files class MixedSourceCompileTest { diff --git a/src/test/kotlin/io/bazel/kotlin/integration/WriteWorkspaceTest.kt b/src/test/kotlin/io/bazel/kotlin/integration/WriteWorkspaceTest.kt index ea4cc5e8c..0af80edcd 100644 --- a/src/test/kotlin/io/bazel/kotlin/integration/WriteWorkspaceTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import java.nio.file.Files.exists class WriteWorkspaceTest { diff --git a/src/test/kotlin/io/bazel/worker/BUILD.bazel b/src/test/kotlin/io/bazel/worker/BUILD.bazel index 8f84cb386..4a207ac7f 100644 --- a/src/test/kotlin/io/bazel/worker/BUILD.bazel +++ b/src/test/kotlin/io/bazel/worker/BUILD.bazel @@ -1,5 +1,4 @@ -load("//kotlin:jvm.bzl", "kt_jvm_library") -load("//src/test/kotlin:kt_junit5_test.bzl", "kt_jvm_test") +load("//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test") kt_jvm_test( name = "IOTest", diff --git a/src/test/kotlin/io/bazel/worker/IOTest.kt b/src/test/kotlin/io/bazel/worker/IOTest.kt index 5e21d1ace..55cdf4116 100644 --- a/src/test/kotlin/io/bazel/worker/IOTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import java.io.BufferedInputStream import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream diff --git a/src/test/kotlin/io/bazel/worker/InvocationWorkerTest.kt b/src/test/kotlin/io/bazel/worker/InvocationWorkerTest.kt index fa2083311..8fadb3639 100644 --- a/src/test/kotlin/io/bazel/worker/InvocationWorkerTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test class InvocationWorkerTest { @Test diff --git a/src/test/kotlin/io/bazel/worker/JavaPersistentWorkerTest.kt b/src/test/kotlin/io/bazel/worker/JavaPersistentWorkerTest.kt index 3704d9a8d..937c3ea83 100644 --- a/src/test/kotlin/io/bazel/worker/JavaPersistentWorkerTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test import java.nio.charset.StandardCharsets.UTF_8 import java.util.concurrent.Executors diff --git a/src/test/kotlin/io/bazel/worker/WorkerContextTest.kt b/src/test/kotlin/io/bazel/worker/WorkerContextTest.kt index d7642af21..97e6eb77a 100644 --- a/src/test/kotlin/io/bazel/worker/WorkerContextTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test class WorkerContextTest { @Test diff --git a/src/test/kotlin/io/bazel/worker/WorkerEnvironmentTest.kt b/src/test/kotlin/io/bazel/worker/WorkerEnvironmentTest.kt index 122adc0a7..e19581ff2 100644 --- a/src/test/kotlin/io/bazel/worker/WorkerEnvironmentTest.kt +++ b/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.jupiter.api.Test; +import org.junit.Test class WorkerEnvironmentTest { diff --git a/src/test/kotlin/kt_junit5_test.bzl b/src/test/kotlin/kt_junit5_test.bzl deleted file mode 100644 index 66a371e28..000000000 --- a/src/test/kotlin/kt_junit5_test.bzl +++ /dev/null @@ -1,20 +0,0 @@ -load("//kotlin:jvm.bzl", _kt_jvm_test = "kt_jvm_test") - -def kt_jvm_test(name, args = [], deps = [], runtime_deps = [], **kwargs): - test_package = native.package_name().replace("src/test/kotlin", "").replace("/", ".") - - _kt_jvm_test( - name = name, - use_testrunner = False, - args = args + ["--select-package", test_package], - main_class = "org.junit.platform.console.ConsoleLauncher", - deps = deps + [ - "@kotlin_rules_maven//:org_junit_jupiter_junit_jupiter_api", - "@kotlin_rules_maven//:org_junit_jupiter_junit_jupiter_params", - "@kotlin_rules_maven//:org_junit_jupiter_junit_jupiter_engine", - ], - runtime_deps = runtime_deps + [ - "@kotlin_rules_maven//:org_junit_platform_junit_platform_console", - ], - **kwargs - )