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 38902f5 GEODE-5452: StartMemberUtilsTest is not platform agnostic
(#2157)
38902f5 is described below
commit 38902f5a67811ff74c998a67eaff281a6d053515
Author: Jens Deppe <[email protected]>
AuthorDate: Thu Jul 19 13:17:15 2018 -0700
GEODE-5452: StartMemberUtilsTest is not platform agnostic (#2157)
---
.../internal/cli/commands/StartMemberUtilsTest.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
index 1b2f439..2f0cd34 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -89,10 +90,14 @@ public class StartMemberUtilsTest {
@Test
public void testGeodeOnClasspathIsFirst() {
String currentClasspath = System.getProperty("java.class.path");
- String customGeodeCore = "/custom/geode-core-" +
GemFireVersion.getGemFireVersion() + ".jar";
- System.setProperty("java.class.path", currentClasspath + ":" +
customGeodeCore);
-
- String[] otherJars = new String[] {"/other/one.jar", "/other/two.jar"};
+ String customGeodeCore = FileSystems
+ .getDefault().getPath("/custom/geode-core-" +
GemFireVersion.getGemFireVersion() + ".jar")
+ .toAbsolutePath().toString();
+ System.setProperty("java.class.path", currentClasspath +
File.pathSeparator + customGeodeCore);
+
+ String[] otherJars = new String[] {
+
FileSystems.getDefault().getPath("/other/one.jar").toAbsolutePath().toString(),
+
FileSystems.getDefault().getPath("/other/two.jar").toAbsolutePath().toString()};
String gemfireClasspath = StartMemberUtils.toClasspath(true, otherJars);
assertThat(gemfireClasspath).startsWith(customGeodeCore);