You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2022/09/29 03:47:03 UTC
[rocketmq] branch develop updated: [ISSUE #5219] Enable checkstyle for test code (rocketmq-acl and rocketmq-tools) (#5220)
This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new a5725c6b8 [ISSUE #5219] Enable checkstyle for test code (rocketmq-acl and rocketmq-tools) (#5220)
a5725c6b8 is described below
commit a5725c6b855987a713f7b31646b78be2016662f0
Author: Nowinkey <no...@tom.com>
AuthorDate: Thu Sep 29 11:46:56 2022 +0800
[ISSUE #5219] Enable checkstyle for test code (rocketmq-acl and rocketmq-tools) (#5220)
* style(acl):Enable checkstyle for test code
* style(tools):Enable checkstyle for test code
---
acl/pom.xml | 24 +++++++++++++++
.../apache/rocketmq/acl/common/AclSignerTest.java | 4 +--
.../apache/rocketmq/acl/common/PermissionTest.java | 16 +++++-----
.../acl/common/SessionCredentialsTest.java | 34 ++++++++++----------
.../apache/rocketmq/acl/plain/AclTestHelper.java | 14 ++++-----
.../acl/plain/PlainAccessControlFlowTest.java | 1 -
.../acl/plain/PlainPermissionManagerTest.java | 34 ++++++++++----------
tools/pom.xml | 24 +++++++++++++++
.../tools/admin/DefaultMQAdminExtTest.java | 36 +++++++++++-----------
.../rocketmq/tools/command/CommandUtilTest.java | 2 +-
.../command/acl/GetAccessConfigSubCommandTest.java | 4 ++-
.../consumer/GetConsumerConfigSubCommandTest.java | 2 --
.../command/message/ConsumeMessageCommandTest.java | 2 +-
.../message/QueryMsgByUniqueKeySubCommandTest.java | 24 ++++++++++-----
.../message/QueryMsgTraceByIdSubCommandTest.java | 1 -
.../rocketmq/tools/monitor/MonitorServiceTest.java | 2 +-
16 files changed, 139 insertions(+), 85 deletions(-)
diff --git a/acl/pom.xml b/acl/pom.xml
index 90ce2c8be..47c953471 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -81,4 +81,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
+ <inputEncoding>UTF-8</inputEncoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/common/AclSignerTest.java b/acl/src/test/java/org/apache/rocketmq/acl/common/AclSignerTest.java
index 4c9a73f71..2680d6bd8 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/common/AclSignerTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/common/AclSignerTest.java
@@ -22,12 +22,12 @@ import org.junit.Test;
public class AclSignerTest {
@Test(expected = Exception.class)
- public void calSignatureExceptionTest(){
+ public void calSignatureExceptionTest() {
AclSigner.calSignature(new byte[]{},"");
}
@Test
- public void calSignatureTest(){
+ public void calSignatureTest() {
String expectedSignature = "IUc8rrO/0gDch8CjObLQsW2rsiA=";
Assert.assertEquals(expectedSignature, AclSigner.calSignature("RocketMQ", "12345678"));
Assert.assertEquals(expectedSignature, AclSigner.calSignature("RocketMQ".getBytes(), "12345678"));
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/common/PermissionTest.java b/acl/src/test/java/org/apache/rocketmq/acl/common/PermissionTest.java
index c824065f7..77e5b547a 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/common/PermissionTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/common/PermissionTest.java
@@ -37,10 +37,10 @@ public class PermissionTest {
Assert.assertEquals(perm, Permission.SUB);
perm = Permission.parsePermFromString("PUB|SUB");
- Assert.assertEquals(perm, Permission.PUB|Permission.SUB);
+ Assert.assertEquals(perm, Permission.PUB | Permission.SUB);
perm = Permission.parsePermFromString("SUB|PUB");
- Assert.assertEquals(perm, Permission.PUB|Permission.SUB);
+ Assert.assertEquals(perm, Permission.PUB | Permission.SUB);
perm = Permission.parsePermFromString("DENY");
Assert.assertEquals(perm, Permission.DENY);
@@ -64,13 +64,13 @@ public class PermissionTest {
boo = Permission.checkPermission(Permission.SUB, Permission.SUB);
Assert.assertTrue(boo);
- boo = Permission.checkPermission(Permission.PUB, (byte) (Permission.PUB|Permission.SUB));
+ boo = Permission.checkPermission(Permission.PUB, (byte) (Permission.PUB | Permission.SUB));
Assert.assertTrue(boo);
- boo = Permission.checkPermission(Permission.SUB, (byte) (Permission.PUB|Permission.SUB));
+ boo = Permission.checkPermission(Permission.SUB, (byte) (Permission.PUB | Permission.SUB));
Assert.assertTrue(boo);
- boo = Permission.checkPermission(Permission.ANY, (byte) (Permission.PUB|Permission.SUB));
+ boo = Permission.checkPermission(Permission.ANY, (byte) (Permission.PUB | Permission.SUB));
Assert.assertTrue(boo);
boo = Permission.checkPermission(Permission.ANY, Permission.SUB);
@@ -112,7 +112,7 @@ public class PermissionTest {
Assert.assertEquals(perm, Permission.DENY);
perm = resourcePermMap.get(PlainAccessResource.getRetryTopic("groupB"));
- Assert.assertEquals(perm,Permission.PUB|Permission.SUB);
+ Assert.assertEquals(perm,Permission.PUB | Permission.SUB);
perm = resourcePermMap.get(PlainAccessResource.getRetryTopic("groupC"));
Assert.assertEquals(perm, Permission.PUB);
@@ -128,7 +128,7 @@ public class PermissionTest {
Assert.assertEquals(perm, Permission.DENY);
perm = resourcePermMap.get("topicB");
- Assert.assertEquals(perm, Permission.PUB|Permission.SUB);
+ Assert.assertEquals(perm, Permission.PUB | Permission.SUB);
perm = resourcePermMap.get("topicC");
Assert.assertEquals(perm, Permission.PUB);
@@ -156,7 +156,7 @@ public class PermissionTest {
}
@Test
- public void AclExceptionTest(){
+ public void AclExceptionTest() {
AclException aclException = new AclException("CAL_SIGNATURE_FAILED",10015);
AclException aclExceptionWithMessage = new AclException("CAL_SIGNATURE_FAILED",10015,"CAL_SIGNATURE_FAILED Exception");
Assert.assertEquals(aclException.getCode(),10015);
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/common/SessionCredentialsTest.java b/acl/src/test/java/org/apache/rocketmq/acl/common/SessionCredentialsTest.java
index a1a4bde4f..79512f147 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/common/SessionCredentialsTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/common/SessionCredentialsTest.java
@@ -24,17 +24,17 @@ import java.util.Properties;
public class SessionCredentialsTest {
@Test
- public void equalsTest(){
- SessionCredentials sessionCredentials=new SessionCredentials("RocketMQ","12345678");
+ public void equalsTest() {
+ SessionCredentials sessionCredentials = new SessionCredentials("RocketMQ","12345678");
sessionCredentials.setSecurityToken("abcd");
- SessionCredentials other=new SessionCredentials("RocketMQ","12345678","abcd");
+ SessionCredentials other = new SessionCredentials("RocketMQ","12345678","abcd");
Assert.assertTrue(sessionCredentials.equals(other));
}
@Test
- public void updateContentTest(){
- SessionCredentials sessionCredentials=new SessionCredentials();
- Properties properties=new Properties();
+ public void updateContentTest() {
+ SessionCredentials sessionCredentials = new SessionCredentials();
+ Properties properties = new Properties();
properties.setProperty(SessionCredentials.ACCESS_KEY,"RocketMQ");
properties.setProperty(SessionCredentials.SECRET_KEY,"12345678");
properties.setProperty(SessionCredentials.SECURITY_TOKEN,"abcd");
@@ -42,9 +42,9 @@ public class SessionCredentialsTest {
}
@Test
- public void SessionCredentialHashCodeTest(){
- SessionCredentials sessionCredentials=new SessionCredentials();
- Properties properties=new Properties();
+ public void SessionCredentialHashCodeTest() {
+ SessionCredentials sessionCredentials = new SessionCredentials();
+ Properties properties = new Properties();
properties.setProperty(SessionCredentials.ACCESS_KEY,"RocketMQ");
properties.setProperty(SessionCredentials.SECRET_KEY,"12345678");
properties.setProperty(SessionCredentials.SECURITY_TOKEN,"abcd");
@@ -53,16 +53,16 @@ public class SessionCredentialsTest {
}
@Test
- public void SessionCredentialEqualsTest(){
- SessionCredentials sessionCredential1 =new SessionCredentials();
- Properties properties1=new Properties();
+ public void SessionCredentialEqualsTest() {
+ SessionCredentials sessionCredential1 = new SessionCredentials();
+ Properties properties1 = new Properties();
properties1.setProperty(SessionCredentials.ACCESS_KEY,"RocketMQ");
properties1.setProperty(SessionCredentials.SECRET_KEY,"12345678");
properties1.setProperty(SessionCredentials.SECURITY_TOKEN,"abcd");
sessionCredential1.updateContent(properties1);
- SessionCredentials sessionCredential2 =new SessionCredentials();
- Properties properties2=new Properties();
+ SessionCredentials sessionCredential2 = new SessionCredentials();
+ Properties properties2 = new Properties();
properties2.setProperty(SessionCredentials.ACCESS_KEY,"RocketMQ");
properties2.setProperty(SessionCredentials.SECRET_KEY,"12345678");
properties2.setProperty(SessionCredentials.SECURITY_TOKEN,"abcd");
@@ -75,9 +75,9 @@ public class SessionCredentialsTest {
}
@Test
- public void SessionCredentialToStringTest(){
- SessionCredentials sessionCredential1 =new SessionCredentials();
- Properties properties1=new Properties();
+ public void SessionCredentialToStringTest() {
+ SessionCredentials sessionCredential1 = new SessionCredentials();
+ Properties properties1 = new Properties();
properties1.setProperty(SessionCredentials.ACCESS_KEY,"RocketMQ");
properties1.setProperty(SessionCredentials.SECRET_KEY,"12345678");
properties1.setProperty(SessionCredentials.SECURITY_TOKEN,"abcd");
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/plain/AclTestHelper.java b/acl/src/test/java/org/apache/rocketmq/acl/plain/AclTestHelper.java
index 250478a5b..a1bfc53ed 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/plain/AclTestHelper.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/plain/AclTestHelper.java
@@ -80,15 +80,15 @@ public final class AclTestHelper {
public static void recursiveDelete(File file) {
if (file.isFile()) {
- file.delete();
+ file.delete();
} else {
- File[] files = file.listFiles();
- if (null != files) {
- for (File f : files) {
- recursiveDelete(f);
+ File[] files = file.listFiles();
+ if (null != files) {
+ for (File f : files) {
+ recursiveDelete(f);
+ }
}
- }
- file.delete();
+ file.delete();
}
}
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessControlFlowTest.java b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessControlFlowTest.java
index 504990f96..d1c66314d 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessControlFlowTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainAccessControlFlowTest.java
@@ -276,7 +276,6 @@ public class PlainAccessControlFlowTest {
try {
PlainAccessResource accessResource = (PlainAccessResource) plainAccessValidator.parse(
RemotingCommand.decode(buf), remoteAddr);
- System.out.println(accessResource.getWhiteRemoteAddress());
plainAccessValidator.validate(accessResource);
} catch (RemotingCommandException e) {
e.printStackTrace();
diff --git a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainPermissionManagerTest.java b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainPermissionManagerTest.java
index ef444987c..f30b6f57d 100644
--- a/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainPermissionManagerTest.java
+++ b/acl/src/test/java/org/apache/rocketmq/acl/plain/PlainPermissionManagerTest.java
@@ -45,10 +45,10 @@ import org.junit.Test;
public class PlainPermissionManagerTest {
PlainPermissionManager plainPermissionManager;
- PlainAccessResource PUBPlainAccessResource;
- PlainAccessResource SUBPlainAccessResource;
- PlainAccessResource ANYPlainAccessResource;
- PlainAccessResource DENYPlainAccessResource;
+ PlainAccessResource pubPlainAccessResource;
+ PlainAccessResource subPlainAccessResource;
+ PlainAccessResource anyPlainAccessResource;
+ PlainAccessResource denyPlainAccessResource;
PlainAccessResource plainAccessResource = new PlainAccessResource();
PlainAccessConfig plainAccessConfig = new PlainAccessConfig();
Set<Integer> adminCode = new HashSet<>();
@@ -70,10 +70,10 @@ public class PlainPermissionManagerTest {
// DELETE_SUBSCRIPTIONGROUP
adminCode.add(207);
- PUBPlainAccessResource = clonePlainAccessResource(Permission.PUB);
- SUBPlainAccessResource = clonePlainAccessResource(Permission.SUB);
- ANYPlainAccessResource = clonePlainAccessResource(Permission.ANY);
- DENYPlainAccessResource = clonePlainAccessResource(Permission.DENY);
+ pubPlainAccessResource = clonePlainAccessResource(Permission.PUB);
+ subPlainAccessResource = clonePlainAccessResource(Permission.SUB);
+ anyPlainAccessResource = clonePlainAccessResource(Permission.ANY);
+ denyPlainAccessResource = clonePlainAccessResource(Permission.DENY);
String folder = "conf";
confHome = AclTestHelper.copyResources(folder, true);
@@ -150,7 +150,7 @@ public class PlainPermissionManagerTest {
public void checkPermAdmin() {
PlainAccessResource plainAccessResource = new PlainAccessResource();
plainAccessResource.setRequestCode(17);
- plainPermissionManager.checkPerm(plainAccessResource, PUBPlainAccessResource);
+ plainPermissionManager.checkPerm(plainAccessResource, pubPlainAccessResource);
}
@Test
@@ -158,15 +158,15 @@ public class PlainPermissionManagerTest {
PlainAccessResource plainAccessResource = new PlainAccessResource();
plainAccessResource.addResourceAndPerm("topicA", Permission.PUB);
- plainPermissionManager.checkPerm(plainAccessResource, PUBPlainAccessResource);
+ plainPermissionManager.checkPerm(plainAccessResource, pubPlainAccessResource);
plainAccessResource.addResourceAndPerm("topicB", Permission.SUB);
- plainPermissionManager.checkPerm(plainAccessResource, ANYPlainAccessResource);
+ plainPermissionManager.checkPerm(plainAccessResource, anyPlainAccessResource);
plainAccessResource = new PlainAccessResource();
plainAccessResource.addResourceAndPerm("topicB", Permission.SUB);
- plainPermissionManager.checkPerm(plainAccessResource, SUBPlainAccessResource);
+ plainPermissionManager.checkPerm(plainAccessResource, subPlainAccessResource);
plainAccessResource.addResourceAndPerm("topicA", Permission.PUB);
- plainPermissionManager.checkPerm(plainAccessResource, ANYPlainAccessResource);
+ plainPermissionManager.checkPerm(plainAccessResource, anyPlainAccessResource);
}
@@ -175,7 +175,7 @@ public class PlainPermissionManagerTest {
plainAccessResource = new PlainAccessResource();
plainAccessResource.addResourceAndPerm("topicF", Permission.PUB);
- plainPermissionManager.checkPerm(plainAccessResource, SUBPlainAccessResource);
+ plainPermissionManager.checkPerm(plainAccessResource, subPlainAccessResource);
}
@Test(expected = AclException.class)
@@ -358,7 +358,7 @@ public class PlainPermissionManagerTest {
public void deleteAccessConfigTest() throws InterruptedException {
// delete not exist accessConfig
final boolean flag1 = plainPermissionManager.deleteAccessConfig("test_delete");
- assert flag1 == false;
+ assert !flag1;
plainAccessConfig.setAccessKey("test_delete");
plainAccessConfig.setSecretKey("12345678");
@@ -371,14 +371,14 @@ public class PlainPermissionManagerTest {
//delete existed accessConfig
final boolean flag2 = plainPermissionManager.deleteAccessConfig("test_delete");
- assert flag2 == true;
+ assert flag2;
}
@Test
public void updateGlobalWhiteAddrsConfigTest() {
final boolean flag = plainPermissionManager.updateGlobalWhiteAddrsConfig(Lists.newArrayList("192.168.1.2"));
- assert flag == true;
+ assert flag;
final AclConfig config = plainPermissionManager.getAllAclConfig();
Assert.assertEquals(true, config.getGlobalWhiteAddrs().contains("192.168.1.2"));
}
diff --git a/tools/pom.xml b/tools/pom.xml
index 83329ca65..473842d0d 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -65,4 +65,28 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+ <configLocation>${project.parent.basedir}/style/rmq_checkstyle.xml</configLocation>
+ <inputEncoding>UTF-8</inputEncoding>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
index cfbcc01fa..026ce5ae3 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
@@ -96,13 +96,13 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class DefaultMQAdminExtTest {
- private static final String broker1Addr = "127.0.0.1:10911";
- private static final String broker1Name = "default-broker";
- private static final String cluster = "default-cluster";
- private static final String broker2Name = "broker-test";
- private static final String broker2Addr = "127.0.0.2:10911";
- private static final String topic1 = "topic_one";
- private static final String topic2 = "topic_two";
+ private static final String BROKER1_ADDR = "127.0.0.1:10911";
+ private static final String BROKER1_NAME = "default-broker";
+ private static final String CLUSTER = "default-cluster";
+ private static final String BROKER2_NAME = "broker-test";
+ private static final String BROKER2_ADDR = "127.0.0.2:10911";
+ private static final String TOPIC1 = "topic_one";
+ private static final String TOPIC2 = "topic_two";
private static DefaultMQAdminExt defaultMQAdminExt;
private static DefaultMQAdminExtImpl defaultMQAdminExtImpl;
private static MQClientInstance mqClientInstance = MQClientManager.getInstance().getOrCreateMQClientInstance(new ClientConfig());
@@ -135,20 +135,20 @@ public class DefaultMQAdminExtTest {
when(mQClientAPIImpl.getBrokerConfig(anyString(), anyLong())).thenReturn(properties);
Set<String> topicSet = new HashSet<>();
- topicSet.add(topic1);
- topicSet.add(topic2);
+ topicSet.add(TOPIC1);
+ topicSet.add(TOPIC2);
topicList.setTopicList(topicSet);
when(mQClientAPIImpl.getTopicListFromNameServer(anyLong())).thenReturn(topicList);
List<BrokerData> brokerDatas = new ArrayList<>();
HashMap<Long, String> brokerAddrs = new HashMap<>();
- brokerAddrs.put(MixAll.MASTER_ID, broker1Addr);
+ brokerAddrs.put(MixAll.MASTER_ID, BROKER1_ADDR);
BrokerData brokerData = new BrokerData();
- brokerData.setCluster(cluster);
- brokerData.setBrokerName(broker1Name);
+ brokerData.setCluster(CLUSTER);
+ brokerData.setBrokerName(BROKER1_NAME);
brokerData.setBrokerAddrs(brokerAddrs);
brokerDatas.add(brokerData);
- brokerDatas.add(new BrokerData(cluster, broker2Name, (HashMap<Long, String>) Maps.newHashMap(MixAll.MASTER_ID, broker2Addr)));
+ brokerDatas.add(new BrokerData(CLUSTER, BROKER2_NAME, (HashMap<Long, String>) Maps.newHashMap(MixAll.MASTER_ID, BROKER2_ADDR)));
topicRouteData.setBrokerDatas(brokerDatas);
topicRouteData.setQueueDatas(new ArrayList<QueueData>());
topicRouteData.setFilterServerTable(new HashMap<String, List<String>>());
@@ -156,13 +156,13 @@ public class DefaultMQAdminExtTest {
HashMap<String, String> result = new HashMap<>();
result.put("id", String.valueOf(MixAll.MASTER_ID));
- result.put("brokerName", broker1Name);
+ result.put("brokerName", BROKER1_NAME);
kvTable.setTable(result);
when(mQClientAPIImpl.getBrokerRuntimeInfo(anyString(), anyLong())).thenReturn(kvTable);
HashMap<String, BrokerData> brokerAddrTable = new HashMap<>();
- brokerAddrTable.put(broker1Name, brokerData);
- brokerAddrTable.put(broker2Name, new BrokerData());
+ brokerAddrTable.put(BROKER1_NAME, brokerData);
+ brokerAddrTable.put(BROKER2_NAME, new BrokerData());
clusterInfo.setBrokerAddrTable(brokerAddrTable);
clusterInfo.setClusterAddrTable(new HashMap<String, Set<String>>());
when(mQClientAPIImpl.getBrokerClusterInfo(anyLong())).thenReturn(clusterInfo);
@@ -507,14 +507,14 @@ public class DefaultMQAdminExtTest {
@Ignore
public void testMaxOffset() throws Exception {
when(mQClientAPIImpl.getMaxOffset(anyString(), any(MessageQueue.class), anyLong())).thenReturn(100L);
- assertThat(defaultMQAdminExt.maxOffset(new MessageQueue(topic1, broker1Name, 0))).isEqualTo(100L);
+ assertThat(defaultMQAdminExt.maxOffset(new MessageQueue(TOPIC1, BROKER1_NAME, 0))).isEqualTo(100L);
}
@Test
@Ignore
public void testSearchOffset() throws Exception {
when(mQClientAPIImpl.searchOffset(anyString(), any(MessageQueue.class), anyLong(), anyLong())).thenReturn(101L);
- assertThat(defaultMQAdminExt.searchOffset(new MessageQueue(topic1, broker1Name, 0), System.currentTimeMillis())).isEqualTo(101L);
+ assertThat(defaultMQAdminExt.searchOffset(new MessageQueue(TOPIC1, BROKER1_NAME, 0), System.currentTimeMillis())).isEqualTo(101L);
}
@Test
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/CommandUtilTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/CommandUtilTest.java
index a7b2143c9..3f9ecc1ef 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/CommandUtilTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/CommandUtilTest.java
@@ -68,7 +68,7 @@ public class CommandUtilTest {
HashMap<String, BrokerData> brokerAddrTable = new HashMap<>();
HashMap<String, Set<String>> clusterAddrTable = new HashMap<>();
HashMap<Long, String> brokerAddrs = new HashMap<>();
- brokerAddrs.put(1234l, "127.0.0.1:10911");
+ brokerAddrs.put(1234L, "127.0.0.1:10911");
BrokerData brokerData = new BrokerData();
brokerData.setBrokerName("default-broker");
brokerData.setCluster("default-cluster");
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommandTest.java
index 6a7694ef0..ecdf61c2e 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommandTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/acl/GetAccessConfigSubCommandTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.rocketmq.tools.command.acl;
-import org.apache.commons.cli.*;
+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;
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/consumer/GetConsumerConfigSubCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/consumer/GetConsumerConfigSubCommandTest.java
index 3f123883a..05aa11df8 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/consumer/GetConsumerConfigSubCommandTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/consumer/GetConsumerConfigSubCommandTest.java
@@ -19,14 +19,12 @@ package org.apache.rocketmq.tools.command.consumer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
import org.apache.rocketmq.common.protocol.body.Connection;
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
import org.apache.rocketmq.common.protocol.route.BrokerData;
import org.apache.rocketmq.srvutil.ServerUtil;
import org.apache.rocketmq.tools.command.SubCommandException;
-import org.apache.rocketmq.tools.command.server.NameServerMocker;
import org.apache.rocketmq.tools.command.server.ServerResponseMocker;
import org.junit.After;
import org.junit.Before;
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommandTest.java
index 98621e6a2..36d46e20d 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommandTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/message/ConsumeMessageCommandTest.java
@@ -51,7 +51,7 @@ import static org.mockito.Mockito.when;
public class ConsumeMessageCommandTest {
private static ConsumeMessageCommand consumeMessageCommand;
- private static PullResult PULL_RESULT = mockPullResult();
+ private static final PullResult PULL_RESULT = mockPullResult();
private static PullResult mockPullResult() {
MessageExt msg = new MessageExt();
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommandTest.java
index 1298c91a0..22f502ac7 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommandTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommandTest.java
@@ -32,7 +32,12 @@ import org.apache.rocketmq.common.admin.ConsumeStats;
import org.apache.rocketmq.common.admin.OffsetWrapper;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.common.protocol.body.*;
+import org.apache.rocketmq.common.protocol.body.CMResult;
+import org.apache.rocketmq.common.protocol.body.GroupList;
+import org.apache.rocketmq.common.protocol.body.ClusterInfo;
+import org.apache.rocketmq.common.protocol.body.Connection;
+import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
+import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
import org.apache.rocketmq.common.protocol.route.BrokerData;
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
@@ -51,9 +56,17 @@ import org.junit.Test;
import java.lang.reflect.Field;
import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.Set;
+import java.util.List;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.ArrayList;
-import static org.mockito.ArgumentMatchers.*;
+
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -220,11 +233,6 @@ public class QueryMsgByUniqueKeySubCommandTest {
String[] args = new String[] {"-t myTopicTest", "-i 0A3A54F7BF7D18B4AAC28A3FA2CF0000", "-g producerGroupName", "-d clientId"};
CommandLine commandLine = ServerUtil.parseCmdLine("mqadmin ", args, cmd.buildCommandlineOptions(options), new PosixParser());
cmd.execute(commandLine, options, null);
-
- System.out.println();
- System.out.println("commandName=" + cmd.commandName());
- System.out.println("commandDesc=" + cmd.commandDesc());
-
}
@Test
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommandTest.java
index d9f88cd01..dbfa86c9e 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommandTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommandTest.java
@@ -19,7 +19,6 @@ package org.apache.rocketmq.tools.command.message;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
-import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.message.MessageDecoder;
import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.protocol.route.BrokerData;
diff --git a/tools/src/test/java/org/apache/rocketmq/tools/monitor/MonitorServiceTest.java b/tools/src/test/java/org/apache/rocketmq/tools/monitor/MonitorServiceTest.java
index 57278b9b2..89bb16576 100644
--- a/tools/src/test/java/org/apache/rocketmq/tools/monitor/MonitorServiceTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/monitor/MonitorServiceTest.java
@@ -118,7 +118,7 @@ public class MonitorServiceTest {
TopicRouteData topicRouteData = new TopicRouteData();
List<BrokerData> brokerDatas = new ArrayList<>();
HashMap<Long, String> brokerAddrs = new HashMap<>();
- brokerAddrs.put(1234l, "127.0.0.1:10911");
+ brokerAddrs.put(1234L, "127.0.0.1:10911");
BrokerData brokerData = new BrokerData();
brokerData.setCluster("default-cluster");
brokerData.setBrokerName("default-broker");