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

Move nested classes

Browse Source
This commit is contained in:
Ilya Goncharov
2019-09-12 14:32:34 +03:00
parent 6277267563
commit 9bb5022eb4
2 changed files with 16 additions and 18 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/karma/KarmaConfig.kt
+15 -16
View File
@@ -17,21 +17,20 @@ data class KarmaConfig(
val reporters: MutableList<String> = mutableListOf(), val reporters: MutableList<String> = mutableListOf(),
val preprocessors: MutableMap<String, MutableList<String>> = mutableMapOf(), val preprocessors: MutableMap<String, MutableList<String>> = mutableMapOf(),
var coverageReporter: CoverageReporter? = null var coverageReporter: CoverageReporter? = null
) { )
data class CoverageReporter(
var dir: String,
val reporters: MutableList<Reporter> = mutableListOf()
) {
data class Reporter( class CustomLauncher(var base: String) {
val type: String, val flags = mutableListOf<String>()
val subDir: String? = null, var debug: Boolean? = null
val file: String? = null }
)
}
class CustomLauncher(var base: String) { data class CoverageReporter(
val flags = mutableListOf<String>() var dir: String,
var debug: Boolean? = null val reporters: MutableList<Reporter> = mutableListOf()
} )
}
data class Reporter(
val type: String,
val subDir: String? = null,
val file: String? = null
)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+1 -2
View File
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
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.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.KotlinJsTestFramework
import org.jetbrains.kotlin.gradle.targets.js.testing.karma.KarmaConfig.CoverageReporter.Reporter
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import org.jetbrains.kotlin.gradle.testing.internal.reportsDir import org.jetbrains.kotlin.gradle.testing.internal.reportsDir
import org.slf4j.Logger import org.slf4j.Logger
@@ -188,7 +187,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
val reportDir = project.reportsDir.resolve("coverage/${it.name}") val reportDir = project.reportsDir.resolve("coverage/${it.name}")
reportDir.mkdirs() reportDir.mkdirs()
config.coverageReporter = KarmaConfig.CoverageReporter(reportDir.canonicalPath).also { coverage -> config.coverageReporter = CoverageReporter(reportDir.canonicalPath).also { coverage ->
if (html) coverage.reporters.add(Reporter("html")) if (html) coverage.reporters.add(Reporter("html"))
if (lcov) coverage.reporters.add(Reporter("lcovonly")) if (lcov) coverage.reporters.add(Reporter("lcovonly"))
if (cobertura) coverage.reporters.add(Reporter("cobertura")) if (cobertura) coverage.reporters.add(Reporter("cobertura"))