This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 1d2260de9bc [fix][test] Fix test caused by #21144
1d2260de9bc is described below
commit 1d2260de9bcb078c615780674d79f7370f364127
Author: xiangying <[email protected]>
AuthorDate: Mon Sep 18 15:20:50 2023 +0800
[fix][test] Fix test caused by #21144
---
.../java/org/apache/pulsar/client/impl/ClientTestFixtures.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
index 1b9b4a96baa..ca02af0afcd 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientTestFixtures.java
@@ -33,7 +33,9 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import static org.mockito.ArgumentMatchers.any;
+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;
@@ -67,11 +69,17 @@ class ClientTestFixtures {
static PulsarClientImpl mockClientCnx(PulsarClientImpl clientMock) {
ClientCnx clientCnxMock = mock(ClientCnx.class,
Mockito.RETURNS_DEEP_STUBS);
+ ConnectionPool connectionPool = mock(ConnectionPool.class);
+ when(clientMock.getCnxPool()).thenReturn(connectionPool);
when(clientCnxMock.ctx()).thenReturn(mock(ChannelHandlerContext.class));
when(clientCnxMock.sendRequestWithId(any(), anyLong()))
.thenReturn(CompletableFuture.completedFuture(mock(ProducerResponse.class)));
when(clientCnxMock.channel().remoteAddress()).thenReturn(mock(SocketAddress.class));
-
when(clientMock.getConnection(any())).thenReturn(CompletableFuture.completedFuture(clientCnxMock));
+ when(clientMock.getConnection(anyString(), anyInt()))
+ .thenReturn(CompletableFuture.completedFuture(clientCnxMock));
+
when(clientMock.getConnection(anyString())).thenReturn(CompletableFuture.completedFuture(clientCnxMock));
+ when(clientMock.getConnection(any(), any(), anyInt()))
+ .thenReturn(CompletableFuture.completedFuture(clientCnxMock));
return clientMock;
}