From a8a3fd100cd7eeee0475ab7d7bfb12528edc3312 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 27 Aug 2025 17:08:19 +0200 Subject: [PATCH] Checking only for "Usage:" but as a constant; No ANSI codes! --- .../de/kosit/validationtool/cmd/CommandLineOptions.java | 8 ++++---- .../validationtool/cmd/CommandlineApplicationTest.java | 8 +------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java index 6381ecf..99cab94 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java @@ -20,12 +20,10 @@ import java.nio.file.Path; import java.util.List; import java.util.concurrent.Callable; +import de.kosit.validationtool.cmd.CommandLineApplication.Level; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import de.kosit.validationtool.cmd.CommandLineApplication.Level; - import picocli.CommandLine.ArgGroup; import picocli.CommandLine.Command; import picocli.CommandLine.Help.Visibility; @@ -38,10 +36,12 @@ import picocli.CommandLine.Parameters; * @author Andreas Penski */ @Command(description = "Structural and semantic validation of xml files", name = "KoSIT Validator", mixinStandardHelpOptions = false, - separator = " ") + separator = " ", synopsisHeading = CommandLineOptions.SYNOSIS_HEADING) @Getter public class CommandLineOptions implements Callable { + static final String SYNOSIS_HEADING = "Usage: "; + /** * @author Andreas Penski */ diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java index cd0cf45..782d401 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java @@ -76,18 +76,12 @@ public class CommandlineApplicationTest { final String[] args = { "-?" }; CommandLineApplication.mainProgram(args); assertThat(CommandLine.getErrorOutput()).isEmpty(); - log.warn("Philip1"); checkForHelp(CommandLine.getOutputLines()); - log.warn("Philip2"); } private static void checkForHelp(final List outputLines) { assertThat(outputLines.size()).isPositive(); - log.warn("!!!!"); - for (final String s : outputLines) - log.warn(s); - log.warn("!!!"); - assertThat(outputLines.stream().filter(l -> l.startsWith("Usage: KoSIT Validator"))).hasSize(1); + assertThat(outputLines.stream().filter(l -> l.startsWith(CommandLineOptions.SYNOSIS_HEADING))).hasSize(1); } @Test