Repository: zookeeper Updated Branches: refs/heads/master 425fdbb8f -> 017ca1a24
ZOOKEEPER-2742: Few test cases of org.apache.zookeeper.ZooKeeperTest Few test cases of org.apache.zookeeper.ZooKeeperTest fails in Windows Author: Abhishek Kumar <[email protected]> Reviewers: Mohammad Arshad <[email protected]> Closes #237 from abhi-kr/ZOOKEEPER-2742 Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/017ca1a2 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/017ca1a2 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/017ca1a2 Branch: refs/heads/master Commit: 017ca1a24c1fa5988dd3c718f90b4beedb8a6a45 Parents: 425fdbb Author: Abhishek Kumar <[email protected]> Authored: Sun Apr 30 02:17:03 2017 +0800 Committer: Mohammad Arshad <[email protected]> Committed: Sun Apr 30 02:17:03 2017 +0800 ---------------------------------------------------------------------- src/java/test/org/apache/zookeeper/ZooKeeperTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/017ca1a2/src/java/test/org/apache/zookeeper/ZooKeeperTest.java ---------------------------------------------------------------------- diff --git a/src/java/test/org/apache/zookeeper/ZooKeeperTest.java b/src/java/test/org/apache/zookeeper/ZooKeeperTest.java index dd610dd..0ce0eaa 100644 --- a/src/java/test/org/apache/zookeeper/ZooKeeperTest.java +++ b/src/java/test/org/apache/zookeeper/ZooKeeperTest.java @@ -42,6 +42,8 @@ import org.junit.Test; */ public class ZooKeeperTest extends ClientBase { + private static final String LINE_SEPARATOR = System.getProperty("line.separator", "\n"); + @Test public void testDeleteRecursive() throws IOException, InterruptedException, CliException, KeeperException { final ZooKeeper zk = createClient(); @@ -465,7 +467,7 @@ public class ZooKeeperTest extends ClientBase { String result = byteStream.toString(); assertTrue(result, result.contains( - StringUtils.joinStrings(expectedResults, "\n"))); + StringUtils.joinStrings(expectedResults, LINE_SEPARATOR))); } @Test @@ -483,7 +485,7 @@ public class ZooKeeperTest extends ClientBase { cmd.setZk(zk); cmd.parse("ls /".split(" ")); List<String> expected = new ArrayList<String>(); - expected.add("[aa1, aa2, aa3, test1, zk1, zookeeper]\n"); + expected.add("[aa1, aa2, aa3, test1, zk1, zookeeper]"); runCommandExpect(cmd, expected); }
