Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217

This commit is contained in:
josecoll
2017-12-13 11:02:58 +00:00
173 changed files with 1060 additions and 812 deletions

View File

@ -3,9 +3,10 @@ package net.corda.webserver
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.getOrThrow
import net.corda.testing.*
import net.corda.testing.DUMMY_BANK_A_NAME
import net.corda.testing.driver.WebserverHandle
import net.corda.testing.internal.addressMustBeBound
import net.corda.testing.internal.addressMustNotBeBound
import net.corda.testing.node.internal.addressMustBeBound
import net.corda.testing.node.internal.addressMustNotBeBound
import net.corda.testing.driver.driver
import org.junit.ClassRule
import org.junit.Test
@ -31,7 +32,7 @@ class WebserverDriverTests : IntegrationTest() {
@Test
fun `starting a node and independent web server works`() {
val addr = driver {
val node = startNode(providedName = DUMMY_BANK_A.name).getOrThrow()
val node = startNode(providedName = DUMMY_BANK_A_NAME).getOrThrow()
val webserverHandle = startWebserver(node).getOrThrow()
webserverMustBeUp(webserverHandle)
webserverHandle.listenAddress