From 06e18e757262b624578b4b79ede4dd7d9432228c Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 16 Mar 2025 19:25:38 +0100 Subject: [PATCH] quick-e2e: Refactor Main and StartServerService to improve task execution and process handling --- tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java | 4 ++-- .../quicke2e/steps/startServer/StartServerService.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java index 2fd141f1..471038d2 100644 --- a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java +++ b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java @@ -40,8 +40,8 @@ public class Main { startScript.writeStartScript(context); GradleService gradle = new GradleService(); - gradle.runTask(":plugins:fancyholograms:shadowJar"); - gradle.runTask(":plugins:fancyvisuals:shadowJar"); +// gradle.runTask(":plugins:fancyholograms:shadowJar"); +// gradle.runTask(":plugins:fancyvisuals:shadowJar"); CopyFileService copyFile = new CopyFileService(); copyFile.copyFile(context, "plugins/fancyholograms/build/libs", "FancyHolograms-.*\\.jar", "plugins"); diff --git a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/startServer/StartServerService.java b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/startServer/StartServerService.java index 4611a803..278f3b35 100644 --- a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/startServer/StartServerService.java +++ b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/startServer/StartServerService.java @@ -7,12 +7,10 @@ public class StartServerService { public void startServer(Context context) { ProcessBuilder processBuilder = new ProcessBuilder("java", "-jar", context.serverFileName()); processBuilder.directory(context.serverEnvPath().toFile()); - processBuilder.redirectErrorStream(true); - processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT); - processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT); try { - processBuilder.start(); + Process process = processBuilder.start(); + process.waitFor(); } catch (Exception e) { e.printStackTrace(); }