From ec42d30661937721c96e0a08be168b0ce724c3e8 Mon Sep 17 00:00:00 2001 From: Anthony Keenan Date: Fri, 30 Nov 2018 19:01:15 +0000 Subject: [PATCH] Fix windows build (#4335) --- .../kotlin/net/corda/tools/shell/InteractiveShellTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt b/tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt index ce5f32fb13..4c103be41d 100644 --- a/tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt +++ b/tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.type.TypeFactory import com.fasterxml.jackson.dataformat.yaml.YAMLFactory +import com.nhaarman.mockito_kotlin.eq import com.nhaarman.mockito_kotlin.mock import com.nhaarman.mockito_kotlin.verify import com.nhaarman.mockito_kotlin.whenever @@ -227,7 +228,7 @@ class InteractiveShellTest { InteractiveShell.setOutputFormat(InteractiveShell.OutputFormat.JSON) 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 @@ -241,11 +242,11 @@ class InteractiveShellTest { InteractiveShell.setOutputFormat(InteractiveShell.OutputFormat.JSON) 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 data class UserValue(@JsonProperty("label") val label: String) { override fun toString() = label } -} +} \ No newline at end of file