Sort members

Use final and remove trailing whitespace

Author: garydgregory

src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java

@@ -149,7 +149,7 @@ void testPrintHelp() throws IOException {
 
     /**
      * 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>
      */

src/test/java/org/apache/commons/cli/help/TextHelpAppendableTest.java

@@ -48,70 +48,6 @@ public void setUp() {
         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 @@ void testindexOfWrapPosWithWhitespace(final Character c, final boolean isWhitesp
         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";