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

Fix build.

Browse source
This commit is contained in:
Cedric Beust 2017-03-19 09:41:26 -07:00
parent a3734f88c3
commit 7f6a39ecfa
1 changed files with 72 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,17 +4,9 @@ import com.beust.kobalt.TestConfig
import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.KobaltContext
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.homeDir
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.runCommand
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn
import org.testng.remote.RemoteArgs
import org.testng.remote.strprotocol.JsonMessageSender
import org.testng.remote.strprotocol.MessageHelper
import org.testng.remote.strprotocol.MessageHub
import org.testng.remote.strprotocol.TestResultMessage
import java.io.File import java.io.File
import java.io.IOException
class TestNgRunner : GenericTestRunner() { class TestNgRunner : GenericTestRunner() {
@ -57,78 +49,78 @@ class TestNgRunner : GenericTestRunner() {
} }
} }
fun _runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>, // fun _runTests(project: Project, context: KobaltContext, classpath: List<IClasspathDependency>,
configName: String): Boolean { // configName: String): Boolean {
var result = false // var result = false
val port = 2345 // val port = 2345
//
val classpath = listOf(homeDir("java/jcommander/kobaltBuild/classes"), // val classpath = listOf(homeDir("java/jcommander/kobaltBuild/classes"),
homeDir(".kobalt/cache/org/testng/testng/6.10/testng-6.10.jar"), // homeDir(".kobalt/cache/org/testng/testng/6.10/testng-6.10.jar"),
homeDir(".kobalt/cache/com/beust/jcommander/1.66/jcommander-1.66.jar"), // homeDir(".kobalt/cache/com/beust/jcommander/1.66/jcommander-1.66.jar"),
homeDir(".kobalt/cache/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar"), // homeDir(".kobalt/cache/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar"),
homeDir(".kobalt/cache/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar"), // homeDir(".kobalt/cache/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar"),
homeDir("java/jcommander/kobaltBuild/test-classes"), // homeDir("java/jcommander/kobaltBuild/test-classes"),
homeDir("java/jcommander/src/test/resources/testng.xml"), // homeDir("java/jcommander/src/test/resources/testng.xml"),
homeDir("kotlin/kobalt/lib/testng-remote-1.3.0-SNAPSHOT.jar"), // homeDir("kotlin/kobalt/lib/testng-remote-1.3.0-SNAPSHOT.jar"),
homeDir("kotlin/kobalt/lib/testng-remote6_10-1.3.0-SNAPSHOT.jar") // homeDir("kotlin/kobalt/lib/testng-remote6_10-1.3.0-SNAPSHOT.jar")
).joinToString(File.pathSeparator) // ).joinToString(File.pathSeparator)
val passedArgs = listOf( // val passedArgs = listOf(
"-classpath", // "-classpath",
classpath, // classpath,
"org.testng.remote.RemoteTestNG", // "org.testng.remote.RemoteTestNG",
"-serport", port.toString(), // "-serport", port.toString(),
"-version", "6.10", // "-version", "6.10",
"-dontexit", // "-dontexit",
RemoteArgs.PROTOCOL, // RemoteArgs.PROTOCOL,
"json", // "json",
"src/test/resources/testng.xml") // "src/test/resources/testng.xml")
//
Thread {
val exitCode = runCommand {
command = "java"
directory = File(homeDir("java/jcommander"))
args = passedArgs
}
}.start()
// Thread { // Thread {
// val args2 = arrayOf("-serport", port.toString(), "-dontexit", RemoteArgs.PROTOCOL, "json", // val exitCode = runCommand {
// "-version", "6.10", // command = "java"
// "src/test/resources/testng.xml") // directory = File(homeDir("java/jcommander"))
// RemoteTestNG.main(args2) // args = passedArgs
// }
// }.start() // }.start()
//
val mh = MessageHub(JsonMessageSender("localhost", port, true)) //// Thread {
mh.setDebug(true) //// val args2 = arrayOf("-serport", port.toString(), "-dontexit", RemoteArgs.PROTOCOL, "json",
mh.initReceiver() //// "-version", "6.10",
val passed = arrayListOf<String>() //// "src/test/resources/testng.xml")
data class FailedTest(val method: String, val cls: String, val stackTrace: String) //// RemoteTestNG.main(args2)
val failed = arrayListOf<FailedTest>() //// }.start()
var skipped = arrayListOf<String>() //
try { // val mh = MessageHub(JsonMessageSender("localhost", port, true))
var message = mh.receiveMessage() // mh.setDebug(true)
println("") // mh.initReceiver()
while (message != null) { // val passed = arrayListOf<String>()
message = mh.receiveMessage() // data class FailedTest(val method: String, val cls: String, val stackTrace: String)
if (message is TestResultMessage) { // val failed = arrayListOf<FailedTest>()
when(message.result) { // var skipped = arrayListOf<String>()
MessageHelper.PASSED_TEST -> passed.add(message.name) // try {
MessageHelper.FAILED_TEST -> failed.add(FailedTest(message.testClass, // var message = mh.receiveMessage()
message.method, message.stackTrace)) // println("")
MessageHelper.SKIPPED_TEST -> skipped.add(message.name) // while (message != null) {
} // message = mh.receiveMessage()
} // if (message is TestResultMessage) {
print("\r" + String.format("%4d / %4d / %4d", passed.size, failed.size, skipped.size)) // when(message.result) {
// Thread.sleep(200) // MessageHelper.PASSED_TEST -> passed.add(message.name)
} // MessageHelper.FAILED_TEST -> failed.add(FailedTest(message.testClass,
} catch(ex: IOException) { // message.method, message.stackTrace))
println("Exception: ${ex.message}") // MessageHelper.SKIPPED_TEST -> skipped.add(message.name)
} // }
println("\nPassed: " + passed.size + ", Failed: " + failed.size + ", Skipped: " + skipped.size) // }
failed.forEach { // print("\r" + String.format("%4d / %4d / %4d", passed.size, failed.size, skipped.size))
val top = it.stackTrace.substring(0, it.stackTrace.indexOf("\n")) //// Thread.sleep(200)
println(" " + it.cls + "." + it.method + "\n " + top) // }
} // } catch(ex: IOException) {
return result // println("Exception: ${ex.message}")
} // }
// println("\nPassed: " + passed.size + ", Failed: " + failed.size + ", Skipped: " + skipped.size)
// failed.forEach {
// val top = it.stackTrace.substring(0, it.stackTrace.indexOf("\n"))
// println(" " + it.cls + "." + it.method + "\n " + top)
// }
// return result
// }
} }