Skip to content

Commit 08a2a66

Browse files
Can run launcher verifier with altered environment variables
1 parent c50fc5c commit 08a2a66

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.HashMap;
3232
import java.util.List;
3333
import java.util.Map;
34+
import java.util.Objects;
3435
import java.util.Optional;
3536
import java.util.concurrent.atomic.AtomicBoolean;
3637
import java.util.function.Predicate;
@@ -350,6 +351,7 @@ public static final class AppOutputVerifier {
350351
this.launcherPath = helloAppLauncher;
351352
this.outputFilePath = TKit.workDir().resolve(OUTPUT_FILENAME);
352353
this.params = new HashMap<>();
354+
this.env = new HashMap<>();
353355
this.defaultLauncherArgs = new ArrayList<>();
354356
}
355357

@@ -363,6 +365,16 @@ public AppOutputVerifier expectedExitCode(int v) {
363365
return this;
364366
}
365367

368+
public AppOutputVerifier addEnvironment(Map<String, String> v) {
369+
env.putAll(v);
370+
return this;
371+
}
372+
373+
public AppOutputVerifier addEnvironmentVar(String name, String value) {
374+
env.put(Objects.requireNonNull(name), Objects.requireNonNull(name));
375+
return this;
376+
}
377+
366378
public AppOutputVerifier addDefaultArguments(String... v) {
367379
return addDefaultArguments(List.of(v));
368380
}
@@ -466,6 +478,10 @@ private Executor getExecutor(String...args) {
466478
.setExecutable(executablePath)
467479
.addArguments(List.of(args));
468480

481+
env.forEach((envVarName, envVarValue) -> {
482+
executor.setEnvVar(envVarName, envVarValue);
483+
});
484+
469485
return configureEnvironment(executor);
470486
}
471487

@@ -476,6 +492,7 @@ private Executor getExecutor(String...args) {
476492
private int expectedExitCode;
477493
private final List<String> defaultLauncherArgs;
478494
private final Map<String, String> params;
495+
private final Map<String, String> env;
479496
}
480497

481498
public static AppOutputVerifier assertApp(Path helloAppLauncher) {

0 commit comments

Comments
 (0)