ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-10 22:44:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Test webserver configuration too. (#485)

Browse Source
This commit is contained in:
Chris Rankin 2017-03-31 13:51:30 +01:00 committed by GitHub
parent e6bb2eedc0
commit 341e1acf2a
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/demobench/build.gradle
View File

@ -66,6 +66,7 @@ dependencies {
compile ':pty4j-0.7.2'
testCompile project(':node')
testCompile project(':webserver')
testCompile "junit:junit:$junit_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"

44
tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
View File

@ -3,9 +3,11 @@ package net.corda.demobench.model
import com.google.common.net.HostAndPort
import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigValueFactory
import net.corda.core.div
import net.corda.node.internal.NetworkMapInfo
import net.corda.node.services.config.FullNodeConfiguration
import net.corda.nodeapi.User
import net.corda.webserver.WebServerConfig
import java.nio.file.Path
import java.nio.file.Paths
import kotlin.test.*
@ -25,19 +27,19 @@ class NodeConfigTest {
@Test
fun `test node directory`() {
val config = createConfig(legalName = "My Name")
assertEquals(baseDir.resolve("myname"), config.nodeDir)
assertEquals(baseDir/"myname", config.nodeDir)
}
@Test
fun `test explorer directory`() {
val config = createConfig(legalName = "My Name")
assertEquals(baseDir.resolve("myname-explorer"), config.explorerDir)
assertEquals(baseDir/"myname-explorer", config.explorerDir)
}
@Test
fun `test plugin directory`() {
val config = createConfig(legalName = "My Name")
assertEquals(baseDir.resolve("myname").resolve("plugins"), config.pluginDir)
assertEquals(baseDir/"myname"/"plugins", config.pluginDir)
}
@Test
@ -179,10 +181,10 @@ class NodeConfigTest {
config.networkMap = NetworkMapConfig("Notary", 12345)
val nodeConfig = config.toFileConfig()
.withValue("basedir", ConfigValueFactory.fromAnyRef("/basedir/"))
.withValue("basedir", ConfigValueFactory.fromAnyRef(baseDir.toString()))
.withFallback(ConfigFactory.parseResources("reference.conf"))
.resolve()
val fullConfig = FullNodeConfiguration(Paths.get("."), nodeConfig)
val fullConfig = FullNodeConfiguration(baseDir, nodeConfig)
assertEquals("My Name", fullConfig.myLegalName)
assertEquals("Stockholm", fullConfig.nearestCity)
@ -196,15 +198,39 @@ class NodeConfigTest {
assertTrue(fullConfig.useTestClock)
}
@Test
fun `reading webserver configuration`() {
val config = createConfig(
legalName = "My Name",
nearestCity = "Stockholm",
p2pPort = 10001,
rpcPort = 40002,
webPort = 20001,
h2Port = 30001,
services = listOf("my.service"),
users = listOf(user("jenny"))
)
config.networkMap = NetworkMapConfig("Notary", 12345)
val nodeConfig = config.toFileConfig()
.withValue("basedir", ConfigValueFactory.fromAnyRef(baseDir.toString()))
.withFallback(ConfigFactory.parseResources("web-reference.conf"))
.resolve()
val webConfig = WebServerConfig(baseDir, nodeConfig)
assertEquals(localPort(20001), webConfig.webAddress)
assertEquals(localPort(10001), webConfig.p2pAddress)
}
@Test
fun `test moving`() {
val config = createConfig(legalName = "My Name")
val elsewhere = baseDir.resolve("elsewhere")
val elsewhere = baseDir/"elsewhere"
val moved = config.moveTo(elsewhere)
assertEquals(elsewhere.resolve("myname"), moved.nodeDir)
assertEquals(elsewhere.resolve("myname-explorer"), moved.explorerDir)
assertEquals(elsewhere.resolve("myname").resolve("plugins"), moved.pluginDir)
assertEquals(elsewhere/"myname", moved.nodeDir)
assertEquals(elsewhere/"myname-explorer", moved.explorerDir)
assertEquals(elsewhere/"myname"/"plugins", moved.pluginDir)
}
private fun createConfig(