From ebe475c997171f64e9d978986038e3d902c37acb Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Fri, 17 Mar 2017 13:27:01 -0700 Subject: [PATCH] Fix test-output. --- .../com/beust/kobalt/internal/TestNgRunner.kt | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt index 008f2291..f43be88c 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt @@ -16,13 +16,14 @@ class TestNgRunner : GenericTestRunner() { override val annotationPackage = "org.testng" - fun defaultOutput(project: Project) = KFiles.joinDir(project.buildDirectory, "test-output") + fun defaultOutput(project: Project) = KFiles.joinDir(KFiles.KOBALT_BUILD_DIR, project.buildDirectory, "test-output") override fun args(project: Project, context: KobaltContext, classpath: List, testConfig: TestConfig) = arrayListOf().apply { - var addOutput = true - testConfig.testArgs.forEach { arg -> - if (arg == "-d") addOutput = false + + if (testConfig.testArgs.none { it == "-d" }) { + add("-d") + add(defaultOutput(project)) } if (testConfig.testArgs.size == 0) { @@ -32,11 +33,7 @@ class TestNgRunner : GenericTestRunner() { add(testngXml.absolutePath) } else { val testClasses = findTestClasses(project, context, testConfig) - if (testClasses.size > 0) { - if (addOutput) { - add("-d") - add(defaultOutput(project)) - } + if (testClasses.isNotEmpty()) { addAll(testConfig.testArgs) add("-testclass") @@ -48,10 +45,6 @@ class TestNgRunner : GenericTestRunner() { } } } else { - if (addOutput) { - add("-d") - add(defaultOutput(project)) - } addAll(testConfig.testArgs) } }