(commons-cli) 01/04: Sort members

[ggregory]

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

commit f78bf2299beadef7d318627959ec65e930b21946
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Apr 7 09:48:14 2024 -0400

    Sort members
---
 .../org/apache/commons/cli/CommandLineTest.java    | 30 +++++++++++-----------
 .../java/org/apache/commons/cli/OptionsTest.java   | 16 ++++++------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/test/java/org/apache/commons/cli/CommandLineTest.java 
b/src/test/java/org/apache/commons/cli/CommandLineTest.java
index 7a6b2b7..d1ce424 100644
--- a/src/test/java/org/apache/commons/cli/CommandLineTest.java
+++ b/src/test/java/org/apache/commons/cli/CommandLineTest.java
@@ -31,21 +31,6 @@ import org.junit.jupiter.api.Test;
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class CommandLineTest {
 
-    @Test
-    public void testDeprecatedOption() {
-        final CommandLine.Builder builder = new CommandLine.Builder();
-        builder.addArg("foo").addArg("bar");
-        final Option opt = Option.builder().option("T").deprecated().build();
-        builder.addOption(opt);
-        final AtomicReference<Option> handler = new AtomicReference<>();
-        final CommandLine cmd = 
builder.setDeprecatedHandler(handler::set).build();
-        cmd.getOptionValue(opt.getOpt());
-        assertSame(opt, handler.get());
-        handler.set(null);
-        cmd.getOptionValue("Nope");
-        assertNull(handler.get());
-    }
-
     @Test
     public void testBuilder() {
         final CommandLine.Builder builder = new CommandLine.Builder();
@@ -83,6 +68,21 @@ public class CommandLineTest {
         assertEquals(0, cmd.getOptions().length);
     }
 
+    @Test
+    public void testDeprecatedOption() {
+        final CommandLine.Builder builder = new CommandLine.Builder();
+        builder.addArg("foo").addArg("bar");
+        final Option opt = Option.builder().option("T").deprecated().build();
+        builder.addOption(opt);
+        final AtomicReference<Option> handler = new AtomicReference<>();
+        final CommandLine cmd = 
builder.setDeprecatedHandler(handler::set).build();
+        cmd.getOptionValue(opt.getOpt());
+        assertSame(opt, handler.get());
+        handler.set(null);
+        cmd.getOptionValue("Nope");
+        assertNull(handler.get());
+    }
+
     @Test
     public void testGetOptionProperties() throws Exception {
         final String[] args = {"-Dparam1=value1", "-Dparam2=value2", 
"-Dparam3", "-Dparam4=value4", "-D", "--property", "foo=bar"};
diff --git a/src/test/java/org/apache/commons/cli/OptionsTest.java 
b/src/test/java/org/apache/commons/cli/OptionsTest.java
index 7b7b382..e9e6e89 100644
--- a/src/test/java/org/apache/commons/cli/OptionsTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionsTest.java
@@ -123,14 +123,6 @@ public class OptionsTest {
         assertThrows(IllegalArgumentException.class, () -> 
options.addOptions(options));
     }
 
-    @Test
-    public void testDuplicateLong() {
-        final Options opts = new Options();
-        opts.addOption("a", "--a", false, "toggle -a");
-        opts.addOption("a", "--a", false, "toggle -a*");
-        assertEquals("toggle -a*", opts.getOption("a").getDescription(), "last 
one in wins");
-    }
-
     @Test
     public void testDeprecated() {
         final Options opts = new Options();
@@ -148,6 +140,14 @@ public class OptionsTest {
         assertEquals("Option 'c': Deprecated for removal since 2.0: Use X.", 
opts.getOption("c").toDeprecatedString());
     }
 
+    @Test
+    public void testDuplicateLong() {
+        final Options opts = new Options();
+        opts.addOption("a", "--a", false, "toggle -a");
+        opts.addOption("a", "--a", false, "toggle -a*");
+        assertEquals("toggle -a*", opts.getOption("a").getDescription(), "last 
one in wins");
+    }
+
     @Test
     public void testDuplicateSimple() {
         final Options opts = new Options();