From ee17996acd0b71acbd746b790e0b8fc709ab0f16 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 2 Jan 2016 14:56:10 -0800 Subject: [PATCH] Text fix. --- .../com/beust/kobalt/internal/TestNgRunner.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 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 1fb52369..53a953f1 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 @@ -20,12 +20,6 @@ public class TestNgRunner() : GenericTestRunner() { if (arg == "-d") addOutput = false } - if (addOutput) { - add("-d") - add(defaultOutput(project)) - } - addAll(project.testArgs) - if (project.testArgs.size == 0) { // No arguments, so we'll do it ourselves. Either testng.xml or the list of classes val testngXml = File(project.directory, KFiles.joinDir("src", "test", "resources", "testng.xml")) @@ -34,12 +28,24 @@ public class TestNgRunner() : GenericTestRunner() { } else { val testClasses = findTestClasses(project) if (testClasses.size > 0) { + if (addOutput) { + add("-d") + add(defaultOutput(project)) + } + addAll(project.testArgs) + add("-testclass") add(testClasses.joinToString(",")) } else { warn("Couldn't find any test classes for ${project.name}") } } + } else { + if (addOutput) { + add("-d") + add(defaultOutput(project)) + } + addAll(project.testArgs) } } }