ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 06:38:21 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Moved network services tests back as unit tests (#3639)

Browse Source
This commit is contained in:
Shams Asari
2018-07-18 11:03:45 +01:00
committed by GitHub
parent c0207b2219
commit ff607e1bc1
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapClientTest.kt → node/src/test/kotlin/net/corda/node/services/network/NetworkMapClientTest.kt
View File

@ -9,7 +9,6 @@ import net.corda.testing.common.internal.testNetworkParameters
import net.corda.testing.core.ALICE_NAME import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.SerializationEnvironmentRule import net.corda.testing.core.SerializationEnvironmentRule
import net.corda.testing.driver.PortAllocation
import net.corda.testing.internal.DEV_ROOT_CA import net.corda.testing.internal.DEV_ROOT_CA
import net.corda.testing.internal.TestNodeInfoBuilder import net.corda.testing.internal.TestNodeInfoBuilder
import net.corda.testing.internal.createNodeInfoAndSigned import net.corda.testing.internal.createNodeInfoAndSigned
@ -39,9 +38,9 @@ class NetworkMapClientTest {
@Before @Before
fun setUp() { fun setUp() {
server = NetworkMapServer(cacheTimeout, PortAllocation.Incremental(10000).nextHostAndPort()) server = NetworkMapServer(cacheTimeout)
val hostAndPort = server.start() val address = server.start()
networkMapClient = NetworkMapClient(URL("http://${hostAndPort.host}:${hostAndPort.port}"), DEV_ROOT_CA.certificate) networkMapClient = NetworkMapClient(URL("http://$address"), DEV_ROOT_CA.certificate)
} }
@After @After

7
node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapUpdaterTest.kt → node/src/test/kotlin/net/corda/node/services/network/NetworkMapUpdaterTest.kt
View File

@ -22,7 +22,6 @@ import net.corda.nodeapi.internal.network.SignedNetworkParameters
import net.corda.nodeapi.internal.network.verifiedNetworkMapCert import net.corda.nodeapi.internal.network.verifiedNetworkMapCert
import net.corda.testing.common.internal.testNetworkParameters import net.corda.testing.common.internal.testNetworkParameters
import net.corda.testing.core.* import net.corda.testing.core.*
import net.corda.testing.driver.PortAllocation
import net.corda.testing.internal.DEV_ROOT_CA import net.corda.testing.internal.DEV_ROOT_CA
import net.corda.testing.internal.TestNodeInfoBuilder import net.corda.testing.internal.TestNodeInfoBuilder
import net.corda.testing.internal.createNodeInfoAndSigned import net.corda.testing.internal.createNodeInfoAndSigned
@ -62,9 +61,9 @@ class NetworkMapUpdaterTest {
@Before @Before
fun setUp() { fun setUp() {
server = NetworkMapServer(cacheExpiryMs.millis, PortAllocation.Incremental(10000).nextHostAndPort()) server = NetworkMapServer(cacheExpiryMs.millis)
val hostAndPort = server.start() val address = server.start()
networkMapClient = NetworkMapClient(URL("http://${hostAndPort.host}:${hostAndPort.port}"), DEV_ROOT_CA.certificate) networkMapClient = NetworkMapClient(URL("http://$address"), DEV_ROOT_CA.certificate)
} }
@After @After

9
node/src/integration-test/kotlin/net/corda/node/services/network/NetworkParametersReaderTest.kt → node/src/test/kotlin/net/corda/node/services/network/NetworkParametersReaderTest.kt
View File

@ -13,7 +13,6 @@ import net.corda.node.internal.NetworkParametersReader
import net.corda.nodeapi.internal.network.* import net.corda.nodeapi.internal.network.*
import net.corda.testing.common.internal.testNetworkParameters import net.corda.testing.common.internal.testNetworkParameters
import net.corda.testing.core.SerializationEnvironmentRule import net.corda.testing.core.SerializationEnvironmentRule
import net.corda.testing.driver.PortAllocation
import net.corda.testing.internal.DEV_ROOT_CA import net.corda.testing.internal.DEV_ROOT_CA
import net.corda.testing.node.internal.network.NetworkMapServer import net.corda.testing.node.internal.network.NetworkMapServer
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
@ -32,7 +31,7 @@ class NetworkParametersReaderTest {
@JvmField @JvmField
val testSerialization = SerializationEnvironmentRule(true) val testSerialization = SerializationEnvironmentRule(true)
val fs: FileSystem = Jimfs.newFileSystem(Configuration.unix()) private val fs: FileSystem = Jimfs.newFileSystem(Configuration.unix())
private val cacheTimeout = 100000.seconds private val cacheTimeout = 100000.seconds
private lateinit var server: NetworkMapServer private lateinit var server: NetworkMapServer
@ -40,9 +39,9 @@ class NetworkParametersReaderTest {
@Before @Before
fun setUp() { fun setUp() {
server = NetworkMapServer(cacheTimeout, PortAllocation.Incremental(10000).nextHostAndPort()) server = NetworkMapServer(cacheTimeout)
val hostAndPort = server.start() val address = server.start()
networkMapClient = NetworkMapClient(URL("http://${hostAndPort.host}:${hostAndPort.port}"), DEV_ROOT_CA.certificate) networkMapClient = NetworkMapClient(URL("http://$address"), DEV_ROOT_CA.certificate)
} }
@After @After

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/network/NetworkMapServer.kt
View File

@ -36,7 +36,7 @@ import javax.ws.rs.core.Response.ok
import javax.ws.rs.core.Response.status import javax.ws.rs.core.Response.status
class NetworkMapServer(private val pollInterval: Duration, class NetworkMapServer(private val pollInterval: Duration,
hostAndPort: NetworkHostAndPort, hostAndPort: NetworkHostAndPort = NetworkHostAndPort("localhost", 0),
private val networkMapCertAndKeyPair: CertificateAndKeyPair = createDevNetworkMapCa(), private val networkMapCertAndKeyPair: CertificateAndKeyPair = createDevNetworkMapCa(),
private val myHostNameValue: String = "test.host.name", private val myHostNameValue: String = "test.host.name",
vararg additionalServices: Any) : Closeable { vararg additionalServices: Any) : Closeable {