fix powershell command

helidon-io · Dec 9, 2024 · c5f8502 · c5f8502
1 parent 5706e88
commit c5f8502
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/...integration/harness/src/main/java/io/helidon/tests/integration/harness/ProcessRunner.java b/...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<String> command(List<String> opts, List<String> 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
@@ -215,7 +215,7 @@
                         <groupId>io.helidon.build-tools</groupId>
                         <artifactId>helidon-maven-plugin</artifactId>
                         <configuration>
-                            <defaultJvmOptions>-Dapp-static-path=../../web</defaultJvmOptions>
+                            <defaultJvmOptions>-Dapp.static.path=../../web</defaultJvmOptions>
                         </configuration>
                     </plugin>
                     <plugin>

diff --git a/...tion/packaging/se-1/src/main/java/io/helidon/tests/integration/packaging/se1/Se1Main.java b/...tion/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/...ing/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java b/...ing/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java
@@ -58,7 +58,7 @@ private ProcessMonitor process(Map<String, ?> 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();
     }