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

Fix windows build (#4335)

Browse Source
This commit is contained in:
Anthony Keenan 2018-11-30 19:01:15 +00:00 committed by GitHub
parent 38438eadcd
commit ec42d30661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
View File

@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.type.TypeFactory import com.fasterxml.jackson.databind.type.TypeFactory
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
import com.nhaarman.mockito_kotlin.eq
import com.nhaarman.mockito_kotlin.mock import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.verify import com.nhaarman.mockito_kotlin.verify
import com.nhaarman.mockito_kotlin.whenever import com.nhaarman.mockito_kotlin.whenever
@ -227,7 +228,7 @@ class InteractiveShellTest {
InteractiveShell.setOutputFormat(InteractiveShell.OutputFormat.JSON) InteractiveShell.setOutputFormat(InteractiveShell.OutputFormat.JSON)
InteractiveShell.runRPCFromString(command, printWriter, invocationContext, cordaRpcOps, inputObjectMapper) InteractiveShell.runRPCFromString(command, printWriter, invocationContext, cordaRpcOps, inputObjectMapper)
verify(printWriter).println(NODE_INFO_JSON_PAYLOAD) verify(printWriter).println(NODE_INFO_JSON_PAYLOAD.replace("\n", System.lineSeparator()))
} }
@Test @Test
@ -241,11 +242,11 @@ class InteractiveShellTest {
InteractiveShell.setOutputFormat(InteractiveShell.OutputFormat.JSON) InteractiveShell.setOutputFormat(InteractiveShell.OutputFormat.JSON)
InteractiveShell.runRPCFromString(command, printWriter, invocationContext, cordaRpcOps, inputObjectMapper) InteractiveShell.runRPCFromString(command, printWriter, invocationContext, cordaRpcOps, inputObjectMapper)
verify(printWriter).println(NETWORK_MAP_JSON_PAYLOAD) verify(printWriter).println(NETWORK_MAP_JSON_PAYLOAD.replace("\n", System.lineSeparator()))
} }
@ToStringSerialize @ToStringSerialize
data class UserValue(@JsonProperty("label") val label: String) { data class UserValue(@JsonProperty("label") val label: String) {
override fun toString() = label override fun toString() = label
} }
} }