Skip to content

Commit bbcbfc5

Browse files
committed
fix unit test
Change-Id: If3387de9605696bb62008658386790a52b55654d
1 parent 68b3485 commit bbcbfc5

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/consumer/AckMessageActivityTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ public void testAckMessage() throws Throwable {
6969
String msg2 = "msg2";
7070
String msg3 = "msg3";
7171

72-
when(this.messagingProcessor.ackMessage(any(), any(), eq(msg1), anyString(), anyString()))
72+
when(this.messagingProcessor.ackMessage(any(), any(), eq(msg1), anyString(), anyString(), any()))
7373
.thenThrow(new ProxyException(ProxyExceptionCode.INVALID_RECEIPT_HANDLE, "receipt handle is expired"));
7474

7575
AckResult msg2AckResult = new AckResult();
7676
msg2AckResult.setStatus(AckStatus.OK);
77-
when(this.messagingProcessor.ackMessage(any(), any(), eq(msg2), anyString(), anyString()))
77+
when(this.messagingProcessor.ackMessage(any(), any(), eq(msg2), anyString(), anyString(), any()))
7878
.thenReturn(CompletableFuture.completedFuture(msg2AckResult));
7979

8080
AckResult msg3AckResult = new AckResult();
8181
msg3AckResult.setStatus(AckStatus.NO_EXIST);
82-
when(this.messagingProcessor.ackMessage(any(), any(), eq(msg3), anyString(), anyString()))
82+
when(this.messagingProcessor.ackMessage(any(), any(), eq(msg3), anyString(), anyString(), any()))
8383
.thenReturn(CompletableFuture.completedFuture(msg3AckResult));
8484

8585
{

proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/producer/ForwardMessageToDLQActivityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void before() throws Throwable {
5050
@Test
5151
public void testForwardMessageToDeadLetterQueue() throws Throwable {
5252
ArgumentCaptor<ReceiptHandle> receiptHandleCaptor = ArgumentCaptor.forClass(ReceiptHandle.class);
53-
when(this.messagingProcessor.forwardMessageToDeadLetterQueue(any(), receiptHandleCaptor.capture(), anyString(), anyString(), anyString()))
53+
when(this.messagingProcessor.forwardMessageToDeadLetterQueue(any(), receiptHandleCaptor.capture(), anyString(), anyString(), anyString(), any()))
5454
.thenReturn(CompletableFuture.completedFuture(RemotingCommand.createResponseCommand(ResponseCode.SUCCESS, "")));
5555

5656
String handleStr = buildReceiptHandle("topic", System.currentTimeMillis(), 3000);
@@ -71,7 +71,7 @@ public void testForwardMessageToDeadLetterQueue() throws Throwable {
7171
@Test
7272
public void testForwardMessageToDeadLetterQueueWhenHasMappingHandle() throws Throwable {
7373
ArgumentCaptor<ReceiptHandle> receiptHandleCaptor = ArgumentCaptor.forClass(ReceiptHandle.class);
74-
when(this.messagingProcessor.forwardMessageToDeadLetterQueue(any(), receiptHandleCaptor.capture(), anyString(), anyString(), anyString()))
74+
when(this.messagingProcessor.forwardMessageToDeadLetterQueue(any(), receiptHandleCaptor.capture(), anyString(), anyString(), anyString(), any()))
7575
.thenReturn(CompletableFuture.completedFuture(RemotingCommand.createResponseCommand(ResponseCode.SUCCESS, "")));
7676

7777
String savedHandleStr = buildReceiptHandle("topic", System.currentTimeMillis(),3000);

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,25 @@
2020
import java.util.HashSet;
2121
import java.util.Set;
2222
import org.apache.rocketmq.proxy.common.ProxyContext;
23+
import org.apache.rocketmq.proxy.config.ConfigurationManager;
2324
import org.apache.rocketmq.proxy.grpc.v2.common.GrpcProxyException;
2425
import org.apache.rocketmq.proxy.service.ServiceManager;
2526
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
2627
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
2728
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
2829
import org.junit.jupiter.api.BeforeEach;
2930
import org.junit.jupiter.api.Test;
31+
import org.junit.jupiter.api.extension.ExtendWith;
3032
import org.mockito.Mock;
31-
import org.mockito.MockitoAnnotations;
33+
import org.mockito.junit.jupiter.MockitoExtension;
3234

3335
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
3436
import static org.junit.jupiter.api.Assertions.assertEquals;
3537
import static org.junit.jupiter.api.Assertions.assertThrows;
3638
import static org.junit.jupiter.api.Assertions.assertTrue;
3739
import static org.mockito.Mockito.when;
3840

41+
@ExtendWith(MockitoExtension.class)
3942
class ClientProcessorTest {
4043

4144
@Mock
@@ -53,8 +56,8 @@ class ClientProcessorTest {
5356
private ClientProcessor clientProcessor;
5457

5558
@BeforeEach
56-
void setUp() {
57-
MockitoAnnotations.openMocks(this);
59+
void setUp() throws Exception {
60+
ConfigurationManager.intConfig();
5861
clientProcessor = new ClientProcessor(messagingProcessor, serviceManager);
5962
}
6063

@@ -180,7 +183,7 @@ void testValidateLiteSubscriptionQuota_withinQuota_noException() {
180183
void testValidateLiteSubscriptionQuota_exceedsQuota_throwsException() {
181184
String group = "group";
182185
int quota = 10;
183-
int actual = 15;
186+
int actual = 15 + 300 /*quota buffer*/;
184187

185188
when(groupConfig.getLiteSubClientQuota()).thenReturn(quota);
186189
when(messagingProcessor.getSubscriptionGroupConfig(ctx, group)).thenReturn(groupConfig);

0 commit comments

Comments
 (0)