[geode] branch develop updated: GEODE-5212: Make paths platform agnostic (#2512)

[jensdeppe]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 4a00aa5  GEODE-5212: Make paths platform agnostic (#2512)
4a00aa5 is described below

commit 4a00aa506994fd5f3c548665f17c9d965e444e8b
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Wed Sep 26 13:14:35 2018 -0700

    GEODE-5212: Make paths platform agnostic (#2512)
---
 .../internal/cli/commands/ExportLogsOnServerManagerDUnit.java      | 7 +++++--
 .../internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java  | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
index a9e4d06..7295447 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsOnServerManagerDUnit.java
@@ -17,6 +17,7 @@ package org.apache.geode.management.internal.cli.commands;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.nio.file.Paths;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -53,7 +54,8 @@ public class ExportLogsOnServerManagerDUnit {
 
     String zipPath = getZipPathFromCommandResult(message);
 
-    Set<String> expectedZipEntries = Sets.newHashSet("server-0/server-0.log");
+    Set<String> expectedZipEntries =
+        Sets.newHashSet(Paths.get("server-0", "server-0.log").toString());
     Set<String> actualZipEnries =
         new 
ZipFile(zipPath).stream().map(ZipEntry::getName).collect(Collectors.toSet());
     assertThat(actualZipEnries).containsAll(expectedZipEntries);
@@ -72,7 +74,8 @@ public class ExportLogsOnServerManagerDUnit {
     String zipPath = getZipPathFromCommandResult(message);
 
     Set<String> expectedZipEntries =
-        Sets.newHashSet("server-0/server-0.log", "server-1/server-1.log");
+        Sets.newHashSet(Paths.get("server-0", "server-0.log").toString(),
+            Paths.get("server-1", "server-1.log").toString());
     Set<String> actualZipEnries =
         new 
ZipFile(zipPath).stream().map(ZipEntry::getName).collect(Collectors.toSet());
     assertThat(actualZipEnries).containsAll(expectedZipEntries);
diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
index 6774e54..f6f8dd1 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ExportLogsWithMemberGroupDUnitTest.java
@@ -22,6 +22,7 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_P
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
@@ -92,7 +93,7 @@ public class ExportLogsWithMemberGroupDUnitTest {
     String zipPath = getZipPathFromCommandResult(connector.getGfshOutput());
     Set<String> actualZipEntries = getZipEntries(zipPath);
 
-    Set<String> expectedFiles = Sets.newHashSet("server-1/server-1.log");
+    Set<String> expectedFiles = Sets.newHashSet(Paths.get("server-1", 
"server-1.log").toString());
     assertThat(actualZipEntries).isEqualTo(expectedFiles);
   }
 
@@ -103,7 +104,8 @@ public class ExportLogsWithMemberGroupDUnitTest {
     String zipPath = getZipPathFromCommandResult(connector.getGfshOutput());
     Set<String> actualZipEntries = getZipEntries(zipPath);
 
-    Set<String> expectedFiles = Sets.newHashSet("server-1/server-1.log", 
"server-2/server-2.log");
+    Set<String> expectedFiles = Sets.newHashSet(Paths.get("server-1", 
"server-1.log").toString(),
+        Paths.get("server-2", "server-2.log").toString());
     assertThat(actualZipEntries).isEqualTo(expectedFiles);
 
     connector.executeAndAssertThat("export logs 
--group=group2").statusIsSuccess();