You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2020/06/11 18:33:04 UTC
[geode] branch develop updated: GEODE-8243: Use java.exe on Windows
in Launcher tests (#5241)
This is an automated email from the ASF dual-hosted git repository.
klund 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 d82e30d GEODE-8243: Use java.exe on Windows in Launcher tests (#5241)
d82e30d is described below
commit d82e30d3dd50e3983c332063c41915e97aca721a
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu Jun 11 11:32:34 2020 -0700
GEODE-8243: Use java.exe on Windows in Launcher tests (#5241)
---
.../launchers/LocatorLauncherWithCustomLogConfigAcceptanceTest.java | 6 ++++--
.../geode/launchers/LocatorLauncherWithPulseAcceptanceTest.java | 6 ++++--
.../LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest.java | 6 ++++--
.../launchers/ServerLauncherWithCustomLogConfigAcceptanceTest.java | 6 ++++--
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithCustomLogConfigAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithCustomLogConfigAcceptanceTest.java
index 52fe254..82f74b1 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithCustomLogConfigAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithCustomLogConfigAcceptanceTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.launchers;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.geode.internal.lang.SystemUtils.isWindows;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
import static org.apache.geode.test.util.ResourceUtils.createFileFromResource;
@@ -63,9 +64,10 @@ public class LocatorLauncherWithCustomLogConfigAcceptanceTest {
.as("java.home is not null")
.isNotNull();
- javaBin = Paths.get(javaHome, "bin", "java");
+ String java = isWindows() ? "java.exe" : "java";
+ javaBin = Paths.get(javaHome, "bin", java);
assertThat(javaBin)
- .as("JAVA_HOME/bin/java exists")
+ .as("JAVA_HOME/bin/" + java + " exists")
.exists();
}
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAcceptanceTest.java
index c7dd1a9..25260b7 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAcceptanceTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.launchers;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.geode.internal.lang.SystemUtils.isWindows;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
import static org.assertj.core.api.Assertions.assertThat;
@@ -57,9 +58,10 @@ public class LocatorLauncherWithPulseAcceptanceTest {
.as("java.home is not null")
.isNotNull();
- javaBin = Paths.get(javaHome, "bin", "java");
+ String java = isWindows() ? "java.exe" : "java";
+ javaBin = Paths.get(javaHome, "bin", java);
assertThat(javaBin)
- .as("JAVA_HOME/bin/java exists")
+ .as("JAVA_HOME/bin/" + java + " exists")
.exists();
}
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest.java
index cbb6b84..a6616a5 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.launchers;
import static java.nio.file.Files.copy;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.geode.internal.lang.SystemUtils.isWindows;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
import static org.apache.geode.test.util.ResourceUtils.createFileFromResource;
@@ -68,9 +69,10 @@ public class LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest {
.as("java.home is not null")
.isNotNull();
- javaBin = Paths.get(javaHome, "bin", "java");
+ String java = isWindows() ? "java.exe" : "java";
+ javaBin = Paths.get(javaHome, "bin", java);
assertThat(javaBin)
- .as("JAVA_HOME/bin/java exists")
+ .as("JAVA_HOME/bin/" + java + " exists")
.exists();
}
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerLauncherWithCustomLogConfigAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerLauncherWithCustomLogConfigAcceptanceTest.java
index a26414f..4dfaf00 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerLauncherWithCustomLogConfigAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerLauncherWithCustomLogConfigAcceptanceTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.launchers;
import static java.nio.file.Files.copy;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.geode.internal.lang.SystemUtils.isWindows;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static org.apache.geode.test.awaitility.GeodeAwaitility.getTimeout;
import static org.apache.geode.test.util.ResourceUtils.createFileFromResource;
@@ -62,9 +63,10 @@ public class ServerLauncherWithCustomLogConfigAcceptanceTest {
.as("java.home is not null")
.isNotNull();
- javaBin = Paths.get(javaHome, "bin", "java");
+ String java = isWindows() ? "java.exe" : "java";
+ javaBin = Paths.get(javaHome, "bin", java);
assertThat(javaBin)
- .as("JAVA_HOME/bin/java exists")
+ .as("JAVA_HOME/bin/" + java + " exists")
.exists();
}