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 2015/06/04 07:59:51 UTC
[1/2] karaf git commit: [KARAF-3755]
shell.support.table.ShellTableTest breaked build on Windows
Repository: karaf
Updated Branches:
refs/heads/master d50b32a6f -> 6676cf489
[KARAF-3755] shell.support.table.ShellTableTest breaked build on Windows
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/edf72c7e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/edf72c7e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/edf72c7e
Branch: refs/heads/master
Commit: edf72c7e7cb8deded966f2fa7f0a285eb5848f56
Parents: 1a94fcc
Author: Morgan Hautman <mo...@iadvise.eu>
Authored: Tue Jun 2 12:19:12 2015 +0200
Committer: Morgan Hautman <mo...@iadvise.eu>
Committed: Tue Jun 2 12:19:12 2015 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/support/table/ShellTableTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/edf72c7e/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 7a250ca..575493d 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
@@ -36,7 +36,7 @@ public class ShellTableTest {
table.addRow().addContent("my first column value", "my second column value is quite long");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
table.print(new PrintStream(baos), false);
- assertEquals("my first column value|my second column value is quite long\n", baos.toString());
+ assertEquals(String.format("%s%n","my first column value|my second column value is quite long"), baos.toString());
}
@Test
@@ -49,7 +49,7 @@ public class ShellTableTest {
table.size(50);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
table.print(new PrintStream(baos), false);
- assertEquals("my first column value|my second column value is q\n", baos.toString());
+ assertEquals(String.format("%s%n","my first column value|my second column value is q"), baos.toString());
}
@Test
@@ -62,8 +62,8 @@ public class ShellTableTest {
table.size(50);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
table.print(new PrintStream(baos), false);
- assertEquals("my first column value|my second column value is\n" +
- " |quite long\n", baos.toString());
+ assertEquals(String.format("%1$s\n%2$s%n","my first column value|my second column value is",
+ " |quite long"), baos.toString());
}
}
[2/2] karaf git commit: Merge branch 'ShellTableTest-fix' of
https://github.com/mhautman/karaf
Posted by jb...@apache.org.
Merge branch 'ShellTableTest-fix' of https://github.com/mhautman/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6676cf48
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6676cf48
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6676cf48
Branch: refs/heads/master
Commit: 6676cf4895141563dc2c285b19621e54f5104a3b
Parents: d50b32a edf72c7
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Jun 4 07:48:04 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Jun 4 07:48:04 2015 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/support/table/ShellTableTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------