Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C0CC200C65 for ; Sat, 29 Apr 2017 20:17:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1AA1A160BA9; Sat, 29 Apr 2017 18:17:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62AD2160B98 for ; Sat, 29 Apr 2017 20:17:57 +0200 (CEST) Received: (qmail 1625 invoked by uid 500); 29 Apr 2017 18:17:56 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 1614 invoked by uid 99); 29 Apr 2017 18:17:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Apr 2017 18:17:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72466DFD70; Sat, 29 Apr 2017 18:17:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arshad@apache.org To: commits@zookeeper.apache.org Message-Id: <589fb9b19aee452e92b564eb57fb73a7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-2742: Few test cases of org.apache.zookeeper.ZooKeeperTest Date: Sat, 29 Apr 2017 18:17:56 +0000 (UTC) archived-at: Sat, 29 Apr 2017 18:17:58 -0000 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 Reviewers: Mohammad Arshad 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 Authored: Sun Apr 30 02:17:03 2017 +0800 Committer: Mohammad Arshad 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 expected = new ArrayList(); - expected.add("[aa1, aa2, aa3, test1, zk1, zookeeper]\n"); + expected.add("[aa1, aa2, aa3, test1, zk1, zookeeper]"); runCommandExpect(cmd, expected); }