[rocketmq] branch develop updated: fix flaky test PullRequestHoldServiceTest (#5820)

[aa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aaronai 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 13fabd41d fix flaky test PullRequestHoldServiceTest (#5820)
13fabd41d is described below

commit 13fabd41d32ddcf872a684dc2cd59798df75936a
Author: SSpirits <ad...@lv5.moe>
AuthorDate: Thu Jan 5 10:20:40 2023 +0800

    fix flaky test PullRequestHoldServiceTest (#5820)
---
 .../rocketmq/broker/longpolling/PullRequestHoldServiceTest.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/broker/src/test/java/org/apache/rocketmq/broker/longpolling/PullRequestHoldServiceTest.java b/broker/src/test/java/org/apache/rocketmq/broker/longpolling/PullRequestHoldServiceTest.java
index d1412ff41..6eeb4adbe 100644
--- a/broker/src/test/java/org/apache/rocketmq/broker/longpolling/PullRequestHoldServiceTest.java
+++ b/broker/src/test/java/org/apache/rocketmq/broker/longpolling/PullRequestHoldServiceTest.java
@@ -19,8 +19,10 @@ package org.apache.rocketmq.broker.longpolling;
 
 import io.netty.channel.Channel;
 import java.util.HashMap;
+import java.util.concurrent.Executors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.broker.BrokerController;
+import org.apache.rocketmq.broker.processor.PullMessageProcessor;
 import org.apache.rocketmq.common.BrokerConfig;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
@@ -72,7 +74,8 @@ public class PullRequestHoldServiceTest {
     @Before
     public void before() {
         when(brokerController.getBrokerConfig()).thenReturn(brokerConfig);
-        when(brokerController.getMessageStore()).thenReturn(defaultMessageStore);
+        when(brokerController.getPullMessageProcessor()).thenReturn(new PullMessageProcessor(brokerController));
+        when(brokerController.getPullMessageExecutor()).thenReturn(Executors.newCachedThreadPool());
         pullRequestHoldService = new PullRequestHoldService(brokerController);
         subscriptionData = new SubscriptionData(TEST_TOPIC, "*");
         pullRequest = new PullRequest(remotingCommand, channel, 3000, 3000, 0L, subscriptionData, defaultMessageFilter);