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:13:42 UTC
[1/2] karaf git commit: [KARAF-3755] Fix broken
shell.support.table.ShellTableTest on Windows
Repository: karaf
Updated Branches:
refs/heads/master e1f7aff43 -> b61ce4090
[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/1bf19574
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1bf19574
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1bf19574
Branch: refs/heads/master
Commit: 1bf1957447d45c528635b10b3ca46e6f9c93ee57
Parents: e1f7aff
Author: VEINHORN <b....@gmail.com>
Authored: Mon Sep 4 17:06:09 2017 +0300
Committer: VEINHORN <b....@gmail.com>
Committed: Mon Sep 4 17:06:09 2017 +0300
----------------------------------------------------------------------
.../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/1bf19574/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");
+ }
}
[2/2] karaf git commit: [KARAF-3755] This closes #341
Posted by jb...@apache.org.
[KARAF-3755] This closes #341
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b61ce409
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b61ce409
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b61ce409
Branch: refs/heads/master
Commit: b61ce409080d6b1010fb28e68bc5f32c676823b4
Parents: e1f7aff 1bf1957
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Sep 4 18:13:30 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Sep 4 18:13:30 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/support/table/ShellTableTest.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------