File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed
components/environment/src/test/java/datadog/environment Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change 7
7
import static java .util .Collections .emptyList ;
8
8
import static java .util .Objects .requireNonNull ;
9
9
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 ;
11
11
import static org .junit .jupiter .params .provider .Arguments .arguments ;
12
12
13
13
import datadog .environment .CommandLineHelper .Result ;
@@ -99,7 +99,7 @@ private static void skipArgFileTestOnJava8(RunArguments arguments) {
99
99
}
100
100
}
101
101
if (useArgFile ) {
102
- assumeFalse ( System . getProperty ( "java.home" ). matches ( ".*[-/]8[./].*" ));
102
+ assumeTrue ( JavaVirtualMachine . isJavaVersionAtLeast ( 9 ));
103
103
}
104
104
}
105
105
Original file line number Diff line number Diff line change @@ -114,15 +114,14 @@ void onlyOnGraalVm() {
114
114
void onlyOnIbm8 () {
115
115
assertFalse (JavaVirtualMachine .isGraalVM ());
116
116
assertTrue (JavaVirtualMachine .isIbm8 ());
117
- assertFalse (JavaVirtualMachine .isJ9 ());
117
+ assertTrue (JavaVirtualMachine .isJ9 ());
118
118
assertFalse (JavaVirtualMachine .isOracleJDK8 ());
119
119
}
120
120
121
121
@ Test
122
122
@ EnabledIfSystemProperty (named = "java.vm.name" , matches = ".*J9.*" )
123
123
void onlyOnJ9 () {
124
124
assertFalse (JavaVirtualMachine .isGraalVM ());
125
- assertFalse (JavaVirtualMachine .isIbm8 ());
126
125
assertTrue (JavaVirtualMachine .isJ9 ());
127
126
assertFalse (JavaVirtualMachine .isOracleJDK8 ());
128
127
}
You can’t perform that action at this time.
0 commit comments