diff --git a/components/environment/src/test/java/datadog/environment/CommandLineTest.java b/components/environment/src/test/java/datadog/environment/CommandLineTest.java index d575f9c3e2f..b1673b80a29 100644 --- a/components/environment/src/test/java/datadog/environment/CommandLineTest.java +++ b/components/environment/src/test/java/datadog/environment/CommandLineTest.java @@ -7,7 +7,7 @@ import static java.util.Collections.emptyList; import static java.util.Objects.requireNonNull; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.junit.jupiter.params.provider.Arguments.arguments; import datadog.environment.CommandLineHelper.Result; @@ -99,7 +99,7 @@ private static void skipArgFileTestOnJava8(RunArguments arguments) { } } if (useArgFile) { - assumeFalse(System.getProperty("java.home").matches(".*[-/]8[./].*")); + assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(9)); } } diff --git a/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java b/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java index 62b0ad3307f..8a8d1104e0d 100644 --- a/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java +++ b/components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java @@ -114,7 +114,7 @@ void onlyOnGraalVm() { void onlyOnIbm8() { assertFalse(JavaVirtualMachine.isGraalVM()); assertTrue(JavaVirtualMachine.isIbm8()); - assertFalse(JavaVirtualMachine.isJ9()); + assertTrue(JavaVirtualMachine.isJ9()); assertFalse(JavaVirtualMachine.isOracleJDK8()); } @@ -122,7 +122,6 @@ void onlyOnIbm8() { @EnabledIfSystemProperty(named = "java.vm.name", matches = ".*J9.*") void onlyOnJ9() { assertFalse(JavaVirtualMachine.isGraalVM()); - assertFalse(JavaVirtualMachine.isIbm8()); assertTrue(JavaVirtualMachine.isJ9()); assertFalse(JavaVirtualMachine.isOracleJDK8()); }