erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-25 16:07:12 -07:00
Code Releases Activity

Refactor.

Browse source
This commit is contained in:
Cedric Beust 2017-03-22 14:12:07 -07:00
parent 6c16c59aa6
commit 873aea5d5f
1 changed files with 49 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,7 @@ class TestNgRunner : GenericTestRunner() {
val VERSION_6_10 = StringVersion("6.10") val VERSION_6_10 = StringVersion("6.10")
fun _runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>, fun _runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
// override fun runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
configName: String): Boolean { configName: String): Boolean {
val testConfig = project.testConfigs.firstOrNull { it.name == configName } val testConfig = project.testConfigs.firstOrNull { it.name == configName }
@ -72,8 +73,9 @@ class TestNgRunner : GenericTestRunner() {
val testngDependency = (project.testDependencies.filter { it.id.contains("testng") } val testngDependency = (project.testDependencies.filter { it.id.contains("testng") }
.firstOrNull() as AetherDependency).version .firstOrNull() as AetherDependency).version
val versions = findRemoteRunnerVersion(testngDependency) val versions = findRemoteRunnerVersion(testngDependency)
val useOldRunner = System.getProperty("testng.oldRunner") != null
val result = val result =
if (versions != null) { if (versions != null && ! useOldRunner) {
context.logger.log(project.name, 1, "Modern TestNG, displaying colors") context.logger.log(project.name, 1, "Modern TestNG, displaying colors")
displayPrettyColors(project, context, classpath, testConfig, versions) displayPrettyColors(project, context, classpath, testConfig, versions)
} else { } else {
@ -101,48 +103,7 @@ class TestNgRunner : GenericTestRunner() {
private fun displayPrettyColors(project: Project, context: KobaltContext, private fun displayPrettyColors(project: Project, context: KobaltContext,
classpath: List<IClasspathDependency>, testConfig: TestConfig, versions: Pair<String, String>): Boolean { classpath: List<IClasspathDependency>, testConfig: TestConfig, versions: Pair<String, String>): Boolean {
val port = 2345 val port = 2345
// launchRemoteServer(project, context, classpath, testConfig, versions, port)
val testngVersion = versions.first
val remoteRunnerVersion = versions.second
val dep = with(context.dependencyManager) {
val jf = create("org.testng.testng-remote:testng-remote:1.3.0")
val tr = create("org.testng.testng-remote:$remoteRunnerVersion:1.3.0")
val testng = create("org.testng:testng:6.10")
transitiveClosure(listOf(jf, tr /*, testng */))
}
val cp = (classpath + dep).distinct().map { it.jarFile.get() }
.joinToString(File.pathSeparator)
val calculatedArgs = args(project, context, classpath, testConfig)
val jvmArgs = arrayListOf("-classpath", cp)
if (testConfig.jvmArgs.any()) {
jvmArgs.addAll(testConfig.jvmArgs)
}
val remoteArgs = listOf(
"org.testng.remote.RemoteTestNG",
"-serport", port.toString(),
"-version", testngVersion,
"-dontexit",
RemoteArgs.PROTOCOL,
"json")
val passedArgs = jvmArgs + remoteArgs + calculatedArgs
Thread {
runCommand {
command = "java"
directory = File(project.directory)
args = passedArgs
}
}.start()
// Thread {
// val args2 = arrayOf("-serport", port.toString(), "-dontexit", RemoteArgs.PROTOCOL, "json",
// "-version", "6.10",
// "src/test/resources/testng.xml")
// RemoteTestNG.main(args2)
// }.start()
val mh = MessageHub(JsonMessageSender("localhost", port, true)) val mh = MessageHub(JsonMessageSender("localhost", port, true))
mh.setDebug(true) mh.setDebug(true)
@ -189,6 +150,51 @@ class TestNgRunner : GenericTestRunner() {
} }
return failed.isEmpty() && skipped.isEmpty() return failed.isEmpty() && skipped.isEmpty()
} }
fun launchRemoteServer(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
testConfig: TestConfig, versions: Pair<String, String>, port: Int) {
val testngVersion = versions.first
val remoteRunnerVersion = versions.second
val dep = with(context.dependencyManager) {
val jf = create("org.testng.testng-remote:testng-remote:1.3.0")
val tr = create("org.testng.testng-remote:$remoteRunnerVersion:1.3.0")
val testng = create("org.testng:testng:6.10")
transitiveClosure(kotlin.collections.listOf(jf, tr /*, testng */))
}
val cp = (classpath + dep).distinct().map { it.jarFile.get() }
.joinToString(File.pathSeparator)
val calculatedArgs = args(project, context, classpath, testConfig)
val jvmArgs = arrayListOf("-classpath", cp)
if (testConfig.jvmArgs.any()) {
jvmArgs.addAll(testConfig.jvmArgs)
}
val remoteArgs = listOf(
"org.testng.remote.RemoteTestNG",
"-serport", port.toString(),
"-version", testngVersion,
"-dontexit",
RemoteArgs.PROTOCOL,
"json")
val passedArgs = jvmArgs + remoteArgs + calculatedArgs
Thread {
runCommand {
command = "java"
directory = File(project.directory)
args = passedArgs
}
}.start()
// Thread {
// val args2 = arrayOf("-serport", port.toString(), "-dontexit", RemoteArgs.PROTOCOL, "json",
// "-version", "6.10",
// "src/test/resources/testng.xml")
// RemoteTestNG.main(args2)
// }.start()
}
} }
fun main(args: Array<String>) { fun main(args: Array<String>) {