Fix output comparison in tests under windows in libraries project as well

This commit is contained in:
Ilya Chernikov
2016-10-12 20:29:49 +02:00
parent d8ecd2641d
commit ebc8002eb2
@@ -66,7 +66,7 @@ done
captureOut {
ctor!!.newInstance(arrayOf("a1"))
}.let {
Assert.assertEquals(argsHelloWorldOutput, it)
Assert.assertEquals(argsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim())
}
}
@@ -79,7 +79,7 @@ done
captureOut {
ctor!!.newInstance(hashMapOf("a1" to 42))
}.let {
Assert.assertEquals(bindingsHelloWorldOutput, it)
Assert.assertEquals(bindingsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim())
}
}
@@ -96,7 +96,7 @@ done
captureOut {
scriptClass!!.getConstructor(Array<String>::class.java)!!.newInstance(arrayOf("a1"))
}.let {
Assert.assertEquals(argsHelloWorldOutput, it)
Assert.assertEquals(argsHelloWorldOutput.linesSplitTrim(), it.linesSplitTrim())
}
}
@@ -175,6 +175,9 @@ done
default
}
private fun String.linesSplitTrim() =
split('\n','\r').map(String::trim).filter(String::isNotBlank)
private fun captureOut(body: () -> Unit): String {
val outStream = ByteArrayOutputStream()
val prevOut = System.out