Merge branch 'open_master' into corda/tudor-os-merge

# Conflicts:
#	settings.gradle
#	verifier/build.gradle
#	verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
#	verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
This commit is contained in:
tudor.malene@gmail.com
2018-03-15 10:21:35 +00:00
10 changed files with 2 additions and 958 deletions

View File

@ -47,7 +47,6 @@ dependencies {
compile project(':client:jfx')
compile project(':node-driver')
compile project(':webserver')
testCompile project(':verifier')
testCompile project(':test-utils')
compile "org.graphstream:gs-core:1.3"

View File

@ -13,13 +13,11 @@ package net.corda.docs
import net.corda.node.services.config.ConfigHelper
import net.corda.node.services.config.NodeConfiguration
import net.corda.node.services.config.parseAsNodeConfiguration
import net.corda.verifier.Verifier
import org.junit.Test
import java.nio.file.Path
import java.nio.file.Paths
import kotlin.reflect.KVisibility
import kotlin.reflect.full.declaredMemberProperties
import kotlin.reflect.jvm.isAccessible
class ExampleConfigTest {
@ -51,14 +49,4 @@ class ExampleConfigTest {
).parseAsNodeConfiguration()
}
}
@Test
fun `example verifier_conf parses fine`() {
readAndCheckConfigurations(
"example-verifier.conf"
) {
val baseDirectory = Paths.get("some-example-base-dir")
Verifier.loadConfiguration(baseDirectory, it)
}
}
}