From c59d61f8c1d3957cd1a6263157184a6b93c96883 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 5 Aug 2024 14:52:18 -0700 Subject: [PATCH] Added command file and test for Windows --- src/test/java/rife/bld/operations/TestJlinkOperation.java | 7 ++++++- src/test/resources/jlink/options_jlink.txt | 2 +- src/test/resources/jlink/options_jlink_win.txt | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/test/resources/jlink/options_jlink_win.txt diff --git a/src/test/java/rife/bld/operations/TestJlinkOperation.java b/src/test/java/rife/bld/operations/TestJlinkOperation.java index 9baef3e..1078903 100644 --- a/src/test/java/rife/bld/operations/TestJlinkOperation.java +++ b/src/test/java/rife/bld/operations/TestJlinkOperation.java @@ -78,7 +78,12 @@ public class TestJlinkOperation { @Test void testCmdFiles() { System.setOut(new PrintStream(outputStreamCaptor)); - var jlink = new JlinkOperation().cmdFiles("src/test/resources/jlink/options_jlink.txt"); + final JlinkOperation jlink; + if (System.getProperty("os.name").startsWith("Windows")) { + jlink = new JlinkOperation().cmdFiles("src/test/resources/jlink/options_jlink_win.txt"); + } else { + jlink = new JlinkOperation().cmdFiles("src/test/resources/jlink/options_jlink.txt"); + } assertDoesNotThrow(jlink::execute); var out = outputStreamCaptor.toString(); assertTrue(out.contains("List of available plugins:"), out); diff --git a/src/test/resources/jlink/options_jlink.txt b/src/test/resources/jlink/options_jlink.txt index 1c35a35..64cd9e6 100644 --- a/src/test/resources/jlink/options_jlink.txt +++ b/src/test/resources/jlink/options_jlink.txt @@ -1,5 +1,5 @@ --verbose --version #--foo - --module-path "\'foo\' \"bar\" --bar" --list-plugins + --module-path "\'foo --bar\' \"bar --foo\" --bar" --list-plugins --output foo --bind-services # bar \ No newline at end of file diff --git a/src/test/resources/jlink/options_jlink_win.txt b/src/test/resources/jlink/options_jlink_win.txt new file mode 100644 index 0000000..e47aa53 --- /dev/null +++ b/src/test/resources/jlink/options_jlink_win.txt @@ -0,0 +1,5 @@ + --verbose --version #--foo + --module-path "\'foo --bar\' --bar" --list-plugins +--output foo --bind-services + +# bar \ No newline at end of file