IRS demo test now uses the new status endpoint

This commit is contained in:
Clinton Alexander 2016-06-09 17:47:58 +01:00 committed by Andras Slemmer
parent 36a0ff0503
commit 9638ea5b9e

View File

@ -2,9 +2,17 @@ package com.r3corda.core.testing
import kotlin.test.assertEquals import kotlin.test.assertEquals
import org.junit.Test import org.junit.Test
import java.io.InputStreamReader
import java.net.ConnectException
import java.net.HttpURLConnection
import java.net.URL
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
private class NodeDidNotStartException: Throwable {
constructor(message: String): super(message) {}
}
class IRSDemoTest { class IRSDemoTest {
@Test fun `runs IRS demo`() { @Test fun `runs IRS demo`() {
val dirA = Paths.get("./nodeA") val dirA = Paths.get("./nodeA")
@ -14,8 +22,8 @@ class IRSDemoTest {
try { try {
setupNode(dirA, "NodeA") setupNode(dirA, "NodeA")
setupNode(dirB, "NodeB") setupNode(dirB, "NodeB")
procA = startNode(dirA, "NodeA") procA = startNode(dirA, "NodeA", "http://localhost:31338")
procB = startNode(dirB, "NodeB") procB = startNode(dirB, "NodeB", "http://localhost:31341")
runTrade() runTrade()
runDateChange() runDateChange()
} finally { } finally {
@ -33,13 +41,37 @@ private fun setupNode(dir: Path, nodeType: String) {
assertEquals(proc.exitValue(), 0) assertEquals(proc.exitValue(), 0)
} }
private fun startNode(dir: Path, nodeType: String): Process { private fun startNode(dir: Path, nodeType: String, nodeAddr: String): Process {
val args = listOf("--role", nodeType, "--dir", dir.toString()) val args = listOf("--role", nodeType, "--dir", dir.toString())
val proc = spawn("com.r3corda.demos.IRSDemoKt", args) val proc = spawn("com.r3corda.demos.IRSDemoKt", args)
Thread.sleep(15000) waitForNode(nodeAddr)
return proc return proc
} }
// Todo: Move this to a library and use it in the trade demo
private fun waitForNode(nodeAddr: String) {
var retries = 0
var respCode: Int = 404
do {
retries++
val url = URL(nodeAddr + "/api/status")
val err = try {
val conn = url.openConnection() as HttpURLConnection
conn.requestMethod = "GET"
respCode = conn.responseCode
InputStreamReader(conn.inputStream).readLines().joinToString { it }
} catch(e: ConnectException) {
// This is to be expected while it loads up
respCode = 404
"Node hasn't started"
}
if(retries > 200) {
throw NodeDidNotStartException("The node did not start: " + err)
}
} while (respCode != 200)
}
private fun runTrade() { private fun runTrade() {
val args = listOf("--role", "Trade", "trade1") val args = listOf("--role", "Trade", "trade1")
val proc = spawn("com.r3corda.demos.IRSDemoKt", args) val proc = spawn("com.r3corda.demos.IRSDemoKt", args)