fix unit test

Change-Id: I7d16757e57fc957b234e5bc04346dcaaa318855e

Author: f1amingo

common/src/main/java/org/apache/rocketmq/common/message/MessageConst.java

@@ -159,6 +159,5 @@ public class MessageConst {
         STRING_HASH_SET.add(PROPERTY_DLQ_ORIGIN_MESSAGE_ID);
         STRING_HASH_SET.add(PROPERTY_CRC32);
         STRING_HASH_SET.add(PROPERTY_LITE_TOPIC);
-        STRING_HASH_SET.add(PROPERTY_INNER_MULTI_DISPATCH);
     }
 }

proxy/src/test/java/org/apache/rocketmq/proxy/processor/ConsumerProcessorTest.java

@@ -108,11 +108,11 @@ public void testPopMessage() throws Throwable {
             .thenReturn(mock(MessageQueueView.class));
 
         ArgumentCaptor<String> ackMessageIdArgumentCaptor = ArgumentCaptor.forClass(String.class);
-        when(this.messagingProcessor.ackMessage(any(), any(), ackMessageIdArgumentCaptor.capture(), anyString(), anyString(), anyLong()))
+        when(this.messagingProcessor.ackMessage(any(), any(), ackMessageIdArgumentCaptor.capture(), anyString(), anyString(), any(), anyLong()))
             .thenReturn(CompletableFuture.completedFuture(mock(AckResult.class)));
 
         ArgumentCaptor<String> toDLQMessageIdArgumentCaptor = ArgumentCaptor.forClass(String.class);
-        when(this.messagingProcessor.forwardMessageToDeadLetterQueue(any(), any(), toDLQMessageIdArgumentCaptor.capture(), anyString(), anyString(), anyLong()))
+        when(this.messagingProcessor.forwardMessageToDeadLetterQueue(any(), any(), toDLQMessageIdArgumentCaptor.capture(), anyString(), anyString(), any(), anyLong()))
             .thenReturn(CompletableFuture.completedFuture(mock(RemotingCommand.class)));
 
         AddressableMessageQueue messageQueue = mock(AddressableMessageQueue.class);

proxy/src/test/java/org/apache/rocketmq/proxy/processor/ReceiptHandleProcessorTest.java

@@ -95,7 +95,7 @@ public void testStart() throws Exception {
         Mockito.when(consumerManager.findChannel(Mockito.eq(CONSUMER_GROUP), Mockito.eq(PROXY_CONTEXT.getChannel()))).thenReturn(Mockito.mock(ClientChannelInfo.class));
         Mockito.verify(messagingProcessor, Mockito.timeout(10000).times(1))
             .changeInvisibleTime(Mockito.any(ProxyContext.class), Mockito.any(ReceiptHandle.class), Mockito.eq(MESSAGE_ID),
-                Mockito.eq(CONSUMER_GROUP), Mockito.eq(TOPIC), Mockito.eq(ConfigurationManager.getProxyConfig().getDefaultInvisibleTimeMills()));
+                Mockito.eq(CONSUMER_GROUP), Mockito.eq(TOPIC), Mockito.eq(ConfigurationManager.getProxyConfig().getDefaultInvisibleTimeMills()), Mockito.eq(null));
     }
 
 }

test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java

@@ -257,6 +257,7 @@ public void testQueryFifoAssignment() throws Exception {
     public void testTransactionCheckThenCommit() {
         String topic = initTopicOnSampleTopicBroker(BROKER1_NAME, TopicMessageType.TRANSACTION);
         String group = MQRandomUtils.getRandomConsumerGroup();
+        initConsumerGroup(group);
 
         AtomicReference<TelemetryCommand> telemetryCommandRef = new AtomicReference<>(null);
         StreamObserver<TelemetryCommand> requestStreamObserver = stub.telemetry(new DefaultTelemetryCommandStreamObserver() {
@@ -351,6 +352,7 @@ public void testSimpleConsumerSendAndRecvDelayMessage() throws Exception {
         String topic = initTopicOnSampleTopicBroker(BROKER1_NAME, TopicMessageType.DELAY);
         String group = MQRandomUtils.getRandomConsumerGroup();
         long delayTime = TimeUnit.SECONDS.toMillis(5);
+        initConsumerGroup(group);
 
         // init consumer offset
         this.sendClientSettings(stub, buildSimpleConsumerClientSettings(group)).get();
@@ -398,6 +400,7 @@ public void testSimpleConsumerSendAndRecvDelayMessage() throws Exception {
     public void testSimpleConsumerSendAndRecallDelayMessage() throws Exception {
         String topic = initTopicOnSampleTopicBroker(BROKER1_NAME, TopicMessageType.DELAY);
         String group = MQRandomUtils.getRandomConsumerGroup();
+        initConsumerGroup(group);
         long delayTime = TimeUnit.SECONDS.toMillis(5);
 
         // init consumer offset
@@ -461,6 +464,7 @@ public void testSimpleConsumerSendAndRecallDelayMessage() throws Exception {
     public void testSimpleConsumerSendAndRecvBigMessage() throws Exception {
         String topic = initTopicOnSampleTopicBroker(BROKER1_NAME);
         String group = MQRandomUtils.getRandomConsumerGroup();
+        initConsumerGroup(group);
 
         int bodySize = 4 * 1024;
 
@@ -483,6 +487,7 @@ public void testSimpleConsumerSendAndRecvBigMessage() throws Exception {
     public void testSimpleConsumerSendAndRecv() throws Exception {
         String topic = initTopicOnSampleTopicBroker(BROKER1_NAME);
         String group = MQRandomUtils.getRandomConsumerGroup();
+        initConsumerGroup(group);
 
         // init consumer offset
         this.sendClientSettings(stub, buildSimpleConsumerClientSettings(group)).get();
@@ -539,6 +544,7 @@ public void testSimpleConsumerSendAndRecv() throws Exception {
     public void testSimpleConsumerToDLQ() throws Exception {
         String topic = initTopicOnSampleTopicBroker(BROKER1_NAME);
         String group = MQRandomUtils.getRandomConsumerGroup();
+        initConsumerGroup(group);
         int maxDeliveryAttempts = 2;
 
         SubscriptionGroupConfig groupConfig = brokerController1.getSubscriptionGroupManager().findSubscriptionGroupConfig(group);

test/src/test/java/org/apache/rocketmq/test/lmq/TestBenchLmqStore.java

@@ -30,9 +30,7 @@
 import org.apache.rocketmq.client.impl.consumer.RebalanceImpl;
 import org.apache.rocketmq.client.impl.factory.MQClientInstance;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.remoting.exception.RemotingException;
 import org.apache.rocketmq.remoting.protocol.header.QueryConsumerOffsetRequestHeader;
@@ -61,8 +59,8 @@ public void test() throws MQBrokerException, RemotingException, InterruptedExcep
         System.setProperty("pullConsumerNum", "1");
         System.setProperty("consumerThreadNum", "1");
         BenchLmqStore.defaultMQProducer = mock(DefaultMQProducer.class);
-        SendResult sendResult = new SendResult();
-        when(BenchLmqStore.defaultMQProducer.send(any(Message.class))).thenReturn(sendResult);
+//        SendResult sendResult = new SendResult();
+//        when(BenchLmqStore.defaultMQProducer.send(any(Message.class))).thenReturn(sendResult);
         BenchLmqStore.doSend();
         Thread.sleep(100L);
         //verify(BenchLmqStore.defaultMQProducer, atLeastOnce()).send(any(Message.class));