You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/09/04 16:14:07 UTC
karaf git commit: [KARAF-3755] Fix broken
shell.support.table.ShellTableTest on Windows
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x da43894eb -> 94f550bd4
[KARAF-3755] Fix broken shell.support.table.ShellTableTest on Windows
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/94f550bd
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/94f550bd
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/94f550bd
Branch: refs/heads/karaf-4.1.x
Commit: 94f550bd41b8f83cf89d25aad03074e1d12ce429
Parents: da43894
Author: VEINHORN <b....@gmail.com>
Authored: Mon Sep 4 17:06:09 2017 +0300
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Sep 4 18:14:01 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/support/table/ShellTableTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/94f550bd/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java
----------------------------------------------------------------------
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 c0d8596..dc764dc 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 @@ public class ShellTableTest {
"----------------------+---------------------------\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");
+ }
}