- A full User's Guide is available
+ A full User's Guide is available
as are various project reports.
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 34b02c75d..740c55065 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -47,5 +47,10 @@
+
-
\ No newline at end of file
+
diff --git a/src/test/java/org/apache/commons/cli/ApplicationTest.java b/src/test/java/org/apache/commons/cli/ApplicationTest.java
index 59b32917a..636580926 100644
--- a/src/test/java/org/apache/commons/cli/ApplicationTest.java
+++ b/src/test/java/org/apache/commons/cli/ApplicationTest.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
*/
@SuppressWarnings("deprecation") // tests some deprecated classes
class ApplicationTest {
+
/**
* Ant test
*/
diff --git a/src/test/java/org/apache/commons/cli/CommandLineTest.java b/src/test/java/org/apache/commons/cli/CommandLineTest.java
index 6de605a54..98c7eb79a 100644
--- a/src/test/java/org/apache/commons/cli/CommandLineTest.java
+++ b/src/test/java/org/apache/commons/cli/CommandLineTest.java
@@ -374,14 +374,14 @@ void testGetOptionsCtor() {
/**
* Test for get option value with and without default values. Verifies that deprecated options only report as
* deprecated once.
- * @param args the argument strings to parse.
- * @param opt the option to check for values with.
- * @param optionGroup the option group to check for values with.
+ * @param args The argument strings to parse.
+ * @param opt The option to check for values with.
+ * @param optionGroup The option group to check for values with.
* @param optDep {@code true} if the opt is deprecated.
* @param optValue The value expected from opt.
* @param grpDep {@code true} if the group is deprecated.
- * @param grpValue the value expected from the group.
- * @param grpOpt the option that is expected to be processed by the group.
+ * @param grpValue The value expected from the group.
+ * @param grpOpt The option that is expected to be processed by the group.
* @throws ParseException on parse error.
*/
@ParameterizedTest(name = "{0}, {1}")
@@ -480,14 +480,14 @@ void testGetOptionValue(final String[] args, final Option opt, final OptionGroup
/**
* Test for get option values with and without default values. Verifies that deprecated options only report as
* deprecated once.
- * @param args the argument strings to parse.
- * @param opt the option to check for values with.
- * @param optionGroup the option group to check for values with.
+ * @param args The argument strings to parse.
+ * @param opt The option to check for values with.
+ * @param optionGroup The option group to check for values with.
* @param optDep {@code true} if the opt is deprecated.
* @param optValue The value expected from opt.
* @param grpDep {@code true} if the group is deprecated.
- * @param grpValue the value expected from the group.
- * @param grpOpt the option that is expected to be processed by the group.
+ * @param grpValue The value expected from the group.
+ * @param grpOpt The option that is expected to be processed by the group.
* @throws ParseException on parse error.
*/
@ParameterizedTest(name = "{0}, {1}")
@@ -724,14 +724,14 @@ void testGetParsedOptionValues(final String[] args, final Option opt, final Opti
/**
* Tests the hasOption calls.
- * @param args the argument strings to parse.
- * @param opt the option to check for values with.
- * @param optionGroup the option group to check for values with.
+ * @param args The argument strings to parse.
+ * @param opt The option to check for values with.
+ * @param optionGroup The option group to check for values with.
* @param optDep {@code true} if the opt is deprecated.
* @param has {@code true} if the opt is present.
* @param grpDep {@code true} if the group is deprecated.
* @param hasGrp {@code true} if the group is present.
- * @param grpOpt the option that is expected to be processed by the group.
+ * @param grpOpt The option that is expected to be processed by the group.
* @throws ParseException on parsing error.
*/
@ParameterizedTest(name = "{0}, {1}")
@@ -780,14 +780,14 @@ void testHasOption(final String[] args, final Option opt, final OptionGroup opti
/**
* Tests the hasOption calls.
- * @param args the argument strings to parse.
- * @param opt the option to check for values with.
- * @param optionGroup the option group to check for values with.
+ * @param args The argument strings to parse.
+ * @param opt The option to check for values with.
+ * @param optionGroup The option group to check for values with.
* @param optDep {@code true} if the opt is deprecated.
* @param has {@code true} if the opt is present.
* @param grpDep {@code true} if the group is deprecated.
* @param hasGrp {@code true} if the group is present.
- * @param grpOpt the option that is expected to be processed by the group.
+ * @param grpOpt The option that is expected to be processed by the group.
* @throws ParseException on parsing error.
*/
@ParameterizedTest(name = "{0}, {1}")
@@ -831,14 +831,14 @@ void testHasOptionNoDeprecationHandler(final String[] args, final Option opt, fi
/**
* Tests the hasOption calls.
- * @param args the argument strings to parse.
- * @param opt the option to check for values with.
- * @param optionGroup the option group to check for values with.
+ * @param args The argument strings to parse.
+ * @param opt The option to check for values with.
+ * @param optionGroup The option group to check for values with.
* @param optDep {@code true} if the opt is deprecated.
* @param has {@code true} if the opt is present.
* @param grpDep {@code true} if the group is deprecated.
* @param hasGrp {@code true} if the group is present.
- * @param grpOpt the option that is expected to be processed by the group.
+ * @param grpOpt The option that is expected to be processed by the group.
* @throws ParseException on parsing error.
*/
@ParameterizedTest(name = "{0}, {1}")
diff --git a/src/test/java/org/apache/commons/cli/ConverterTests.java b/src/test/java/org/apache/commons/cli/ConverterTests.java
index 8691d0757..57cb63f99 100644
--- a/src/test/java/org/apache/commons/cli/ConverterTests.java
+++ b/src/test/java/org/apache/commons/cli/ConverterTests.java
@@ -14,6 +14,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
See the License for the specific language governing permissions and
limitations under the License.
*/
+
package org.apache.commons.cli;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,12 +27,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.DefaultLocale;
/**
* Tests for standard Converters.
@@ -40,13 +43,13 @@ public class ConverterTests {
// A class without a default constructor.
public class AClassWithoutADefaultConstructor {
+
public AClassWithoutADefaultConstructor(final int i) {
}
}
private static Stream numberTestParameters() {
final List lst = new ArrayList<>();
-
lst.add(Arguments.of("123", Long.valueOf("123")));
lst.add(Arguments.of("12.3", Double.valueOf("12.3")));
lst.add(Arguments.of("-123", Long.valueOf("-123")));
@@ -56,19 +59,15 @@ private static Stream numberTestParameters() {
lst.add(Arguments.of("0x5F", null));
lst.add(Arguments.of("2,3", null));
lst.add(Arguments.of("1.2.3", null));
-
return lst.stream();
}
@Test
void testClass() throws Exception {
-
assertNotNull(Converter.CLASS.apply(this.getClass().getName()), this.getClass().getName());
assertNotNull(Converter.CLASS.apply(this.getClass().getCanonicalName()), this.getClass().getCanonicalName());
- assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply(this.getClass().getSimpleName()),
- this.getClass().getSimpleName());
+ assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply(this.getClass().getSimpleName()), this.getClass().getSimpleName());
assertNotNull(Converter.CLASS.apply(this.getClass().getTypeName()), this.getClass().getTypeName());
-
assertThrows(ClassNotFoundException.class, () -> Converter.CLASS.apply("foo.bar"));
assertNotNull(Converter.CLASS.apply(AClassWithoutADefaultConstructor.class.getName()));
}
@@ -76,21 +75,63 @@ void testClass() throws Exception {
@Test
void testDate() throws Exception {
assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("whatever"));
-
/*
- * Dates calculated from strings are dependent upon configuration and environment settings for the
- * machine on which the test is running. To avoid this problem, convert the time into a string
- * and then unparse that using the converter. This produces strings that always match the correct
- * time zone.
+ * Dates calculated from strings are dependent upon configuration and environment settings for the machine on which the test is running. To avoid this
+ * problem, convert the time into a string and then unparse that using the converter. This produces strings that always match the correct time zone.
*/
final Date expected = new Date(1023400137000L);
final DateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
final String formatted = dateFormat.format(expected);
assertEquals(expected, Converter.DATE.apply(formatted));
-
assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Jun 06 17:48:57 EDT 2002"));
}
+ @Test
+ @DefaultLocale(language = "de", country = "DE")
+ void testDateLocaleDe() throws Exception {
+ final Date expected = new Date(1023400137000L);
+ final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+ assertEquals(expected, Converter.DATE.apply(formatted));
+ }
+
+ @Test
+ @DefaultLocale(language = "de", country = "DE")
+ void testDateLocaleDeEnglishInput() throws Exception {
+ // Date.toString() always emits English month/day names, so the converter must still parse
+ // them when the default locale is not English.
+ final Date expected = new Date(1023400137000L);
+ final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH).format(expected);
+ assertEquals(expected, Converter.DATE.apply(formatted));
+ }
+
+ @Test
+ void testDateRejectsInvalid() {
+ // A lenient SimpleDateFormat rolls "Feb 30" over to March 1; the converter must reject
+ // out-of-range fields instead of silently returning a wrong Date.
+ assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Fri Feb 30 12:00:00 UTC 2024"));
+ assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply("Mon Jan 32 00:00:00 UTC 2024"));
+ }
+
+ @Test
+ void testDateRejectsTrailingText() throws Exception {
+ final Date expected = new Date(1023400137000L);
+ final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+ assertEquals(expected, Converter.DATE.apply(formatted));
+ assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
+ }
+
+ @Test
+ @DefaultLocale(language = "de", country = "DE")
+ void testDateRejectsTrailingTextLocaleDe() throws Exception {
+ // Trailing text must be rejected even when a non-English default locale parses the date, and
+ // the reported error position should point past the parsed date rather than at index 0.
+ final Date expected = new Date(1023400137000L);
+ final String formatted = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").format(expected);
+ assertEquals(expected, Converter.DATE.apply(formatted));
+ final java.text.ParseException e = assertThrows(java.text.ParseException.class, () -> Converter.DATE.apply(formatted + " trailing"));
+ assertEquals(formatted.length(), e.getErrorOffset());
+ }
+
@Test
void testFile() throws Exception {
final URL url = this.getClass().getClassLoader().getResource("./org/apache/commons/cli/existing-readable.file");
@@ -112,10 +153,8 @@ void testNumber(final String str, final Number expected) throws Exception {
void testObject() throws Exception {
assertNotNull(Converter.OBJECT.apply(this.getClass().getName()), this.getClass().getName());
assertNotNull(Converter.OBJECT.apply(this.getClass().getCanonicalName()), this.getClass().getCanonicalName());
- assertThrows(ClassNotFoundException.class, () -> Converter.OBJECT.apply(this.getClass().getSimpleName()),
- this.getClass().getSimpleName());
+ assertThrows(ClassNotFoundException.class, () -> Converter.OBJECT.apply(this.getClass().getSimpleName()), this.getClass().getSimpleName());
assertNotNull(Converter.OBJECT.apply(this.getClass().getTypeName()), this.getClass().getTypeName());
-
assertThrows(ClassNotFoundException.class, () -> Converter.OBJECT.apply("foo.bar"));
assertThrows(NoSuchMethodException.class, () -> Converter.OBJECT.apply(AClassWithoutADefaultConstructor.class.getName()));
}
diff --git a/src/test/java/org/apache/commons/cli/OptionsTest.java b/src/test/java/org/apache/commons/cli/OptionsTest.java
index f0ac95258..d6b2f4667 100644
--- a/src/test/java/org/apache/commons/cli/OptionsTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionsTest.java
@@ -182,6 +182,20 @@ void testGetMatchingOpts() {
assertToStrings(options.getOption("verbose"));
}
+ @Test
+ void testGetMatchingOptsEmptyName() throws Exception {
+ final Options options = new Options();
+ options.addOption(Option.builder("c").longOpt("config-file").hasArg().get());
+ assertTrue(options.getMatchingOptions(null).isEmpty());
+ assertTrue(options.getMatchingOptions("").isEmpty());
+ assertTrue(options.getMatchingOptions("-").isEmpty());
+ assertTrue(options.getMatchingOptions("--").isEmpty());
+ // "--=value" names no option, so it must not bind a value to config-file
+ for (final CommandLineParser parser : new CommandLineParser[] { new DefaultParser(), new PosixParser() }) {
+ assertThrows(UnrecognizedOptionException.class, () -> parser.parse(options, new String[] { "--=/etc/shadow" }));
+ }
+ }
+
@Test
void testGetOptionsGroups() {
final Options options = new Options();
diff --git a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
index 987450734..fe14877ac 100644
--- a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
+++ b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
@@ -134,6 +134,9 @@ private static Stream createValueTestParameters() throws MalformedURL
list.add(Arguments.of("5", Character.class, '5'));
list.add(Arguments.of("5.5", Character.class, '5'));
list.add(Arguments.of("\\u0124", Character.class, Character.toChars(0x0124)[0]));
+ list.add(Arguments.of("\\u1F600", Character.class, ParseException.class));
+ list.add(Arguments.of("\\uD800", Character.class, ParseException.class));
+ list.add(Arguments.of("\\uDFFF", Character.class, ParseException.class));
list.add(Arguments.of("just-a-string", Double.class, ParseException.class));
list.add(Arguments.of("5", Double.class, 5d));
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
index a1a0e9f06..2db045fcf 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
@@ -32,6 +32,7 @@
import org.junit.jupiter.api.Test;
class BugCLI162Test {
+
/** Constant for the line separator. */
private static final String CR = System.lineSeparator();
diff --git a/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java b/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java
index cbedfe225..db335e095 100644
--- a/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java
+++ b/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java
@@ -51,7 +51,7 @@ public class AptHelpAppendable extends FilterHelpAppendable {
/**
* Constructs an appendable filter built on top of the specified underlying appendable.
*
- * @param output the underlying appendable to be assigned to the field {@code this.output} for later use, or {@code null} if this instance is to be created
+ * @param output The underlying appendable to be assigned to the field {@code this.output} for later use, or {@code null} if this instance is to be created
* without an underlying stream.
*/
public AptHelpAppendable(final Appendable output) {
diff --git a/src/test/java/org/apache/commons/cli/example/AptHelpAppendableTest.java b/src/test/java/org/apache/commons/cli/example/AptHelpAppendableTest.java
index b4a9408e9..d87de22b0 100644
--- a/src/test/java/org/apache/commons/cli/example/AptHelpAppendableTest.java
+++ b/src/test/java/org/apache/commons/cli/example/AptHelpAppendableTest.java
@@ -91,9 +91,9 @@ void testAppendTableTest() throws IOException {
final String[] headers = { "one", "two", "three" };
// @formatter:off
final List> rows = Arrays.asList(
- Arrays.asList(new String[]{"uno", "dos", "tres"}),
- Arrays.asList(new String[]{"aon", "dhá", "trí"}),
- Arrays.asList(new String[]{"واحد", "اثنين", "ثلاثة"})
+ Arrays.asList("uno", "dos", "tres"),
+ Arrays.asList("aon", "dhá", "trí"),
+ Arrays.asList("واحد", "اثنين", "ثلاثة")
);
// @formatter:on
List expected = new ArrayList<>();
diff --git a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java
index 51ae058d0..00f901ab6 100644
--- a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java
+++ b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java
@@ -34,7 +34,7 @@ public class XhtmlHelpAppendable extends FilterHelpAppendable {
/**
* Constructs an appendable filter built on top of the specified underlying appendable.
*
- * @param output the underlying appendable to be assigned to the field {@code this.output} for later use, or {@code null} if this instance is to be created
+ * @param output The underlying appendable to be assigned to the field {@code this.output} for later use, or {@code null} if this instance is to be created
* without an underlying stream.
*/
public XhtmlHelpAppendable(final Appendable output) {
diff --git a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendableTest.java b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendableTest.java
index db78ee249..808fce1f2 100644
--- a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendableTest.java
+++ b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendableTest.java
@@ -85,9 +85,9 @@ void testAppendTableTest() throws IOException {
final String[] headers = { "one", "two", "three" };
// @formatter:off
final List> rows = Arrays.asList(
- Arrays.asList(new String[]{"uno", "dos", "tres"}),
- Arrays.asList(new String[]{"aon", "dhá", "trí"}),
- Arrays.asList(new String[]{"واحد", "اثنين", "ثلاثة"})
+ Arrays.asList("uno", "dos", "tres"),
+ Arrays.asList("aon", "dhá", "trí"),
+ Arrays.asList("واحد", "اثنين", "ثلاثة")
);
// @formatter:on
List expected = new ArrayList<>();
diff --git a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
index 41e9c08d0..e7b995bca 100644
--- a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -161,7 +161,27 @@ void testPrintHelpHeader() throws IOException {
}
@Test
- public void testPrintHelpWithIterableOptions() throws IOException {
+ void testPrintHelpWithDefaults() throws IOException {
+ final StringBuilder sb = new StringBuilder();
+ final TextHelpAppendable serializer = new TextHelpAppendable(sb);
+ final HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).get();
+
+ final Options options = new Options().addOption(Option.builder("a").since("1853").hasArg().desc("aaaa aaaa aaaa aaaa aaaa").get());
+
+ final List expected = new ArrayList<>();
+ expected.add(" usage: commandSyntax");
+ expected.add("");
+ expected.add(" Options Since Description ");
+ expected.add(" -a 1853 aaaa aaaa aaaa aaaa aaaa");
+ expected.add("");
+
+ formatter.printHelp("commandSyntax", options);
+ final List actual = IOUtils.readLines(new StringReader(sb.toString()));
+ assertEquals(expected, actual);
+ }
+
+ @Test
+ void testPrintHelpWithIterableOptions() throws IOException {
final StringBuilder sb = new StringBuilder();
final TextHelpAppendable serializer = new TextHelpAppendable(sb);
HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).get();
@@ -320,6 +340,39 @@ void testPrintOptions() throws IOException {
assertEquals(expected, actual);
}
+ /**
+ * Continuation description lines must share the same indent.
+ *
+ * @see [CLI-354] HelpFormatter: Description indentation is incorrect
+ */
+ @Test
+ void testPrintHelpWrappedDescriptionIndent() throws IOException {
+ final StringBuilder sb = new StringBuilder();
+ final TextHelpAppendable serializer = new TextHelpAppendable(sb);
+ final HelpFormatter formatter = HelpFormatter.builder().setHelpAppendable(serializer).setShowSince(false).get();
+ final String description = "an argument passed to the remote command. The value will be wrapped in double quotes "
+ + "and appended to the command-line. This option can be added multiple times.";
+ final Options options = new Options().addOption(Option.builder("V").longOpt("argument-value").hasArg().desc(description).get());
+
+ final List expected = new ArrayList<>();
+ expected.add(" usage: cs [-V ]");
+ expected.add("");
+ expected.add(" header");
+ expected.add("");
+ expected.add(" Options Description ");
+ expected.add(" -V, --argument-value an argument passed to the remote command. ");
+ expected.add(" The value will be wrapped in double quotes");
+ expected.add(" and appended to the command-line. This ");
+ expected.add(" option can be added multiple times. ");
+ expected.add("");
+ expected.add(" footer");
+ expected.add("");
+
+ formatter.printHelp("cs", "header", options, "footer", true);
+ final List actual = IOUtils.readLines(new StringReader(sb.toString()));
+ assertEquals(expected, actual);
+ }
+
@Test
void testSetOptionFormatBuilderTest() {
final HelpFormatter.Builder underTest = HelpFormatter.builder();
diff --git a/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java b/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
index d29fcddbc..182cf50fc 100644
--- a/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
+++ b/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
@@ -37,13 +37,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
/**
* Tests {@link TextHelpAppendable}.
*/
-public final class TextHelpAppendableTest {
+final class TextHelpAppendableTest {
private StringBuilder sb;
private TextHelpAppendable underTest;
@BeforeEach
- public void setUp() {
+ void setUp() {
sb = new StringBuilder();
underTest = new TextHelpAppendable(sb);
}
@@ -280,6 +280,10 @@ void testindexOfWrapPos() {
assertThrows(IllegalArgumentException.class, () -> TextHelpAppendable.indexOfWrap("", 0, 0));
assertEquals(3, TextHelpAppendable.indexOfWrap("Hello", 4, 0));
+
+ // startPos + width must not overflow when width is TextStyle.UNSET_MAX_WIDTH
+ assertEquals(30, TextHelpAppendable.indexOfWrap(testString, TextStyle.UNSET_MAX_WIDTH, 0), "did not find break character with unbounded width");
+ assertEquals(testString.length(), TextHelpAppendable.indexOfWrap(testString, TextStyle.UNSET_MAX_WIDTH, 31), "overflow produced a negative wrap index");
}
@ParameterizedTest
diff --git a/src/test/java/org/apache/commons/cli/help/TextStyleTests.java b/src/test/java/org/apache/commons/cli/help/TextStyleTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/cli/help/TextStyleTests.java
rename to src/test/java/org/apache/commons/cli/help/TextStyleTest.java
index e745922a6..2f18ae3ba 100644
--- a/src/test/java/org/apache/commons/cli/help/TextStyleTests.java
+++ b/src/test/java/org/apache/commons/cli/help/TextStyleTest.java
@@ -28,9 +28,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-public class TextStyleTests {
+class TextStyleTest {
- public static Stream padTestData() {
+ static Stream padTestData() {
final List lst = new ArrayList<>();
final TextStyle.Builder builder = TextStyle.builder();
builder.setIndent(5);
@@ -71,6 +71,17 @@ public static Stream padTestData() {
builder.setAlignment(TextStyle.Alignment.CENTER);
lst.add(Arguments.of(builder.get(), " Hello world ", " Hello world "));
+ // width equal to text length + indent applies indent on continuation lines
+ builder.setMaxWidth(16);
+ builder.setAlignment(TextStyle.Alignment.LEFT);
+ lst.add(Arguments.of(builder.get(), "Hello world ", " Hello world"));
+
+ builder.setAlignment(TextStyle.Alignment.RIGHT);
+ lst.add(Arguments.of(builder.get(), " Hello world", " Hello world"));
+
+ builder.setAlignment(TextStyle.Alignment.CENTER);
+ lst.add(Arguments.of(builder.get(), " Hello world ", " Hello world "));
+
// width greater than text length and less than text length + indent creates result of text length + pad
builder.setMaxWidth(14);
builder.setAlignment(TextStyle.Alignment.LEFT);