Handling specific message for invalid scenarios

remkop · Jun 27, 2022 · 132f1ab · 132f1ab
1 parent c1af2c7
commit 132f1ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -7824,10 +7824,12 @@ public UsageMessageSpec width(int newValue) {
              * @return this {@code UsageMessageSpec} for method chaining
              * @since 4.2 */
             public UsageMessageSpec longOptionsMaxWidth(int newValue) {
-                if (newValue >= DEFAULT_USAGE_LONG_OPTIONS_WIDTH && newValue <= width() - DEFAULT_USAGE_LONG_OPTIONS_WIDTH) {
-                    longOptionsMaxWidth = newValue;
+                if (newValue < DEFAULT_USAGE_LONG_OPTIONS_WIDTH) {
+                    CommandLine.tracer().info("Invalid usage long options max width %d. Minimum value is %d", newValue,  DEFAULT_USAGE_LONG_OPTIONS_WIDTH);
+                } else if (newValue > width() - DEFAULT_USAGE_LONG_OPTIONS_WIDTH) {
+                    CommandLine.tracer().info("Invalid usage long options max width %d. Value must not exceed width(%d) - %d", newValue , width(), DEFAULT_USAGE_LONG_OPTIONS_WIDTH);
                 } else {
-                    CommandLine.tracer().info("Invalid usage long options max width %d. Value must not exceed width(%d) - %d", newValue, width(), DEFAULT_USAGE_LONG_OPTIONS_WIDTH);
+                    longOptionsMaxWidth = newValue;
                 }
                 return this;
             }

diff --git a/src/test/java/picocli/HelpTest.java b/src/test/java/picocli/HelpTest.java
@@ -4396,7 +4396,7 @@ public void testUsageMessageSpec_LongOptionsColumnLengthMinimum_Minimum20() {
         assertEquals(20, cmd.getUsageHelpLongOptionsMaxWidth());
         assertEquals(20, cmd.getCommandSpec().usageMessage().longOptionsMaxWidth());
 
-        String expected = "Invalid usage long options max width 19. Value must not exceed width(80) - 20";
+        String expected = "Invalid usage long options max width 19. Minimum value is 20";
         assertTrue(systemErrRule.getLog(), systemErrRule.getLog().contains(expected));
     }