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

Text fix.

Browse source
This commit is contained in:
Cedric Beust 2016-01-02 14:56:10 -08:00
parent 4a65177d34
commit ee17996acd
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,12 +20,6 @@ public class TestNgRunner() : GenericTestRunner() {
if (arg == "-d") addOutput = false if (arg == "-d") addOutput = false
} }
if (addOutput) {
add("-d")
add(defaultOutput(project))
}
addAll(project.testArgs)
if (project.testArgs.size == 0) { if (project.testArgs.size == 0) {
// No arguments, so we'll do it ourselves. Either testng.xml or the list of classes // 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")) val testngXml = File(project.directory, KFiles.joinDir("src", "test", "resources", "testng.xml"))
@ -34,12 +28,24 @@ public class TestNgRunner() : GenericTestRunner() {
} else { } else {
val testClasses = findTestClasses(project) val testClasses = findTestClasses(project)
if (testClasses.size > 0) { if (testClasses.size > 0) {
if (addOutput) {
add("-d")
add(defaultOutput(project))
}
addAll(project.testArgs)
add("-testclass") add("-testclass")
add(testClasses.joinToString(",")) add(testClasses.joinToString(","))
} else { } else {
warn("Couldn't find any test classes for ${project.name}") warn("Couldn't find any test classes for ${project.name}")
} }
} }
} else {
if (addOutput) {
add("-d")
add(defaultOutput(project))
}
addAll(project.testArgs)
} }
} }
} }