From 8d2888df3e17c08f8eea1d88f27596490ee29ed2 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Mon, 16 Nov 2015 23:56:36 -0800 Subject: [PATCH] Refactoring. --- .../com/beust/kobalt/internal/TestNgRunner.kt | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt index 00b6266d..69177fc9 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt @@ -10,21 +10,17 @@ public class TestNgRunner(override val project: Project, override val classpath: override val mainClass = "org.testng.TestNG" override val args: List - get() { - arrayListOf().let { - if (project.testArgs.size > 0) { - it.addAll(project.testArgs) + get() = arrayListOf().apply { + if (project.testArgs.size > 0) { + addAll(project.testArgs) + } else { + val testngXml = File(project.directory, KFiles.joinDir("src", "test", "resources", "testng.xml")) + if (testngXml.exists()) { + add(testngXml.absolutePath) } else { - val testngXml = File(project.directory, KFiles.joinDir("src", "test", "resources", "testng.xml")) - if (testngXml.exists()) { - it.add(testngXml.absolutePath) - } else { - it.add("-testclass") - it.addAll(findTestClasses()) - } + add("-testclass") + addAll(findTestClasses()) } - return it } - } }