diff --git a/tests/integration/harness/src/main/java/io/helidon/tests/integration/harness/ProcessRunner.java b/tests/integration/harness/src/main/java/io/helidon/tests/integration/harness/ProcessRunner.java index 5302beb0522..e2179545d0f 100644 --- a/tests/integration/harness/src/main/java/io/helidon/tests/integration/harness/ProcessRunner.java +++ b/tests/integration/harness/src/main/java/io/helidon/tests/integration/harness/ProcessRunner.java @@ -31,6 +31,7 @@ import java.util.function.Supplier; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import static java.util.Objects.requireNonNull; @@ -468,12 +469,12 @@ private static final class JlinkRunner extends ProcessRunner { protected List command(List opts, List args) { Objects.requireNonNull(finalName, "finalName is null"); if (IS_WINDOWS) { - if (opts.contains("-Dexit.on.started=!")) { - opts.add("--test"); - } return new CommandBuilder("powershell") + .append("-File") .append("target/" + finalName + "-jri/bin/start.ps1") - .append("--jvm", String.join(" ", opts)) + .append("--jvm", opts.stream() + .map(option -> String.format("'\\\"%s\\\"'", option)) + .collect(Collectors.joining(" "))) .append(args) .command(); } diff --git a/tests/integration/packaging/se-1/pom.xml b/tests/integration/packaging/se-1/pom.xml index 0a9024646f1..7b759abcf76 100644 --- a/tests/integration/packaging/se-1/pom.xml +++ b/tests/integration/packaging/se-1/pom.xml @@ -215,7 +215,7 @@ io.helidon.build-tools helidon-maven-plugin - -Dapp-static-path=../../web + -Dapp.static.path=../../web diff --git a/tests/integration/packaging/se-1/src/main/java/io/helidon/tests/integration/packaging/se1/Se1Main.java b/tests/integration/packaging/se-1/src/main/java/io/helidon/tests/integration/packaging/se1/Se1Main.java index 04b877235f4..3346e74b595 100644 --- a/tests/integration/packaging/se-1/src/main/java/io/helidon/tests/integration/packaging/se1/Se1Main.java +++ b/tests/integration/packaging/se-1/src/main/java/io/helidon/tests/integration/packaging/se1/Se1Main.java @@ -119,7 +119,7 @@ private static HttpRouting.Builder createRouting(Config config) { MockZipkinService zipkinService = new MockZipkinService(Set.of("helidon-webclient")); WebClientService webClientService = new WebClientService(config, zipkinService); - Path web = config.get("app-static-path") + Path web = config.get("app.static.path") .as(Path.class) .orElseThrow(() -> new IllegalStateException("app static path is not present")); diff --git a/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java b/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java index fd983bacbfd..1379fd0368e 100644 --- a/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java +++ b/tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java @@ -58,7 +58,7 @@ private ProcessMonitor process(Map properties) { return ProcessRunner.of(execMode()) .finalName("helidon-tests-integration-packaging-se-1") .properties(properties) - .properties(Map.of("app-static-path", Path.of("web").toAbsolutePath())) + .properties(Map.of("app.static.path", Path.of("web").toAbsolutePath())) .port(0) .start(); }