From 5372fcef69b93fdf7bf5b429beb8c588e8e2e27e Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 11 Apr 2019 11:44:10 +0300 Subject: [PATCH] Gradle, tests: remove "Task" suffix from KotlinTest tasks (as for jvm) --- .../new-mpp-js-tests/build.gradle.kts | 16 ----- .../gradle/plugin/KotlinTargetConfigurator.kt | 4 +- .../KotlinJsCompilationTestsConfigurator.kt | 5 +- .../targets/js/tasks/KotlinNodeJsTestTask.kt | 71 ------------------- .../gradle/targets/js/testing/KotlinJsTest.kt | 25 +++---- .../js/testing/KotlinJsTestFramework.kt | 4 +- .../targets/js/testing/karma/KotlinKarma.kt | 4 +- .../targets/js/testing/mocha/KotlinMocha.kt | 6 +- .../testing/nodejs/KotlinNodeJsTestRunner.kt | 4 +- ...{KotlinJvmTestTask.kt => KotlinJvmTest.kt} | 2 +- .../native/KotlinNativeTargetConfigurator.kt | 4 +- ...nNativeTestTask.kt => KotlinNativeTest.kt} | 5 +- .../{KotlinTestTask.kt => KotlinTest.kt} | 2 +- .../gradle/testing/internal/conventions.kt | 4 +- .../gradle/testing/internal/testsRegistry.kt | 2 - 15 files changed, 28 insertions(+), 130 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/tasks/KotlinNodeJsTestTask.kt rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/{KotlinJvmTestTask.kt => KotlinJvmTest.kt} (97%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/{KotlinNativeTestTask.kt => KotlinNativeTest.kt} (94%) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/{KotlinTestTask.kt => KotlinTest.kt} (96%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts index cc0819b599c..37798e29385 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.targets.js.tasks.KotlinNodeJsTestTask - plugins { kotlin("multiplatform").version("") } @@ -25,18 +23,4 @@ kotlin { js("server") js("client") -} - -tasks { - "jsCommonTest"(KotlinNodeJsTestTask::class) { - ignoreFailures = true - } - - "clientTest"(KotlinNodeJsTestTask::class) { - ignoreFailures = true - } - - "serverTest"(KotlinNodeJsTestTask::class) { - ignoreFailures = true - } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt index 7b3f78f04ff..160f6fc045a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt @@ -24,7 +24,7 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.language.jvm.tasks.ProcessResources import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.mpp.* -import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTestTask +import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest import org.jetbrains.kotlin.gradle.testing.internal.registerTestTask import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import java.util.concurrent.Callable @@ -364,7 +364,7 @@ abstract class KotlinTargetConfigurator ?: return // Otherwise, there is no runtime classpath - target.project.tasks.create(lowerCamelCaseName(target.disambiguationClassifier, testTaskNameSuffix), KotlinJvmTestTask::class.java).apply { + target.project.tasks.create(lowerCamelCaseName(target.disambiguationClassifier, testTaskNameSuffix), KotlinJvmTest::class.java).apply { registerTestTask(this) targetName = target.disambiguationClassifier diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationTestsConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationTestsConfigurator.kt index 9ff17c1bb8c..419e1c1a71b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationTestsConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsCompilationTestsConfigurator.kt @@ -3,8 +3,7 @@ package org.jetbrains.kotlin.gradle.targets.js import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationToRunnableFiles import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin -import org.jetbrains.kotlin.gradle.targets.js.tasks.KotlinNodeJsTestTask -import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin +import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.testing.internal.configureConventions @@ -41,7 +40,7 @@ internal class KotlinJsCompilationTestsConfigurator( // apply plugin (cannot do it lazy) val nodeJs = NodeJsPlugin[target.project] - registerTask(project, testTaskName, KotlinNodeJsTestTask::class.java) { testJs -> + registerTask(project, testTaskName, KotlinJsTest::class.java) { testJs -> testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP testJs.dependsOn(compileTestKotlin2Js, nodeJs.nodeJsSetupTask) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/tasks/KotlinNodeJsTestTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/tasks/KotlinNodeJsTestTask.kt deleted file mode 100644 index 90755e71e27..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/tasks/KotlinNodeJsTestTask.kt +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.targets.js.tasks - -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal -import org.gradle.process.internal.DefaultProcessForkOptions -import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec -import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectLayout -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmResolver -import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework -import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma -import org.jetbrains.kotlin.gradle.targets.js.testing.nodejs.KotlinNodeJsTestRunner -import org.jetbrains.kotlin.gradle.targets.js.testing.mocha.KotlinMocha -import org.jetbrains.kotlin.gradle.tasks.KotlinTestTask - -open class KotlinNodeJsTestTask : KotlinTestTask() { - @Internal - private var testFramework: KotlinJsTestFramework = KotlinNodeJsTestRunner() - - @Input - var debug: Boolean = false - - @Internal - var runtimeDependencyHandler: HasKotlinDependencies? = null - - @Input - var nodeModulesToLoad: MutableList = mutableListOf() - - fun useNodeJs(body: KotlinNodeJsTestRunner.() -> Unit) = use(KotlinNodeJsTestRunner(), body) - - fun useMocha(body: KotlinMocha.() -> Unit) = use(KotlinMocha(), body) - - fun useKarma(body: KotlinKarma.() -> Unit) = use(KotlinKarma(), body) - - private inline fun use(runner: T, body: T.() -> Unit) { - testFramework = runner.also(body) - - val dependenciesHolder = runtimeDependencyHandler - if (dependenciesHolder != null) { - testFramework.configure(dependenciesHolder) - } - } - - override fun executeTests() { - NpmResolver.resolve(project) - super.executeTests() - } - - override fun createTestExecutionSpec(): TCServiceMessagesTestExecutionSpec { - val forkOptions = DefaultProcessForkOptions(fileResolver) - - NpmResolver.resolve(project) - - forkOptions.workingDir = NpmProjectLayout[project].nodeWorkDir - forkOptions.executable = NodeJsPlugin[project].buildEnv().nodeExecutable - - val nodeJsArgs = mutableListOf() - - if (debug) { - nodeJsArgs.add("--inspect-brk") - } - - return testFramework.createTestExecutionSpec(this, forkOptions, nodeJsArgs) - } -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt index 436a6bca7e1..850f42b9fcb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTest.kt @@ -7,22 +7,20 @@ package org.jetbrains.kotlin.gradle.targets.js.testing import org.gradle.api.tasks.Input import org.gradle.api.tasks.Internal -import org.gradle.api.tasks.SkipWhenEmpty import org.gradle.process.internal.DefaultProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject +import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectLayout import org.jetbrains.kotlin.gradle.targets.js.npm.NpmResolver import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KotlinKarma -import org.jetbrains.kotlin.gradle.targets.js.testing.mocha.KotlinMocha import org.jetbrains.kotlin.gradle.targets.js.testing.nodejs.KotlinNodeJsTestRunner +import org.jetbrains.kotlin.gradle.targets.js.testing.mocha.KotlinMocha import org.jetbrains.kotlin.gradle.tasks.KotlinTest open class KotlinJsTest : KotlinTest() { @Internal - @SkipWhenEmpty - internal var testFramework: KotlinJsTestFramework? = null + private var testFramework: KotlinJsTestFramework = KotlinNodeJsTestRunner() @Input var debug: Boolean = false @@ -39,20 +37,13 @@ open class KotlinJsTest : KotlinTest() { fun useKarma(body: KotlinKarma.() -> Unit) = use(KotlinKarma(), body) - private inline fun use(runner: T, body: T.() -> Unit): T { - check(testFramework == null) { - "testFramework already configured for task ${this.path}" - } - - val testFramework = runner.also(body) - this.testFramework = testFramework + private inline fun use(runner: T, body: T.() -> Unit) { + testFramework = runner.also(body) val dependenciesHolder = runtimeDependencyHandler if (dependenciesHolder != null) { testFramework.configure(dependenciesHolder) } - - return testFramework } override fun executeTests() { @@ -65,8 +56,8 @@ open class KotlinJsTest : KotlinTest() { NpmResolver.resolve(project) - forkOptions.workingDir = NpmProject[project].nodeWorkDir - forkOptions.executable = NodeJsPlugin.apply(project).root.environment.nodeExecutable + forkOptions.workingDir = NpmProjectLayout[project].nodeWorkDir + forkOptions.executable = NodeJsPlugin[project].buildEnv().nodeExecutable val nodeJsArgs = mutableListOf() @@ -74,6 +65,6 @@ open class KotlinJsTest : KotlinTest() { nodeJsArgs.add("--inspect-brk") } - return testFramework!!.createTestExecutionSpec(this, forkOptions, nodeJsArgs) + return testFramework.createTestExecutionSpec(this, forkOptions, nodeJsArgs) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTestFramework.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTestFramework.kt index a0a960ace11..e7f72efcadd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTestFramework.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinJsTestFramework.kt @@ -8,12 +8,10 @@ package org.jetbrains.kotlin.gradle.targets.js.testing import org.gradle.process.ProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies -import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler -import org.jetbrains.kotlin.gradle.targets.js.tasks.KotlinNodeJsTestTask interface KotlinJsTestFramework { fun createTestExecutionSpec( - task: KotlinNodeJsTestTask, + task: KotlinJsTest, forkOptions: ProcessForkOptions, nodeJsArgs: MutableList ): TCServiceMessagesTestExecutionSpec diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index c358d042962..ae20848e1b0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuti import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectLayout -import org.jetbrains.kotlin.gradle.targets.js.tasks.KotlinNodeJsTestTask +import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework class KotlinKarma : KotlinJsTestFramework { @@ -31,7 +31,7 @@ class KotlinKarma : KotlinJsTestFramework { } override fun createTestExecutionSpec( - task: KotlinNodeJsTestTask, + task: KotlinJsTest, forkOptions: ProcessForkOptions, nodeJsArgs: MutableList ): TCServiceMessagesTestExecutionSpec { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt index 71974e07e6c..dc1b66c4177 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuti import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectLayout -import org.jetbrains.kotlin.gradle.targets.js.tasks.KotlinNodeJsTestTask +import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework class KotlinMocha : KotlinJsTestFramework { @@ -24,7 +24,7 @@ class KotlinMocha : KotlinJsTestFramework { } override fun createTestExecutionSpec( - task: KotlinNodeJsTestTask, + task: KotlinJsTest, forkOptions: ProcessForkOptions, nodeJsArgs: MutableList ): TCServiceMessagesTestExecutionSpec { @@ -46,7 +46,7 @@ class KotlinMocha : KotlinJsTestFramework { val args = nodeJsArgs + nodeModules.map { npmProjectLayout.nodeModulesDir.resolve(it).also { file -> - check(file.isFile) { "Cannot find ${file.canonicalPath}"} + check(file.isFile) { "Cannot find ${file.canonicalPath}" } }.canonicalPath } + listOf( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt index ff9c47d6a54..24e52ab0a05 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuti import org.jetbrains.kotlin.gradle.plugin.HasKotlinDependencies import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectLayout -import org.jetbrains.kotlin.gradle.targets.js.tasks.KotlinNodeJsTestTask import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework +import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.testing.IgnoredTestSuites class KotlinNodeJsTestRunner : KotlinJsTestFramework { @@ -27,7 +27,7 @@ class KotlinNodeJsTestRunner : KotlinJsTestFramework { } override fun createTestExecutionSpec( - task: KotlinNodeJsTestTask, + task: KotlinJsTest, forkOptions: ProcessForkOptions, nodeJsArgs: MutableList ): TCServiceMessagesTestExecutionSpec { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTestTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTestTask.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt index c0ac686cae1..48f4b674a34 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTestTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt @@ -10,7 +10,7 @@ import org.gradle.api.tasks.Input import org.gradle.api.tasks.Optional import org.gradle.api.tasks.testing.Test -open class KotlinJvmTestTask : Test() { +open class KotlinJvmTest : Test() { @Input @Optional var targetName: String? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt index a70fad6042d..99fc67ac858 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinNativeBinaryContainer import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPILATION_NAME import org.jetbrains.kotlin.gradle.plugin.mpp.* -import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTestTask +import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest import org.jetbrains.kotlin.gradle.tasks.* import org.jetbrains.kotlin.gradle.testing.internal.configureConventions import org.jetbrains.kotlin.gradle.testing.internal.registerTestTask @@ -129,7 +129,7 @@ open class KotlinNativeTargetConfigurator( val taskName = binary.runTaskName ?: return if (binary.isDefaultTestExecutable) { - tasks.create(taskName, KotlinNativeTestTask::class.java).apply { + tasks.create(taskName, KotlinNativeTest::class.java).apply { tasks.maybeCreate(LifecycleBasePlugin.CHECK_TASK_NAME).dependsOn(this) group = LifecycleBasePlugin.VERIFICATION_GROUP diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTestTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTestTask.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTest.kt index 4b3f97cffe7..4b745a554fe 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTestTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTest.kt @@ -14,11 +14,10 @@ import org.gradle.process.internal.DefaultProcessForkOptions import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.targets.native.internal.parseKotlinNativeStackTraceAsJvm -import org.jetbrains.kotlin.gradle.tasks.KotlinTestTask -import org.jetbrains.kotlin.gradle.testing.TestsGrouping +import org.jetbrains.kotlin.gradle.tasks.KotlinTest import java.io.File -open class KotlinNativeTestTask : KotlinTestTask() { +open class KotlinNativeTest : KotlinTest() { @Suppress("LeakingThis") @Internal val processOptions: ProcessForkOptions = DefaultProcessForkOptions(fileResolver) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTestTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTestTask.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt index a14af9a4984..80ee7079fbc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTestTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinTest.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuto import org.jetbrains.kotlin.gradle.utils.injected import javax.inject.Inject -abstract class KotlinTestTask : AbstractTestTask() { +abstract class KotlinTest : AbstractTestTask() { @Input @Optional var targetName: String? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt index 5682e1fe549..06363e139d5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/conventions.kt @@ -10,7 +10,7 @@ import org.gradle.api.internal.plugins.DslObject import org.gradle.api.reporting.ReportingExtension import org.gradle.api.tasks.testing.TestTaskReports import org.gradle.testing.base.plugins.TestingBasePlugin -import org.jetbrains.kotlin.gradle.tasks.KotlinTestTask +import org.jetbrains.kotlin.gradle.tasks.KotlinTest import java.io.File @Suppress("UnstableApiUsage") @@ -22,7 +22,7 @@ internal val Project.reportsDir: File internal val Project.testReportsDir: File get() = reportsDir.resolve(TestingBasePlugin.TESTS_DIR_NAME) -internal fun KotlinTestTask.configureConventions() { +internal fun KotlinTest.configureConventions() { reports.configureConventions(project, name) conventionMapping.map("binResultsDir") { project.testResultsDir.resolve("$name/binary") } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt index 7fd50ae49a5..4430332dbd9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/internal/testsRegistry.kt @@ -10,10 +10,8 @@ import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.tasks.testing.AbstractTestTask import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.gradle.plugin.TaskHolder -import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTestTask import org.jetbrains.kotlin.gradle.tasks.AggregateTestReport import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask -import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeFirstWord private val Project.allTestsTask: TaskHolder get() = locateOrRegisterTask("allTests") { aggregate ->