From e451eb86611cff3a5dabaf4e7dc3ad7df9fae742 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 2 Jan 2016 10:04:12 -0800 Subject: [PATCH] Only run the suite once. --- .../com/beust/kobalt/internal/TestNgRunner.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 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 a792f2cb..1fb52369 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 @@ -26,16 +26,19 @@ public class TestNgRunner() : GenericTestRunner() { } addAll(project.testArgs) - val testngXml = File(project.directory, KFiles.joinDir("src", "test", "resources", "testng.xml")) - if (testngXml.exists()) { - add(testngXml.absolutePath) - } else { - val testClasses = findTestClasses(project) - if (testClasses.size > 0) { - add("-testclass") - add(testClasses.joinToString(",")) + 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")) + if (testngXml.exists()) { + add(testngXml.absolutePath) } else { - warn("Couldn't find any test classes for ${project.name}") + val testClasses = findTestClasses(project) + if (testClasses.size > 0) { + add("-testclass") + add(testClasses.joinToString(",")) + } else { + warn("Couldn't find any test classes for ${project.name}") + } } } }