[ISSUE #5276] Use OS pick-up port

tools/src/test/java/org/apache/rocketmq/tools/command/acl/ClusterAclConfigVersionListSubCommandTest.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.tools.command.acl;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.junit.Test;
 
@@ -32,7 +32,8 @@ public void testExecute() {
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         assertThat(commandLine.getOptionValue('c').trim()).isEqualTo("default-cluster");
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommandTest.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.tools.command.acl;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.junit.Test;
 
@@ -32,7 +32,8 @@ public void testExecute() {
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-a unit-test", "-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         assertThat(commandLine.getOptionValue('a').trim()).isEqualTo("unit-test");
         assertThat(commandLine.getOptionValue('c').trim()).isEqualTo("default-cluster");
     }

tools/src/test/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommandTest.java

@@ -16,9 +16,9 @@
  */
 package org.apache.rocketmq.tools.command.acl;
 
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.junit.Test;
 
@@ -32,7 +32,8 @@ public void testExecute() {
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-c default-cluster"};
         final CommandLine commandLine =
-                ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+                ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                    cmd.buildCommandlineOptions(options), new DefaultParser());
         assertThat(commandLine.getOptionValue('c').trim()).isEqualTo("default-cluster");
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommandTest.java

@@ -17,6 +17,8 @@
 package org.apache.rocketmq.tools.command.acl;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
@@ -44,8 +46,10 @@ public void testExecute() {
             "-t topicA=DENY;topicB=PUB|SUB",
             "-g groupA=DENY;groupB=SUB",
             "-m true"};
+        // Note: Posix parser is capable of handling values that contains '='.
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new PosixParser());
         assertThat(commandLine.getOptionValue('b').trim()).isEqualTo("127.0.0.1:10911");
         assertThat(commandLine.getOptionValue('a').trim()).isEqualTo("RocketMQ");
         assertThat(commandLine.getOptionValue('s').trim()).isEqualTo("12345678");
@@ -61,24 +65,15 @@ public void testExecute() {
         // topicPerms list value
         if (commandLine.hasOption('t')) {
             String[] topicPerms = commandLine.getOptionValue('t').trim().split(";");
-            List<String> topicPermList = new ArrayList<String>();
-            if (topicPerms != null) {
-                for (String topicPerm : topicPerms) {
-                    topicPermList.add(topicPerm);
-                }
-            }
+            List<String> topicPermList = new ArrayList<>(Arrays.asList(topicPerms));
             accessConfig.setTopicPerms(topicPermList);
         }
 
         // groupPerms list value
         if (commandLine.hasOption('g')) {
             String[] groupPerms = commandLine.getOptionValue('g').trim().split(";");
             List<String> groupPermList = new ArrayList<String>();
-            if (groupPerms != null) {
-                for (String groupPerm : groupPerms) {
-                    groupPermList.add(groupPerm);
-                }
-            }
+            Collections.addAll(groupPermList, groupPerms);
             accessConfig.setGroupPerms(groupPermList);
         }
 

tools/src/test/java/org/apache/rocketmq/tools/command/acl/UpdateGlobalWhiteAddrSubCommandTest.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.tools.command.acl;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.junit.Test;
 
@@ -32,7 +32,8 @@ public void testExecute() {
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-g 10.10.103.*,192.168.0.*", "-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         assertThat(commandLine.getOptionValue('g').trim()).isEqualTo("10.10.103.*,192.168.0.*");
         assertThat(commandLine.getOptionValue('c').trim()).isEqualTo("default-cluster");
     }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommadTest.java

@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.client.ClientConfig;
 import org.apache.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.client.impl.MQClientAPIImpl;
@@ -93,7 +93,8 @@ public void testExecute() throws SubCommandException, IllegalAccessException, No
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-b 127.0.0.1:10911", "-t 3000", "-l 5", "-o true"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         cmd.execute(commandLine, options, null);
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/BrokerStatusSubCommandTest.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.tools.command.broker;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
 import org.apache.rocketmq.common.protocol.body.BrokerStatsItem;
 import org.apache.rocketmq.srvutil.ServerUtil;
@@ -27,14 +27,6 @@
 import org.junit.Test;
 
 public class BrokerStatusSubCommandTest extends ServerResponseMocker {
-
-    private static final int PORT = 45678;
-
-    @Override
-    protected int getPort() {
-        return PORT;
-    }
-
     @Override
     protected byte[] getBody() {
         BrokerStatsData brokerStatsData = new BrokerStatsData();
@@ -47,9 +39,10 @@ protected byte[] getBody() {
     public void testExecute() throws SubCommandException {
         BrokerStatusSubCommand cmd = new BrokerStatusSubCommand();
         Options options = ServerUtil.buildCommandlineOptions(new Options());
-        String[] subargs = new String[] {"-b 127.0.0.1:" + PORT, "-c default-cluster"};
+        String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
 
         cmd.execute(commandLine, options, null);
     }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/CleanExpiredCQSubCommandTest.java

@@ -17,22 +17,14 @@
 package org.apache.rocketmq.tools.command.broker;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.apache.rocketmq.tools.command.SubCommandException;
 import org.apache.rocketmq.tools.command.server.ServerResponseMocker;
 import org.junit.Test;
 
 public class CleanExpiredCQSubCommandTest extends ServerResponseMocker {
-
-    private static final int PORT = 45678;
-
-    @Override
-    protected int getPort() {
-        return PORT;
-    }
-
     @Override
     protected byte[] getBody() {
         return null;
@@ -42,9 +34,10 @@ protected byte[] getBody() {
     public void testExecute() throws SubCommandException {
         CleanExpiredCQSubCommand cmd = new CleanExpiredCQSubCommand();
         Options options = ServerUtil.buildCommandlineOptions(new Options());
-        String[] subargs = new String[] {"-b 127.0.0.1:" + PORT, "-c default-cluster"};
+        String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         cmd.execute(commandLine, options, null);
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/CleanUnusedTopicCommandTest.java

@@ -17,20 +17,14 @@
 package org.apache.rocketmq.tools.command.broker;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.apache.rocketmq.tools.command.SubCommandException;
 import org.apache.rocketmq.tools.command.server.ServerResponseMocker;
 import org.junit.Test;
 
 public class CleanUnusedTopicCommandTest extends ServerResponseMocker {
-
-    @Override
-    protected int getPort() {
-        return 0;
-    }
-
     @Override
     protected byte[] getBody() {
         return null;
@@ -42,7 +36,8 @@ public void testExecute() throws SubCommandException {
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         cmd.execute(commandLine, options, null);
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/DeleteExpiredCommitLogSubCommandTest.java

@@ -19,8 +19,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.apache.rocketmq.tools.command.SubCommandException;
 import org.apache.rocketmq.tools.command.server.ServerResponseMocker;
@@ -31,8 +31,6 @@
 
 public class DeleteExpiredCommitLogSubCommandTest extends ServerResponseMocker {
 
-    private static final int PORT = 45678;
-
     private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
     private final ByteArrayOutputStream errContent = new ByteArrayOutputStream();
     private final PrintStream originalOut = System.out;
@@ -50,11 +48,6 @@ public void tearDown() throws Exception {
         System.setErr(originalErr);
     }
 
-    @Override
-    protected int getPort() {
-        return PORT;
-    }
-
     @Override
     protected byte[] getBody() {
         return null;
@@ -64,9 +57,9 @@ protected byte[] getBody() {
     public void testExecute() throws SubCommandException {
         DeleteExpiredCommitLogSubCommand cmd = new DeleteExpiredCommitLogSubCommand();
         Options options = ServerUtil.buildCommandlineOptions(new Options());
-        String[] subargs = new String[] {"-b 127.0.0.1:" + PORT, "-c default-cluster"};
+        String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
         final CommandLine commandLine = ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
-            cmd.buildCommandlineOptions(options), new PosixParser());
+            cmd.buildCommandlineOptions(options), new DefaultParser());
         cmd.execute(commandLine, options, null);
         Assert.assertTrue(outContent.toString().startsWith("success"));
         Assert.assertEquals("", errContent.toString());

tools/src/test/java/org/apache/rocketmq/tools/command/broker/GetBrokerConfigCommandTest.java

@@ -17,8 +17,8 @@
 package org.apache.rocketmq.tools.command.broker;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.apache.rocketmq.tools.command.SubCommandException;
@@ -28,16 +28,8 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Properties;
 
-
 public class GetBrokerConfigCommandTest extends ServerResponseMocker {
 
-    private static final int PORT = 45678;
-
-    @Override
-    protected int getPort() {
-        return PORT;
-    }
-
     @Override
     protected byte[] getBody() {
         StringBuilder sb = new StringBuilder();
@@ -57,9 +49,10 @@ protected byte[] getBody() {
     public void testExecute() throws SubCommandException {
         GetBrokerConfigCommand cmd = new GetBrokerConfigCommand();
         Options options = ServerUtil.buildCommandlineOptions(new Options());
-        String[] subargs = new String[] {"-b 127.0.0.1:" + PORT, "-c default-cluster"};
+        String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         cmd.execute(commandLine, options, null);
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/SendMsgStatusCommandTest.java

@@ -18,8 +18,8 @@
 
 import java.lang.reflect.Field;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.client.ClientConfig;
 import org.apache.rocketmq.client.exception.MQBrokerException;
 import org.apache.rocketmq.client.exception.MQClientException;
@@ -72,7 +72,8 @@ public void testExecute() {
         Options options = ServerUtil.buildCommandlineOptions(new Options());
         String[] subargs = new String[] {"-b 127.0.0.1:10911", "-s 1024 -c 10"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         //cmd.execute(commandLine, options, null);
     }
 }

tools/src/test/java/org/apache/rocketmq/tools/command/broker/UpdateBrokerConfigSubCommandTest.java

@@ -17,22 +17,15 @@
 package org.apache.rocketmq.tools.command.broker;
 
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.rocketmq.srvutil.ServerUtil;
 import org.apache.rocketmq.tools.command.SubCommandException;
 import org.apache.rocketmq.tools.command.server.ServerResponseMocker;
 import org.junit.Test;
 
 public class UpdateBrokerConfigSubCommandTest extends ServerResponseMocker {
 
-    private static final int PORT = 45678;
-
-    @Override
-    protected int getPort() {
-        return PORT;
-    }
-
     @Override
     protected byte[] getBody() {
         return null;
@@ -42,9 +35,10 @@ protected byte[] getBody() {
     public void testExecute() throws SubCommandException {
         UpdateBrokerConfigSubCommand cmd = new UpdateBrokerConfigSubCommand();
         Options options = ServerUtil.buildCommandlineOptions(new Options());
-        String[] subargs = new String[] {"-b 127.0.0.1:" + PORT, "-c default-cluster", "-k topicname", "-v unit_test"};
+        String[] subargs = new String[] {"-b 127.0.0.1:" + listenPort(), "-c default-cluster", "-k topicname", "-v unit_test"};
         final CommandLine commandLine =
-            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs, cmd.buildCommandlineOptions(options), new PosixParser());
+            ServerUtil.parseCmdLine("mqadmin " + cmd.commandName(), subargs,
+                cmd.buildCommandlineOptions(options), new DefaultParser());
         cmd.execute(commandLine, options, null);
     }
 }