azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move common logic of js test running on upper level (js)

Browse Source
This commit is contained in:
Ilya Goncharov
2019-09-18 16:28:32 +03:00
parent e750bd302d
commit 09a602d8ad
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunnerCliArgs.kt → libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinTestRunnerCliArgs.kt
+4 -4
View File
@@ -1,11 +1,11 @@
/* /*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* that can be found in the license/LICENSE.txt file. * 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.testing.nodejs package org.jetbrains.kotlin.gradle.targets.js.testing
data class KotlinNodeJsTestRunnerCliArgs( data class KotlinTestRunnerCliArgs(
val moduleNames: List<String>, val moduleNames: List<String>,
val include: Collection<String> = listOf(), val include: Collection<String> = listOf(),
val exclude: Collection<String> = listOf(), val exclude: Collection<String> = listOf(),
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt
+4 -3
View File
@@ -10,12 +10,13 @@ import org.gradle.process.ProcessForkOptions
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesClientSettings
import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutionSpec
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm
import org.jetbrains.kotlin.gradle.targets.js.KotlinGradleNpmPackage import org.jetbrains.kotlin.gradle.targets.js.KotlinGradleNpmPackage
import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm
import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinTestRunnerCliArgs
import org.jetbrains.kotlin.gradle.testing.IgnoredTestSuites import org.jetbrains.kotlin.gradle.testing.IgnoredTestSuites
class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : KotlinJsTestFramework { class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : KotlinJsTestFramework {
@@ -37,7 +38,7 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
): TCServiceMessagesTestExecutionSpec { ): TCServiceMessagesTestExecutionSpec {
val npmProject = compilation.npmProject val npmProject = compilation.npmProject
val cliArgs = KotlinNodeJsTestRunnerCliArgs( val cliArgs = KotlinTestRunnerCliArgs(
task.nodeModulesToLoad.map { npmProject.require(it) }, task.nodeModulesToLoad.map { npmProject.require(it) },
task.includePatterns, task.includePatterns,
task.excludePatterns, task.excludePatterns,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/testing/options.kt
+5 -5
View File
@@ -1,12 +1,12 @@
package org.jetbrains.kotlin.gradle.testing package org.jetbrains.kotlin.gradle.testing
import org.jetbrains.kotlin.gradle.targets.js.testing.nodejs.KotlinNodeJsTestRunnerCliArgs import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinTestRunnerCliArgs
@Suppress("EnumEntryName") @Suppress("EnumEntryName")
enum class IgnoredTestSuites(val cli: KotlinNodeJsTestRunnerCliArgs.IgnoredTestSuitesReporting) { enum class IgnoredTestSuites(val cli: KotlinTestRunnerCliArgs.IgnoredTestSuitesReporting) {
hide(KotlinNodeJsTestRunnerCliArgs.IgnoredTestSuitesReporting.skip), hide(KotlinTestRunnerCliArgs.IgnoredTestSuitesReporting.skip),
showWithContents(KotlinNodeJsTestRunnerCliArgs.IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored), showWithContents(KotlinTestRunnerCliArgs.IgnoredTestSuitesReporting.reportAllInnerTestsAsIgnored),
showWithoutContents(KotlinNodeJsTestRunnerCliArgs.IgnoredTestSuitesReporting.reportAsIgnoredTest) showWithoutContents(KotlinTestRunnerCliArgs.IgnoredTestSuitesReporting.reportAsIgnoredTest)
} }
@Suppress("EnumEntryName") @Suppress("EnumEntryName")