From 1bf1957447d45c528635b10b3ca46e6f9c93ee57 Mon Sep 17 00:00:00 2001 From: VEINHORN Date: Mon, 4 Sep 2017 17:06:09 +0300 Subject: [PATCH] [KARAF-3755] Fix broken shell.support.table.ShellTableTest on Windows --- .../apache/karaf/shell/support/table/ShellTableTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java b/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java index c0d8596638f..dc764dc9628 100644 --- a/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java +++ b/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java @@ -104,7 +104,11 @@ private void testNonUtf8(String encoding) throws Exception { "----------------------+---------------------------\n" + "my first column value | my second column value is\n" + " | quite long\n", - baos.toString()); + getString(baos)); } + + private String getString(ByteArrayOutputStream stream) { + return stream.toString().replace("\r\n", "\n"); + } }