Sort members

Author: garydgregory

src/test/java/org/apache/commons/cli/DefaultParserTest.java

@@ -37,65 +37,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class DefaultParserTest extends AbstractParserTestCase {
 
-    @Override
-    @BeforeEach
-    public void setUp() {
-        super.setUp();
-        parser = new DefaultParser();
-    }
-
-    @Test
-    public void testBuilder() {
-        // @formatter:off
-        final Builder builder = DefaultParser.builder()
-                .setStripLeadingAndTrailingQuotes(false)
-                .setAllowPartialMatching(false)
-                .setDeprecatedHandler(null);
-        // @formatter:on
-        parser = builder.build();
-        assertEquals(DefaultParser.class, parser.getClass());
-        parser = builder.get();
-        assertEquals(DefaultParser.class, parser.getClass());
-    }
-
-    @Test
-    public void testDeprecated() throws ParseException {
-        final Set<Option> handler = new HashSet<>();
-        parser = DefaultParser.builder().setDeprecatedHandler(handler::add).build();
-        final Option opt1 = Option.builder().option("d1").deprecated().build();
-        // @formatter:off
-        final Option opt2 = Option.builder().option("d2").deprecated(DeprecatedAttributes.builder()
-                .setForRemoval(true)
-                .setSince("1.0")
-                .setDescription("Do this instead.").get()).build();
-        // @formatter:on
-        final Option opt3 = Option.builder().option("a").build();
-        // @formatter:off
-        final CommandLine cl = parser.parse(new Options()
-                .addOption(opt1)
-                .addOption(opt2)
-                .addOption(opt3),
-                new String[] {"-d1", "-d2", "-a"});
-        // @formatter:on
-        // Trigger handler:
-        assertTrue(cl.hasOption(opt1.getOpt()));
-        assertTrue(cl.hasOption(opt2.getOpt()));
-        assertTrue(cl.hasOption(opt3.getOpt()));
-        // Assert handler was triggered
-        assertTrue(handler.contains(opt1));
-        assertTrue(handler.contains(opt2));
-        assertFalse(handler.contains(opt3));
-    }
-
-    @ParameterizedTest(name = "{index}. {0}")
-    @ArgumentsSource(ExternalArgumentsProvider.class)
-    public void testParameterized(final String testName, final CommandLineParser parser, final String[] args, final String expected,
-        final String option, final String message) throws Exception {
-        final CommandLine cl = parser.parse(options, args);
-
-        assertEquals(expected, cl.getOptionValue(option), message);
-    }
-
     static class ExternalArgumentsProvider implements ArgumentsProvider {
 
         @Override
@@ -209,12 +150,71 @@ public Stream<? extends Arguments> provideArguments(final ExtensionContext conte
         }
     }
 
+    @Override
+    @BeforeEach
+    public void setUp() {
+        super.setUp();
+        parser = new DefaultParser();
+    }
+
+    @Test
+    public void testBuilder() {
+        // @formatter:off
+        final Builder builder = DefaultParser.builder()
+                .setStripLeadingAndTrailingQuotes(false)
+                .setAllowPartialMatching(false)
+                .setDeprecatedHandler(null);
+        // @formatter:on
+        parser = builder.build();
+        assertEquals(DefaultParser.class, parser.getClass());
+        parser = builder.get();
+        assertEquals(DefaultParser.class, parser.getClass());
+    }
+
+    @Test
+    public void testDeprecated() throws ParseException {
+        final Set<Option> handler = new HashSet<>();
+        parser = DefaultParser.builder().setDeprecatedHandler(handler::add).build();
+        final Option opt1 = Option.builder().option("d1").deprecated().build();
+        // @formatter:off
+        final Option opt2 = Option.builder().option("d2").deprecated(DeprecatedAttributes.builder()
+                .setForRemoval(true)
+                .setSince("1.0")
+                .setDescription("Do this instead.").get()).build();
+        // @formatter:on
+        final Option opt3 = Option.builder().option("a").build();
+        // @formatter:off
+        final CommandLine cl = parser.parse(new Options()
+                .addOption(opt1)
+                .addOption(opt2)
+                .addOption(opt3),
+                new String[] {"-d1", "-d2", "-a"});
+        // @formatter:on
+        // Trigger handler:
+        assertTrue(cl.hasOption(opt1.getOpt()));
+        assertTrue(cl.hasOption(opt2.getOpt()));
+        assertTrue(cl.hasOption(opt3.getOpt()));
+        // Assert handler was triggered
+        assertTrue(handler.contains(opt1));
+        assertTrue(handler.contains(opt2));
+        assertFalse(handler.contains(opt3));
+    }
+
     @Override
     @Test
     @Disabled("Test case handled in the parameterized tests as \"DEFAULT behavior\"")
     public void testLongOptionWithEqualsQuoteHandling() throws Exception {
     }
 
+    @ParameterizedTest(name = "{index}. {0}")
+    @ArgumentsSource(ExternalArgumentsProvider.class)
+    public void testParameterized(final String testName, final CommandLineParser parser, final String[] args, final String expected,
+        final String option, final String message) throws Exception {
+        final CommandLine cl = parser.parse(options, args);
+
+        assertEquals(expected, cl.getOptionValue(option), message);
+    }
+
     @Override
     @Test
     @Disabled("Test case handled in the parameterized tests as \"DEFAULT behavior\"")