This is an automated email from the ASF dual-hosted git repository.
duhengforever 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 e899896 [ISSUE #1528]modify testSendMessageAsync_Success (#1599)
e899896 is described below
commit e89989699cc2865229375e7723feef88590d3832
Author: wqliang <[email protected]>
AuthorDate: Mon Nov 18 13:47:23 2019 +0800
[ISSUE #1528]modify testSendMessageAsync_Success (#1599)
* modify testSendMessageAsync_Success
* revert testSendMessageAsync_Success
---
.../client/producer/DefaultMQProducerTest.java | 26 +++-------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git
a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java
b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java
index 818c94a..d572a23 100644
---
a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java
+++
b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java
@@ -111,22 +111,7 @@ public class DefaultMQProducerTest {
nullable(SendMessageContext.class),
any(DefaultMQProducerImpl.class))).thenCallRealMethod();
when(mQClientAPIImpl.sendMessage(anyString(), anyString(),
any(Message.class), any(SendMessageRequestHeader.class), anyLong(),
any(CommunicationMode.class),
nullable(SendCallback.class), nullable(TopicPublishInfo.class),
nullable(MQClientInstance.class), anyInt(), nullable(SendMessageContext.class),
any(DefaultMQProducerImpl.class)))
- .thenAnswer(new Answer() {
- @Override
- public Object answer(InvocationOnMock invocation) throws
Throwable {
- CommunicationMode mode = invocation.getArgument(5);
- switch (mode) {
- case SYNC:
- return createSendResult(SendStatus.SEND_OK);
- case ONEWAY:
- case ASYNC:
- SendCallback callback = invocation.getArgument(6);
-
callback.onSuccess(createSendResult(SendStatus.SEND_OK));
- return null;
- }
- return null;
- }
- });
+ .thenReturn(createSendResult(SendStatus.SEND_OK));
}
@After
@@ -189,7 +174,6 @@ public class DefaultMQProducerTest {
@Test
public void testSendMessageAsync_Success() throws RemotingException,
InterruptedException, MQBrokerException, MQClientException {
final CountDownLatch countDownLatch = new CountDownLatch(1);
- final AtomicInteger cc = new AtomicInteger(0);
when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(),
anyLong())).thenReturn(createTopicRoute());
producer.send(message, new SendCallback() {
@Override
@@ -198,15 +182,14 @@ public class DefaultMQProducerTest {
assertThat(sendResult.getOffsetMsgId()).isEqualTo("123");
assertThat(sendResult.getQueueOffset()).isEqualTo(456L);
countDownLatch.countDown();
- cc.incrementAndGet();
}
@Override
public void onException(Throwable e) {
+ countDownLatch.countDown();
}
});
- countDownLatch.await(8000L, TimeUnit.MILLISECONDS);
- assertThat(cc.get()).isEqualTo(1);
+ countDownLatch.await(3000L, TimeUnit.MILLISECONDS);
}
@Test
@@ -252,7 +235,6 @@ public class DefaultMQProducerTest {
@Test
public void testSendMessageAsync_BodyCompressed() throws
RemotingException, InterruptedException, MQBrokerException, MQClientException {
- final AtomicInteger cc = new AtomicInteger(0);
final CountDownLatch countDownLatch = new CountDownLatch(1);
when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(),
anyLong())).thenReturn(createTopicRoute());
producer.send(bigMessage, new SendCallback() {
@@ -261,7 +243,6 @@ public class DefaultMQProducerTest {
assertThat(sendResult.getSendStatus()).isEqualTo(SendStatus.SEND_OK);
assertThat(sendResult.getOffsetMsgId()).isEqualTo("123");
assertThat(sendResult.getQueueOffset()).isEqualTo(456L);
- cc.incrementAndGet();
countDownLatch.countDown();
}
@@ -270,7 +251,6 @@ public class DefaultMQProducerTest {
}
});
countDownLatch.await(3000L, TimeUnit.MILLISECONDS);
- assertThat(cc.get()).isEqualTo(1);
}
@Test
