erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Rename.

Browse source
This commit is contained in:
Cedric Beust 2016-02-20 11:17:04 -08:00
parent c4f4366357
commit f3c2e8f4c2
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt
View file

@ -9,7 +9,7 @@ class TestConfig(val project: Project) {
val testIncludes = arrayListOf("**/*Test.class") val testIncludes = arrayListOf("**/*Test.class")
val testExcludes = arrayListOf<String>() val testExcludes = arrayListOf<String>()
var configName: String = "" var name: String = ""
fun args(vararg arg: String) { fun args(vararg arg: String) {
testArgs.addAll(arg) testArgs.addAll(arg)
@ -38,11 +38,11 @@ class TestConfig(val project: Project) {
fun Project.test(init: TestConfig.() -> Unit) = let { project -> fun Project.test(init: TestConfig.() -> Unit) = let { project ->
with(testConfigs) { with(testConfigs) {
val tf = TestConfig(project).apply { init() } val tf = TestConfig(project).apply { init() }
if (! map { it.configName }.contains(tf.configName)) { if (! map { it.name }.contains(tf.name)) {
add(tf) add(tf)
} else { } else {
throw KobaltException("Test configuration \"${tf.configName}\" already exists, give it a different " throw KobaltException("Test configuration \"${tf.name}\" already exists, give it a different "
+ "name with test { configName = ... }") + "name with test { name = ... }")
} }
} }
} }

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt
View file

@ -51,7 +51,7 @@ abstract class GenericTestRunner : ITestRunnerContributor {
val java = jvm.javaExecutable val java = jvm.javaExecutable
var result = false var result = false
val testConfig = project.testConfigs.firstOrNull { it.configName == configName } val testConfig = project.testConfigs.firstOrNull { it.name == configName }
if (testConfig != null) { if (testConfig != null) {
val args = args(project, classpath, testConfig) val args = args(project, classpath, testConfig)

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -78,11 +78,11 @@ open class JvmCompilerPlugin @Inject constructor(
project.testConfigs.add(TestConfig(project)) project.testConfigs.add(TestConfig(project))
} }
project.testConfigs.forEach { config -> project.testConfigs.forEach { config ->
val taskName = if (config.configName.isEmpty()) "test" else "test" + config.configName val taskName = if (config.name.isEmpty()) "test" else "test" + config.name
taskManager.addTask(this, project, taskName, taskManager.addTask(this, project, taskName,
runAfter = listOf(JvmCompilerPlugin.TASK_COMPILE, JvmCompilerPlugin.TASK_COMPILE_TEST), runAfter = listOf(JvmCompilerPlugin.TASK_COMPILE, JvmCompilerPlugin.TASK_COMPILE_TEST),
task = { taskTest(project, config.configName)} ) task = { taskTest(project, config.name)} )
} }
} }