You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/09/30 10:56:36 UTC
(commons-cli) branch master updated: Sort members
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new 760357fc Sort members
760357fc is described below
commit 760357fc340dc563d047449a26eb8c1313c516a9
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Tue Sep 30 06:51:38 2025 -0400
Sort members
Use final and remove trailing whitespace
---
.../apache/commons/cli/help/HelpFormatterTest.java | 2 +-
.../commons/cli/help/TextHelpAppendableTest.java | 128 ++++++++++-----------
2 files changed, 65 insertions(+), 65 deletions(-)
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 f260a693..9d524033 100644
--- a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -149,7 +149,7 @@ class HelpFormatterTest {
/**
* Tests example from the mailing list that caused an infinite loop.
- *
+ *
* @see <a href="https://issues.apache.org/jira/browse/CLI-351">[CLI-351] Multiple traililng BREAK_CHAR_SET characters cause infinite loop in
* HelpFormatter</a>
*/
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 1c383498..d29fcddb 100644
--- a/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
+++ b/src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java
@@ -48,70 +48,6 @@ public final class TextHelpAppendableTest {
underTest = new TextHelpAppendable(sb);
}
- @Test
- void testMakeColumnQueue() {
- final String text = "The quick brown fox jumps over the lazy dog";
- final TextStyle.Builder styleBuilder = TextStyle.builder().setMaxWidth(10).setIndent(0).setLeftPad(0);
-
- Queue<String> expected = new LinkedList<>();
- expected.add("The quick ");
- expected.add("brown fox ");
- expected.add("jumps over");
- expected.add("the lazy ");
- expected.add("dog ");
-
- Queue<String> result = underTest.makeColumnQueue(text, styleBuilder.get());
- assertEquals(expected, result, "left aligned failed");
-
- expected.clear();
- expected.add(" The quick");
- expected.add(" brown fox");
- expected.add("jumps over");
- expected.add(" the lazy");
- expected.add(" dog");
- styleBuilder.setAlignment(TextStyle.Alignment.RIGHT);
-
- result = underTest.makeColumnQueue(text, styleBuilder.get());
- assertEquals(expected, result, "right aligned failed");
-
- expected.clear();
- expected.add("The quick ");
- expected.add("brown fox ");
- expected.add("jumps over");
- expected.add(" the lazy ");
- expected.add(" dog ");
- styleBuilder.setAlignment(TextStyle.Alignment.CENTER);
-
- result = underTest.makeColumnQueue(text, styleBuilder.get());
- assertEquals(expected, result, "center aligned failed");
-
- expected = new LinkedList<>();
- expected.add(" The quick");
- expected.add(" brown");
- expected.add(" fox");
- expected.add(" jumps");
- expected.add(" over the");
- expected.add(" lazy dog");
- styleBuilder.setAlignment(TextStyle.Alignment.RIGHT).setLeftPad(5).setIndent(2);
-
- result = underTest.makeColumnQueue(text, styleBuilder.get());
- assertEquals(expected, result, "right aligned failed");
- }
-
- @Test
- void testMakeColumnQueueWithMultipleTrailingLineBreaks() {
- // this test should work with any n>1 multiple trailing characters from TestHelpAppendable.BREAK_CHAR_SET.
- final String text = "Header\t" + (char) Character.PARAGRAPH_SEPARATOR;
- final TextStyle.Builder styleBuilder = TextStyle.builder().setMaxWidth(10).setIndent(0).setLeftPad(0);
-
- Queue<String> expected = new LinkedList<>();
- expected.add("Header ");
- expected.add(" ");
-
- Queue<String> result = underTest.makeColumnQueue(text, styleBuilder.get());
- assertEquals(expected, result, "left aligned failed");
- }
-
@Test
void testAdjustTableFormat() {
// test width smaller than header
@@ -353,6 +289,70 @@ public final class TextHelpAppendableTest {
assertEquals(isWhitespace ? 5 : 6, TextHelpAppendable.indexOfWrap(text, 7, 0));
}
+ @Test
+ void testMakeColumnQueue() {
+ final String text = "The quick brown fox jumps over the lazy dog";
+ final TextStyle.Builder styleBuilder = TextStyle.builder().setMaxWidth(10).setIndent(0).setLeftPad(0);
+
+ Queue<String> expected = new LinkedList<>();
+ expected.add("The quick ");
+ expected.add("brown fox ");
+ expected.add("jumps over");
+ expected.add("the lazy ");
+ expected.add("dog ");
+
+ Queue<String> result = underTest.makeColumnQueue(text, styleBuilder.get());
+ assertEquals(expected, result, "left aligned failed");
+
+ expected.clear();
+ expected.add(" The quick");
+ expected.add(" brown fox");
+ expected.add("jumps over");
+ expected.add(" the lazy");
+ expected.add(" dog");
+ styleBuilder.setAlignment(TextStyle.Alignment.RIGHT);
+
+ result = underTest.makeColumnQueue(text, styleBuilder.get());
+ assertEquals(expected, result, "right aligned failed");
+
+ expected.clear();
+ expected.add("The quick ");
+ expected.add("brown fox ");
+ expected.add("jumps over");
+ expected.add(" the lazy ");
+ expected.add(" dog ");
+ styleBuilder.setAlignment(TextStyle.Alignment.CENTER);
+
+ result = underTest.makeColumnQueue(text, styleBuilder.get());
+ assertEquals(expected, result, "center aligned failed");
+
+ expected = new LinkedList<>();
+ expected.add(" The quick");
+ expected.add(" brown");
+ expected.add(" fox");
+ expected.add(" jumps");
+ expected.add(" over the");
+ expected.add(" lazy dog");
+ styleBuilder.setAlignment(TextStyle.Alignment.RIGHT).setLeftPad(5).setIndent(2);
+
+ result = underTest.makeColumnQueue(text, styleBuilder.get());
+ assertEquals(expected, result, "right aligned failed");
+ }
+
+ @Test
+ void testMakeColumnQueueWithMultipleTrailingLineBreaks() {
+ // this test should work with any n>1 multiple trailing characters from TestHelpAppendable.BREAK_CHAR_SET.
+ final String text = "Header\t" + (char) Character.PARAGRAPH_SEPARATOR;
+ final TextStyle.Builder styleBuilder = TextStyle.builder().setMaxWidth(10).setIndent(0).setLeftPad(0);
+
+ final Queue<String> expected = new LinkedList<>();
+ expected.add("Header ");
+ expected.add(" ");
+
+ final Queue<String> result = underTest.makeColumnQueue(text, styleBuilder.get());
+ assertEquals(expected, result, "left aligned failed");
+ }
+
@Test
void testPrintWrapped() throws IOException {
String text = "The quick brown fox jumps over the lazy dog";