diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt index f6e4cfed..ecc29809 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/TestDirective.kt @@ -9,7 +9,7 @@ class TestConfig(val project: Project) { val testIncludes = arrayListOf("**/*Test.class") val testExcludes = arrayListOf() - var configName: String = "" + var name: String = "" fun args(vararg arg: String) { testArgs.addAll(arg) @@ -38,11 +38,11 @@ class TestConfig(val project: Project) { fun Project.test(init: TestConfig.() -> Unit) = let { project -> with(testConfigs) { val tf = TestConfig(project).apply { init() } - if (! map { it.configName }.contains(tf.configName)) { + if (! map { it.name }.contains(tf.name)) { add(tf) } else { - throw KobaltException("Test configuration \"${tf.configName}\" already exists, give it a different " - + "name with test { configName = ... }") + throw KobaltException("Test configuration \"${tf.name}\" already exists, give it a different " + + "name with test { name = ... }") } } } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt index 6d4ca323..09b0d787 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/GenericRunner.kt @@ -51,7 +51,7 @@ abstract class GenericTestRunner : ITestRunnerContributor { val java = jvm.javaExecutable var result = false - val testConfig = project.testConfigs.firstOrNull { it.configName == configName } + val testConfig = project.testConfigs.firstOrNull { it.name == configName } if (testConfig != null) { val args = args(project, classpath, testConfig) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt index 02fd09f4..9d6c3645 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt @@ -78,11 +78,11 @@ open class JvmCompilerPlugin @Inject constructor( project.testConfigs.add(TestConfig(project)) } 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, runAfter = listOf(JvmCompilerPlugin.TASK_COMPILE, JvmCompilerPlugin.TASK_COMPILE_TEST), - task = { taskTest(project, config.configName)} ) + task = { taskTest(project, config.name)} ) } }