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 480E3200CF8 for ; Wed, 16 Aug 2017 01:10:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 46F9A167A41; Tue, 15 Aug 2017 23:10:24 +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 8D000167A3E for ; Wed, 16 Aug 2017 01:10:23 +0200 (CEST) Received: (qmail 23429 invoked by uid 500); 15 Aug 2017 23:10:15 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 21961 invoked by uid 99); 15 Aug 2017 23:10:14 -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; Tue, 15 Aug 2017 23:10:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79C8DF5ED9; Tue, 15 Aug 2017 23:10:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.apache.org Date: Tue, 15 Aug 2017 23:10:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] geode git commit: GEODE-3328: fix testAddGemFirePropertyFileToCommandLine on Windows archived-at: Tue, 15 Aug 2017 23:10:24 -0000 GEODE-3328: fix testAddGemFirePropertyFileToCommandLine on Windows Modification of ca4b81 committed by Jinmei Liao Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e07b5c1c Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e07b5c1c Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e07b5c1c Branch: refs/heads/feature/GEODE-3249 Commit: e07b5c1c6531b7ad57c5e455fa0a31ce61f3b25f Parents: bc655eb Author: Kirk Lund Authored: Tue Aug 15 11:47:58 2017 -0700 Committer: Kirk Lund Committed: Tue Aug 15 14:57:24 2017 -0700 ---------------------------------------------------------------------- .../internal/cli/commands/GfshCommandJUnitTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/e07b5c1c/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java index da60c7a..f6c7cae 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java @@ -409,13 +409,16 @@ public class GfshCommandJUnitTest { @Test public void testAddGemFirePropertyFileToCommandLine() { - final List commandLine = new ArrayList<>(); + List commandLine = new ArrayList<>(); assertTrue(commandLine.isEmpty()); + StartMemberUtils.addGemFirePropertyFile(commandLine, null); assertTrue(commandLine.isEmpty()); - StartMemberUtils.addGemFirePropertyFile(commandLine, new File("/path/to/gemfire.properties")); + + File file = new File("/path/to/gemfire.properties"); + StartMemberUtils.addGemFirePropertyFile(commandLine, file); assertFalse(commandLine.isEmpty()); - assertTrue(commandLine.contains("-DgemfirePropertyFile=/path/to/gemfire.properties")); + assertTrue(commandLine.contains("-DgemfirePropertyFile=" + file.getAbsolutePath())); } @Test