Skip to content

Commit 54c1853

Browse files
Fix environment component unit tests related to IBM / J9 (#9133)
1 parent 1126e5e commit 54c1853

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

components/environment/src/test/java/datadog/environment/CommandLineTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static java.util.Collections.emptyList;
88
import static java.util.Objects.requireNonNull;
99
import static org.junit.jupiter.api.Assertions.assertEquals;
10-
import static org.junit.jupiter.api.Assumptions.assumeFalse;
10+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
1111
import static org.junit.jupiter.params.provider.Arguments.arguments;
1212

1313
import datadog.environment.CommandLineHelper.Result;
@@ -99,7 +99,7 @@ private static void skipArgFileTestOnJava8(RunArguments arguments) {
9999
}
100100
}
101101
if (useArgFile) {
102-
assumeFalse(System.getProperty("java.home").matches(".*[-/]8[./].*"));
102+
assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(9));
103103
}
104104
}
105105

components/environment/src/test/java/datadog/environment/JavaVirtualMachineTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,14 @@ void onlyOnGraalVm() {
114114
void onlyOnIbm8() {
115115
assertFalse(JavaVirtualMachine.isGraalVM());
116116
assertTrue(JavaVirtualMachine.isIbm8());
117-
assertFalse(JavaVirtualMachine.isJ9());
117+
assertTrue(JavaVirtualMachine.isJ9());
118118
assertFalse(JavaVirtualMachine.isOracleJDK8());
119119
}
120120

121121
@Test
122122
@EnabledIfSystemProperty(named = "java.vm.name", matches = ".*J9.*")
123123
void onlyOnJ9() {
124124
assertFalse(JavaVirtualMachine.isGraalVM());
125-
assertFalse(JavaVirtualMachine.isIbm8());
126125
assertTrue(JavaVirtualMachine.isJ9());
127126
assertFalse(JavaVirtualMachine.isOracleJDK8());
128127
}

0 commit comments

Comments
 (0)