Fix timeout tests on Windows, again

Author: ethauvin

src/test/java/rife/bld/extension/tools/ProcessExecutorTest.java

@@ -74,36 +74,42 @@ private List<String> echoCommand(String... args) {
                 : List.of("echo", String.join(" ", args));
     }
 
-    @SuppressWarnings("SameParameterValue")
-    private List<String> envEchoCommand(String var) {
+    @BeforeEach
+    void setUp() {
+        testLogHandler.clear();
+    }
+
+    @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
+    private List<String> sleepCommand() {
         return SystemTools.isWindows()
-                ? List.of("cmd", "/c", "echo", "%" + var + "%")
-                : List.of("sh", "-c", "echo $" + var);
+                ? List.of("cmd", "/c", "ping -n 12 127.0.0.1") // single arg
+                : List.of("sleep", "5");
     }
 
-    @SuppressWarnings("SameParameterValue")
-    private List<String> exitCommand(int code) {
+    private List<String> blockingCommand() {
         return SystemTools.isWindows()
-                ? List.of("cmd", "/c", "exit", String.valueOf(code))
-                : List.of("sh", "-c", "exit " + code);
+                ? List.of("cmd", "/c", "echo started & ping -n 12 127.0.0.1") // single arg
+                : List.of("sh", "-c", "echo started; sleep 10");
     }
 
     private List<String> multiLineEchoCommand() {
         return SystemTools.isWindows()
-                ? List.of("cmd", "/c", "echo line1& echo line2")
+                ? List.of("cmd", "/c", "echo line1 & echo line2") // single arg
                 : List.of("sh", "-c", "echo line1; echo line2");
     }
 
-    @BeforeEach
-    void setUp() {
-        testLogHandler.clear();
+    @SuppressWarnings("SameParameterValue")
+    private List<String> envEchoCommand(String var) {
+        return SystemTools.isWindows()
+                ? List.of("cmd", "/c", "echo %" + var + "%") // single arg
+                : List.of("sh", "-c", "echo $" + var);
     }
 
-    @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
-    private List<String> sleepCommand() {
+    @SuppressWarnings("SameParameterValue")
+    private List<String> exitCommand(int code) {
         return SystemTools.isWindows()
-                ? List.of("cmd", "/c", "ping", "-n", "12", "127.0.0.1") // no > nul
-                : List.of("sleep", "5");
+                ? List.of("cmd", "/c", "exit " + code) // single arg
+                : List.of("sh", "-c", "exit " + code);
     }
 
     @Nested
@@ -473,13 +479,8 @@ void cleanupThreadInterruptedOnTimeout(@TempDir Path tmp) throws Exception {
             var interrupted = new AtomicBoolean(false);
             var started = new CountDownLatch(1);
 
-            // Windows: don't redirect, or the echo disappears
-            var blockingCmd = SystemTools.isWindows()
-                    ? List.of("cmd", "/c", "echo started & ping -n 12 127.0.0.1")
-                    : List.of("sh", "-c", "echo started; sleep 10");
-
             var result = createBasicExecutor(tmp.toFile())
-                    .command(blockingCmd)
+                    .command(blockingCommand())
                     .timeout(1)
                     .outputConsumer(line -> {
                         if ("started".equals(line)) {
@@ -501,7 +502,7 @@ void cleanupThreadInterruptedOnTimeout(@TempDir Path tmp) throws Exception {
 
         @Test
         @DisplayName("cleanupThread handles null thread")
-        void cleanupThreadWithNullThread(@TempDir Path tmp) throws Exception {
+        void cleanupThreadWithNullThread(@TempDir Path tmp) {
             // inheritIO=true means startOutputReader returns null
             assertDoesNotThrow(() -> createBasicExecutor(tmp.toFile())
                     .command(echoCommand(FOO))
@@ -526,7 +527,7 @@ void cleanupThreadWithFinishedThread(@TempDir Path tmp) throws Exception {
 
         @Test
         @DisplayName("cleanupThread restores interrupt flag if interrupted during join")
-        void cleanupThreadRestoresInterruptFlag() throws Exception {
+        void cleanupThreadRestoresInterruptFlag() {
             class TestExecutor extends ProcessExecutor<TestExecutor> {
                 void testCleanupThread() {
                     var thread = new Thread(() -> {