From f619e451f948ef6b5b360758867b9ae471499e2e Mon Sep 17 00:00:00 2001 From: shroman Date: Thu, 15 Jun 2017 09:48:10 +0900 Subject: [PATCH] Fixed typo. --- .../test/client/rmq/RMQNormalConsumer.java | 12 +++--- .../clientinterface/AbstractMQConsumer.java | 24 +++++------ .../test/listener/AbstractListener.java | 14 +++---- .../rmq/concurrent/RMQDelayListner.java | 2 +- .../rmq/concurrent/RMQNormalListner.java | 4 +- .../listener/rmq/order/RMQOrderListener.java | 4 +- .../balance/NormalMsgDynamicBalanceIT.java | 20 +++++----- .../balance/NormalMsgStaticBalanceIT.java | 18 ++++----- .../normal/BroadCastNormalMsgNotRecvIT.java | 8 ++-- .../normal/BroadCastNormalMsgRecvCrashIT.java | 12 +++--- .../normal/BroadCastNormalMsgRecvFailIT.java | 4 +- .../BroadCastNormalMsgRecvStartLaterIT.java | 12 +++--- .../BroadCastNormalMsgTwoDiffGroupRecvIT.java | 8 ++-- .../NormalMsgTwoSameGroupConsumerIT.java | 8 ++-- .../broadcast/order/OrderMsgBroadCastIT.java | 8 ++-- .../tag/BroadCastTwoConsumerFilterIT.java | 8 ++-- .../tag/BroadCastTwoConsumerSubDiffTagIT.java | 8 ++-- .../tag/BroadCastTwoConsumerSubTagIT.java | 8 ++-- .../cluster/DynamicAddAndCrashIT.java | 12 +++--- .../cluster/DynamicAddConsumerIT.java | 12 +++--- .../cluster/DynamicCrashConsumerIT.java | 12 +++--- .../client/consumer/filter/SqlFilterIT.java | 9 ++--- .../test/client/consumer/tag/MulTagSubIT.java | 18 ++++----- .../tag/TagMessageWith1ConsumerIT.java | 32 +++++++-------- .../tag/TagMessageWithMulConsumerIT.java | 40 +++++++++---------- .../TagMessageWithSameGroupConsumerIT.java | 12 +++--- .../consumer/topic/MulConsumerMulTopicIT.java | 6 +-- .../consumer/topic/OneConsumerMulTopicIT.java | 12 +++--- .../async/AsyncSendWithMessageQueueIT.java | 12 +++--- .../AsyncSendWithMessageQueueSelectorIT.java | 12 +++--- .../AsyncSendWithOnlySendCallBackIT.java | 4 +- .../exception/msg/MessageUserPropIT.java | 8 ++-- .../client/producer/oneway/OneWaySendIT.java | 4 +- .../producer/oneway/OneWaySendWithMQIT.java | 8 ++-- .../oneway/OneWaySendWithSelectorIT.java | 12 +++--- .../order/OrderMsgDynamicRebalanceIT.java | 22 +++++----- .../client/producer/order/OrderMsgIT.java | 18 ++++----- .../producer/order/OrderMsgRebalanceIT.java | 38 +++++++++--------- .../producer/order/OrderMsgWithTagIT.java | 28 ++++++------- .../producer/querymsg/QueryMsgByIdIT.java | 6 +-- .../rocketmq/test/delay/NormalMsgDelayIT.java | 24 +++++------ .../smoke/NormalMessageSendAndRecvIT.java | 4 +- 42 files changed, 272 insertions(+), 275 deletions(-) diff --git a/test/src/main/java/org/apache/rocketmq/test/client/rmq/RMQNormalConsumer.java b/test/src/main/java/org/apache/rocketmq/test/client/rmq/RMQNormalConsumer.java index 3f185d3a..7225cd6b 100644 --- a/test/src/main/java/org/apache/rocketmq/test/client/rmq/RMQNormalConsumer.java +++ b/test/src/main/java/org/apache/rocketmq/test/client/rmq/RMQNormalConsumer.java @@ -33,12 +33,12 @@ public class RMQNormalConsumer extends AbstractMQConsumer { super(nsAddr, topic, subExpression, consumerGroup, listner); } - public AbstractListener getListner() { - return listner; + public AbstractListener getListener() { + return listener; } - public void setListner(AbstractListener listner) { - this.listner = listner; + public void setListener(AbstractListener listener) { + this.listener = listener; } public void create() { @@ -51,7 +51,7 @@ public class RMQNormalConsumer extends AbstractMQConsumer { logger.error("consumer subscribe failed!"); e.printStackTrace(); } - consumer.setMessageListener(listner); + consumer.setMessageListener(listener); } public void start() { @@ -79,7 +79,7 @@ public class RMQNormalConsumer extends AbstractMQConsumer { @Override public void clearMsg() { - this.listner.clearMsg(); + this.listener.clearMsg(); } public void restart() { diff --git a/test/src/main/java/org/apache/rocketmq/test/clientinterface/AbstractMQConsumer.java b/test/src/main/java/org/apache/rocketmq/test/clientinterface/AbstractMQConsumer.java index a077129a..22193bb4 100644 --- a/test/src/main/java/org/apache/rocketmq/test/clientinterface/AbstractMQConsumer.java +++ b/test/src/main/java/org/apache/rocketmq/test/clientinterface/AbstractMQConsumer.java @@ -20,7 +20,7 @@ package org.apache.rocketmq.test.clientinterface; import org.apache.rocketmq.test.listener.AbstractListener; public abstract class AbstractMQConsumer implements MQConsumer { - protected AbstractListener listner = null; + protected AbstractListener listener = null; protected String nsAddr = null; protected String topic = null; protected String subExpression = null; @@ -31,11 +31,11 @@ public abstract class AbstractMQConsumer implements MQConsumer { } public AbstractMQConsumer(String nsAddr, String topic, String subExpression, - String consumerGroup, AbstractListener listner) { + String consumerGroup, AbstractListener listener) { this.topic = topic; this.subExpression = subExpression; this.consumerGroup = consumerGroup; - this.listner = listner; + this.listener = listener; this.nsAddr = nsAddr; } @@ -45,16 +45,16 @@ public abstract class AbstractMQConsumer implements MQConsumer { } public void setDebug() { - if (listner != null) { - listner.setDebug(true); + if (listener != null) { + listener.setDebug(true); } isDebug = true; } public void setDebug(boolean isDebug) { - if (listner != null) { - listner.setDebug(isDebug); + if (listener != null) { + listener.setDebug(isDebug); } this.isDebug = isDebug; @@ -65,12 +65,12 @@ public abstract class AbstractMQConsumer implements MQConsumer { this.subExpression = subExpression; } - public AbstractListener getListner() { - return listner; + public AbstractListener getListener() { + return listener; } - public void setListner(AbstractListener listner) { - this.listner = listner; + public void setListener(AbstractListener listener) { + this.listener = listener; } public String getNsAddr() { @@ -106,7 +106,7 @@ public abstract class AbstractMQConsumer implements MQConsumer { } public void clearMsg() { - listner.clearMsg(); + listener.clearMsg(); } } diff --git a/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java b/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java index 14da397e..6a13049f 100644 --- a/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java +++ b/test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java @@ -30,16 +30,16 @@ import org.apache.rocketmq.test.util.TestUtil; public class AbstractListener extends MQCollector implements MessageListener { public static Logger logger = Logger.getLogger(AbstractListener.class); protected boolean isDebug = false; - protected String listnerName = null; + protected String listenerName = null; protected Collection allSendMsgs = null; public AbstractListener() { super(); } - public AbstractListener(String listnerName) { + public AbstractListener(String listenerName) { super(); - this.listnerName = listnerName; + this.listenerName = listenerName; } public AbstractListener(String originMsgCollector, String msgBodyCollector) { @@ -82,10 +82,10 @@ public class AbstractListener extends MQCollector implements MessageListener { } else { if (System.currentTimeMillis() - curTime >= timeoutMills) { logger.error(String.format("timeout but [%s] not recv all send messages!", - listnerName)); + listenerName)); break; } else { - logger.info(String.format("[%s] still [%s] msg not recv!", listnerName, + logger.info(String.format("[%s] still [%s] msg not recv!", listenerName, sendMsgs.size())); TestUtil.waitForMonment(500); } @@ -105,10 +105,10 @@ public class AbstractListener extends MQCollector implements MessageListener { } if (System.currentTimeMillis() - curTime >= timeoutMills) { logger.error(String.format("timeout but [%s] not recv all send messages!", - listnerName)); + listenerName)); break; } else { - logger.info(String.format("[%s] still [%s] msg not recv!", listnerName, + logger.info(String.format("[%s] still [%s] msg not recv!", listenerName, size - msgBodys.getDataSize())); TestUtil.waitForMonment(500); } diff --git a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListner.java b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListner.java index b4a08702..6d9892c7 100644 --- a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListner.java +++ b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQDelayListner.java @@ -49,7 +49,7 @@ public class RMQDelayListner extends AbstractListener implements MessageListener long recvTime = System.currentTimeMillis(); for (MessageExt msg : msgs) { if (isDebug) { - logger.info(listnerName + ":" + msg); + logger.info(listenerName + ":" + msg); } msgBodys.addData(new String(msg.getBody())); diff --git a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListner.java b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListner.java index 471fb481..679f8bd5 100644 --- a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListner.java +++ b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/concurrent/RMQNormalListner.java @@ -51,8 +51,8 @@ public class RMQNormalListner extends AbstractListener implements MessageListene for (MessageExt msg : msgs) { msgIndex.getAndIncrement(); if (isDebug) { - if (listnerName != null && listnerName != "") { - logger.info(listnerName + ":" + msgIndex.get() + ":" + if (listenerName != null && listenerName != "") { + logger.info(listenerName + ":" + msgIndex.get() + ":" + String.format("msgid:%s broker:%s queueId:%s offset:%s", msg.getMsgId(), msg.getStoreHost(), msg.getQueueId(), msg.getQueueOffset())); diff --git a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java index 91883d86..85c61770 100644 --- a/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java +++ b/test/src/main/java/org/apache/rocketmq/test/listener/rmq/order/RMQOrderListener.java @@ -68,8 +68,8 @@ public class RMQOrderListener extends AbstractListener implements MessageListene ConsumeOrderlyContext context) { for (MessageExt msg : msgs) { if (isDebug) { - if (listnerName != null && listnerName != "") { - logger.info(listnerName + ": " + msg); + if (listenerName != null && listenerName != "") { + logger.info(listenerName + ": " + msg); } else { logger.info(msg); } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgDynamicBalanceIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgDynamicBalanceIT.java index fdafdf09..835f746f 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgDynamicBalanceIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgDynamicBalanceIT.java @@ -57,22 +57,22 @@ public class NormalMsgDynamicBalanceIT extends BaseConf { producer.send(msgSize); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener()); consumer2.shutdown(); producer.send(msgSize); Assert.assertEquals("Not all are sent", msgSize * 2, producer.getAllUndupMsgBody().size()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); boolean balance = VerifyUtils.verifyBalance(msgSize, VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllUndupMsgBody()).size() - msgSize, + consumer1.getListener().getAllUndupMsgBody()).size() - msgSize, VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllUndupMsgBody()).size()); + consumer2.getListener().getAllUndupMsgBody()).size()); assertThat(balance).isEqualTo(true); } @@ -87,8 +87,8 @@ public class NormalMsgDynamicBalanceIT extends BaseConf { producer.send(msgSize); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner(), consumer3.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener(), consumer3.getListener()); consumer3.shutdown(); producer.clearMsg(); consumer1.clearMsg(); @@ -98,14 +98,14 @@ public class NormalMsgDynamicBalanceIT extends BaseConf { Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); boolean balance = VerifyUtils.verifyBalance(msgSize, VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllUndupMsgBody()).size(), + consumer1.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllUndupMsgBody()).size()); + consumer2.getListener().getAllUndupMsgBody()).size()); assertThat(balance).isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgStaticBalanceIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgStaticBalanceIT.java index 117d6437..9c9b2549 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgStaticBalanceIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/balance/NormalMsgStaticBalanceIT.java @@ -61,14 +61,14 @@ public class NormalMsgStaticBalanceIT extends BaseConf { Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); boolean balance = VerifyUtils.verifyBalance(msgSize, VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllUndupMsgBody()).size(), + consumer1.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllUndupMsgBody()).size()); + consumer2.getListener().getAllUndupMsgBody()).size()); assertThat(balance).isEqualTo(true); } @@ -88,22 +88,22 @@ public class NormalMsgStaticBalanceIT extends BaseConf { Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner(), consumer3.getListner(), - consumer4.getListner()); + consumer1.getListener(), consumer2.getListener(), consumer3.getListener(), + consumer4.getListener()); assertThat(recvAll).isEqualTo(true); boolean balance = VerifyUtils .verifyBalance(msgSize, VerifyUtils .getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllUndupMsgBody()) + consumer1.getListener().getAllUndupMsgBody()) .size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllUndupMsgBody()).size(), + consumer2.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer3.getListner().getAllUndupMsgBody()).size(), + consumer3.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer4.getListner().getAllUndupMsgBody()).size()); + consumer4.getListener().getAllUndupMsgBody()).size()); assertThat(balance).isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java index 32b13fd7..41408b82 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgNotRecvIT.java @@ -60,14 +60,14 @@ public class BroadCastNormalMsgNotRecvIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); RMQBroadCastConsumer consumer2 = getBroadCastConsumer(nsAddr, consumer1.getConsumerGroup(), topic, "*", new RMQNormalListner(group + "_2")); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), waitTime); - assertThat(consumer2.getListner().getAllMsgBody().size()).isEqualTo(0); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), waitTime); + assertThat(consumer2.getListener().getAllMsgBody().size()).isEqualTo(0); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java index b878d099..fc0cfce8 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvCrashIT.java @@ -64,13 +64,13 @@ public class BroadCastNormalMsgRecvCrashIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); consumer2.shutdown(); @@ -81,9 +81,9 @@ public class BroadCastNormalMsgRecvCrashIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java index 26c37f97..0d3f6fbb 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvFailIT.java @@ -63,10 +63,10 @@ public class BroadCastNormalMsgRecvFailIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java index 027f6482..dd1db0b0 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgRecvStartLaterIT.java @@ -62,9 +62,9 @@ public class BroadCastNormalMsgRecvStartLaterIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); producer.clearMsg(); @@ -76,13 +76,13 @@ public class BroadCastNormalMsgRecvStartLaterIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java index acbaf23b..4fb5005f 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/BroadCastNormalMsgTwoDiffGroupRecvIT.java @@ -65,14 +65,14 @@ public class BroadCastNormalMsgTwoDiffGroupRecvIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java index 984c9412..76e69b37 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/normal/NormalMsgTwoSameGroupConsumerIT.java @@ -64,14 +64,14 @@ public class NormalMsgTwoSameGroupConsumerIT extends BaseBroadCastIT { producer.send(msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/order/OrderMsgBroadCastIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/order/OrderMsgBroadCastIT.java index ac8fcf54..2c9abc06 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/order/OrderMsgBroadCastIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/order/OrderMsgBroadCastIT.java @@ -64,12 +64,12 @@ public class OrderMsgBroadCastIT extends BaseBroadCastIT { MessageQueueMsg mqMsgs = new MessageQueueMsg(mqs, msgSize); producer.send(mqMsgs.getMsgsWithMQ()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListener()).getMsgs())) .isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerFilterIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerFilterIT.java index a1a2ff7a..0d3b1ca1 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerFilterIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerFilterIT.java @@ -65,14 +65,14 @@ public class BroadCastTwoConsumerFilterIT extends BaseBroadCastIT { producer.clearMsg(); producer.send(tag1, msgSize); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubDiffTagIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubDiffTagIT.java index 5c2e7fc1..155a0aa0 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubDiffTagIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubDiffTagIT.java @@ -62,14 +62,14 @@ public class BroadCastTwoConsumerSubDiffTagIT extends BaseBroadCastIT { producer.send(tag, msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubTagIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubTagIT.java index e4510ded..e89464f7 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubTagIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/broadcast/tag/BroadCastTwoConsumerSubTagIT.java @@ -62,14 +62,14 @@ public class BroadCastTwoConsumerSubTagIT extends BaseBroadCastIT { producer.send(tag, msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); - consumer2.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer2.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllMsgBody())) + consumer2.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddAndCrashIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddAndCrashIT.java index 303dfa0d..23248e3d 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddAndCrashIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddAndCrashIT.java @@ -65,11 +65,11 @@ public class DynamicAddAndCrashIT extends BaseConf { asyncDefaultMQProducer.waitSendAll(waitTime * 6); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); } @@ -93,11 +93,11 @@ public class DynamicAddAndCrashIT extends BaseConf { asyncDefaultMQProducer.waitSendAll(waitTime * 6); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner(), consumer3.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener(), consumer3.getListener()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner(), consumer3.getListner()); + consumer1.getListener(), consumer2.getListener(), consumer3.getListener()); assertThat(recvAll).isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddConsumerIT.java index 46dbb70f..9ef79534 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddConsumerIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicAddConsumerIT.java @@ -63,11 +63,11 @@ public class DynamicAddConsumerIT extends BaseConf { asyncDefaultMQProducer.waitSendAll(waitTime * 6); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); } @@ -87,11 +87,11 @@ public class DynamicAddConsumerIT extends BaseConf { asyncDefaultMQProducer.waitSendAll(waitTime * 6); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner(), consumer3.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener(), consumer3.getListener()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner(), consumer3.getListner()); + consumer1.getListener(), consumer2.getListener(), consumer3.getListener()); assertThat(recvAll).isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicCrashConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicCrashConsumerIT.java index 807f950e..13237206 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicCrashConsumerIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/cluster/DynamicCrashConsumerIT.java @@ -64,11 +64,11 @@ public class DynamicCrashConsumerIT extends BaseConf { asyncDefaultMQProducer.waitSendAll(waitTime * 6); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); } @@ -90,11 +90,11 @@ public class DynamicCrashConsumerIT extends BaseConf { asyncDefaultMQProducer.waitSendAll(waitTime * 6); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner(), consumer3.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener(), consumer3.getListener()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner(), consumer3.getListner()); + consumer1.getListener(), consumer2.getListener(), consumer3.getListener()); assertThat(recvAll).isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/filter/SqlFilterIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/filter/SqlFilterIT.java index 7eef2ab0..6c96e5ef 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/filter/SqlFilterIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/filter/SqlFilterIT.java @@ -20,9 +20,6 @@ package org.apache.rocketmq.test.client.consumer.filter; import org.apache.log4j.Logger; import org.apache.rocketmq.client.consumer.MessageSelector; import org.apache.rocketmq.test.base.BaseConf; -import org.apache.rocketmq.test.client.consumer.broadcast.BaseBroadCastIT; -import org.apache.rocketmq.test.client.consumer.broadcast.normal.NormalMsgTwoSameGroupConsumerIT; -import org.apache.rocketmq.test.client.rmq.RMQBroadCastConsumer; import org.apache.rocketmq.test.client.rmq.RMQNormalProducer; import org.apache.rocketmq.test.client.rmq.RMQSqlConsumer; import org.apache.rocketmq.test.factory.ConsumerFactory; @@ -64,11 +61,11 @@ public class SqlFilterIT extends BaseConf { producer.send("TagB", msgSize); producer.send("TagC", msgSize); Assert.assertEquals("Not all sent succeeded", msgSize * 3, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(msgSize * 2, consumeTime); + consumer.getListener().waitForMessageConsume(msgSize * 2, consumeTime); assertThat(producer.getAllMsgBody()) .containsAllIn(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())); + consumer.getListener().getAllMsgBody())); - assertThat(consumer.getListner().getAllMsgBody().size()).isEqualTo(msgSize * 2); + assertThat(consumer.getListener().getAllMsgBody().size()).isEqualTo(msgSize * 2); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java index ecb204e6..37ccb4d2 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/MulTagSubIT.java @@ -61,10 +61,10 @@ public class MulTagSubIT extends BaseConf { new RMQNormalListner()); producer.send(tag, msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -83,10 +83,10 @@ public class MulTagSubIT extends BaseConf { producer.send(tag2Msgs); Assert.assertEquals("Not all sent succeeded", msgSize * 2, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(MQMessageFactory.getMessageBody(tag2Msgs), + consumer.getListener().waitForMessageConsume(MQMessageFactory.getMessageBody(tag2Msgs), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(MQMessageFactory.getMessageBody(tag2Msgs)); } @@ -104,10 +104,10 @@ public class MulTagSubIT extends BaseConf { Assert.assertEquals("Not all sent succeeded", msgSize * tags.length, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getAllTagMessageBody()); } @@ -125,11 +125,11 @@ public class MulTagSubIT extends BaseConf { Assert.assertEquals("Not all sent succeeded", msgSize * tags.length, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume( + consumer.getListener().waitForMessageConsume( tagMessage.getMessageBodyByTag(tags[0], tags[1]), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())).containsExactlyElementsIn( + consumer.getListener().getAllMsgBody())).containsExactlyElementsIn( tagMessage.getMessageBodyByTag(tags[0], tags[1])); } @@ -150,7 +150,7 @@ public class MulTagSubIT extends BaseConf { TestUtils.waitForSeconds(5); assertThat(VerifyUtils - .getFilterdMessage(producer.getAllMsgBody(), consumer.getListner().getAllMsgBody()) + .getFilterdMessage(producer.getAllMsgBody(), consumer.getListener().getAllMsgBody()) .size()).isEqualTo(0); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWith1ConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWith1ConsumerIT.java index f0a1d488..1952f305 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWith1ConsumerIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWith1ConsumerIT.java @@ -57,9 +57,9 @@ public class TagMessageWith1ConsumerIT extends BaseConf { RMQNormalConsumer consumer = getConsumer(nsAddr, topic, tag, new RMQNormalListner()); producer.send(tag, msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -71,10 +71,10 @@ public class TagMessageWith1ConsumerIT extends BaseConf { new RMQNormalListner()); producer.send(msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -87,10 +87,10 @@ public class TagMessageWith1ConsumerIT extends BaseConf { new RMQNormalListner()); producer.send(tag, msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -103,10 +103,10 @@ public class TagMessageWith1ConsumerIT extends BaseConf { new RMQNormalListner()); producer.send(tag, msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -119,10 +119,10 @@ public class TagMessageWith1ConsumerIT extends BaseConf { new RMQNormalListner()); producer.send(tag, msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -142,10 +142,10 @@ public class TagMessageWith1ConsumerIT extends BaseConf { producer.send(tag2Msgs); producer.send(10); Assert.assertEquals("Not all are sent", msgSize * 3, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -164,10 +164,10 @@ public class TagMessageWith1ConsumerIT extends BaseConf { producer.send(tag1Msgs); producer.send(tag2Msgs); Assert.assertEquals("Not all are sent", msgSize * 2, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -187,11 +187,11 @@ public class TagMessageWith1ConsumerIT extends BaseConf { producer.send(tag2Msgs); producer.send(10); Assert.assertEquals("Not all are sent", msgSize * 3, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(MQMessageFactory.getMessageBody(tag2Msgs), + consumer.getListener().waitForMessageConsume(MQMessageFactory.getMessageBody(tag2Msgs), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(MQMessageFactory.getMessageBody(tag2Msgs)); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java index 995bf416..8cc97f2f 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithMulConsumerIT.java @@ -69,16 +69,16 @@ public class TagMessageWithMulConsumerIT extends BaseConf { producer.send(tag2Msgs); Assert.assertEquals("Not all are sent", msgSize * 2, producer.getAllUndupMsgBody().size()); - consumerTag1.getListner().waitForMessageConsume(MQMessageFactory.getMessageBody(tag1Msgs), + consumerTag1.getListener().waitForMessageConsume(MQMessageFactory.getMessageBody(tag1Msgs), consumeTime); - consumerTag2.getListner().waitForMessageConsume(MQMessageFactory.getMessageBody(tag2Msgs), + consumerTag2.getListener().waitForMessageConsume(MQMessageFactory.getMessageBody(tag2Msgs), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerTag1.getListner().getAllMsgBody())) + consumerTag1.getListener().getAllMsgBody())) .containsExactlyElementsIn(MQMessageFactory.getMessageBody(tag1Msgs)); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerTag2.getListner().getAllMsgBody())) + consumerTag2.getListener().getAllMsgBody())) .containsExactlyElementsIn(MQMessageFactory.getMessageBody(tag2Msgs)); } @@ -98,16 +98,16 @@ public class TagMessageWithMulConsumerIT extends BaseConf { Assert.assertEquals("Not all are sent", msgSize * tags.length, producer.getAllUndupMsgBody().size()); - consumerTag1.getListner().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), + consumerTag1.getListener().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), consumeTime); - consumerTag2.getListner().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[1]), + consumerTag2.getListener().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[1]), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerTag1.getListner().getAllMsgBody())) + consumerTag1.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getMessageBodyByTag(tags[0])); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerTag2.getListner().getAllMsgBody())) + consumerTag2.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getMessageBodyByTag(tags[1])); } @@ -129,16 +129,16 @@ public class TagMessageWithMulConsumerIT extends BaseConf { Assert.assertEquals("Not all are sent", msgSize * tags.length, producer.getAllUndupMsgBody().size()); - consumerTag1.getListner().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags), + consumerTag1.getListener().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags), consumeTime); - consumerTag2.getListner().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), + consumerTag2.getListener().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerTag1.getListner().getAllMsgBody())) + consumerTag1.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getAllTagMessageBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerTag2.getListner().getAllMsgBody())) + consumerTag2.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getMessageBodyByTag(tags[0])); } @@ -169,27 +169,27 @@ public class TagMessageWithMulConsumerIT extends BaseConf { producer.send(tagMsgs); Assert.assertEquals("Not all are sent", msgSize * 3, producer.getAllUndupMsgBody().size()); - consumerSubTwoMatchAll.getListner() + consumerSubTwoMatchAll.getListener() .waitForMessageConsume(tagMessage.getMessageBodyByTag(tags), consumeTime); - consumerSubTwoMachieOne.getListner() + consumerSubTwoMachieOne.getListener() .waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), consumeTime); - consumerSubTag1.getListner().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), + consumerSubTag1.getListener().waitForMessageConsume(tagMessage.getMessageBodyByTag(tags[0]), consumeTime); - consumerSubAll.getListner().waitForMessageConsume( + consumerSubAll.getListener().waitForMessageConsume( MQMessageFactory.getMessage(msgsWithNoTag, tagMessage.getAllTagMessageBody()), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerSubTwoMatchAll.getListner().getAllMsgBody())) + consumerSubTwoMatchAll.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getAllTagMessageBody()); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerSubTwoMachieOne.getListner().getAllMsgBody())) + consumerSubTwoMachieOne.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getMessageBodyByTag(tags[0])); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerSubTag1.getListner().getAllMsgBody())) + consumerSubTag1.getListener().getAllMsgBody())) .containsExactlyElementsIn(tagMessage.getMessageBodyByTag(tags[0])); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumerSubAll.getListner().getAllMsgBody())) + consumerSubAll.getListener().getAllMsgBody())) .containsExactlyElementsIn(MQMessageFactory.getMessage(msgsWithNoTag, tagMessage.getAllTagMessageBody())); } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithSameGroupConsumerIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithSameGroupConsumerIT.java index 135cbec8..df8945e3 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithSameGroupConsumerIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/tag/TagMessageWithSameGroupConsumerIT.java @@ -61,10 +61,10 @@ public class TagMessageWithSameGroupConsumerIT extends BaseConf { new RMQNormalListner(originMsgDCName, msgBodyDCName)); producer.send(tag, msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -82,9 +82,9 @@ public class TagMessageWithSameGroupConsumerIT extends BaseConf { new RMQNormalListner(originMsgDCName, msgBodyDCName)); TestUtils.waitForMoment(5); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -105,9 +105,9 @@ public class TagMessageWithSameGroupConsumerIT extends BaseConf { mqClients.remove(1); TestUtils.waitForMoment(5); - consumer1.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer1.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllMsgBody())) + consumer1.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/MulConsumerMulTopicIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/MulConsumerMulTopicIT.java index 98d858b6..56d49afd 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/MulConsumerMulTopicIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/MulConsumerMulTopicIT.java @@ -59,7 +59,7 @@ public class MulConsumerMulTopicIT extends BaseConf { Assert.assertEquals("Not all sent succeeded", msgSize * 2, producer.getAllUndupMsgBody().size()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); } @@ -80,7 +80,7 @@ public class MulConsumerMulTopicIT extends BaseConf { Assert.assertEquals("Not all sent succeeded", msgSize * 2, producer.getAllUndupMsgBody().size()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); } @@ -102,7 +102,7 @@ public class MulConsumerMulTopicIT extends BaseConf { producer.send(MQMessageFactory.getMsg(topic2, msgSize, tag1)); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/OneConsumerMulTopicIT.java b/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/OneConsumerMulTopicIT.java index 969fa79d..8c1a2841 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/OneConsumerMulTopicIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/consumer/topic/OneConsumerMulTopicIT.java @@ -55,9 +55,9 @@ public class OneConsumerMulTopicIT extends BaseConf { producer.send(MQMessageFactory.getMsg(topic2, msgSize)); Assert.assertEquals("Not all are sent", msgSize * 2, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -74,9 +74,9 @@ public class OneConsumerMulTopicIT extends BaseConf { producer.send(MQMessageFactory.getMsg(topic2, msgSize, tag)); Assert.assertEquals("Not all are sent", msgSize * 2, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } @@ -96,9 +96,9 @@ public class OneConsumerMulTopicIT extends BaseConf { producer.send(MQMessageFactory.getMsg(topic2, msgSize, tag1)); Assert.assertEquals("Not all are sent", msgSize * 2, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueIT.java index 24a75473..637774e2 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueIT.java @@ -59,12 +59,12 @@ public class AsyncSendWithMessageQueueIT extends BaseConf { producer.waitForResponse(10 * 1000); assertThat(producer.getSuccessMsgCount()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); - VerifyUtils.verifyMessageQueueId(queueId, consumer.getListner().getAllOriginMsg()); + VerifyUtils.verifyMessageQueueId(queueId, consumer.getListener().getAllOriginMsg()); producer.clearMsg(); consumer.clearMsg(); @@ -74,11 +74,11 @@ public class AsyncSendWithMessageQueueIT extends BaseConf { producer.waitForResponse(10 * 1000); assertThat(producer.getSuccessMsgCount()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); - VerifyUtils.verifyMessageQueueId(queueId, consumer.getListner().getAllOriginMsg()); + VerifyUtils.verifyMessageQueueId(queueId, consumer.getListener().getAllOriginMsg()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueSelectorIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueSelectorIT.java index 82012eab..12df9678 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueSelectorIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithMessageQueueSelectorIT.java @@ -71,12 +71,12 @@ public class AsyncSendWithMessageQueueSelectorIT extends BaseConf { producer.waitForResponse(5 * 1000); assertThat(producer.getSuccessMsgCount()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); - VerifyUtils.verifyMessageQueueId(queueId, consumer.getListner().getAllOriginMsg()); + VerifyUtils.verifyMessageQueueId(queueId, consumer.getListener().getAllOriginMsg()); producer.clearMsg(); consumer.clearMsg(); @@ -96,11 +96,11 @@ public class AsyncSendWithMessageQueueSelectorIT extends BaseConf { producer.waitForResponse(5 * 1000); assertThat(producer.getSuccessMsgCount()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); - VerifyUtils.verifyMessageQueueId(queueId, consumer.getListner().getAllOriginMsg()); + VerifyUtils.verifyMessageQueueId(queueId, consumer.getListener().getAllOriginMsg()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithOnlySendCallBackIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithOnlySendCallBackIT.java index 51aeef46..7b0d9fdb 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithOnlySendCallBackIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/async/AsyncSendWithOnlySendCallBackIT.java @@ -55,9 +55,9 @@ public class AsyncSendWithOnlySendCallBackIT extends BaseConf { producer.waitForResponse(10 * 1000); assertThat(producer.getSuccessMsgCount()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/exception/msg/MessageUserPropIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/exception/msg/MessageUserPropIT.java index b5882df2..b264ef73 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/exception/msg/MessageUserPropIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/exception/msg/MessageUserPropIT.java @@ -63,10 +63,10 @@ public class MessageUserPropIT extends BaseConf { producer.send(msg, null); assertThat(producer.getAllMsgBody().size()).isEqualTo(1); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); Message sendMsg = (Message) producer.getFirstMsg(); - Message recvMsg = (Message) consumer.getListner().getFirstMsg(); + Message recvMsg = (Message) consumer.getListener().getFirstMsg(); assertThat(recvMsg.getUserProperty(msgKey)).isEqualTo(sendMsg.getUserProperty(msgKey)); } @@ -85,10 +85,10 @@ public class MessageUserPropIT extends BaseConf { producer.send(msg, null); assertThat(producer.getAllMsgBody().size()).isEqualTo(1); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); Message sendMsg = (Message) producer.getFirstMsg(); - Message recvMsg = (Message) consumer.getListner().getFirstMsg(); + Message recvMsg = (Message) consumer.getListener().getFirstMsg(); assertThat(recvMsg.getUserProperty(msgKey)).isEqualTo(sendMsg.getUserProperty(msgKey)); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendIT.java index 37df4f8d..17572dd9 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendIT.java @@ -56,9 +56,9 @@ public class OneWaySendIT extends BaseConf { producer.waitForResponse(5 * 1000); assertThat(producer.getAllMsgBody().size()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithMQIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithMQIT.java index a2b601b1..bfb45a80 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithMQIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithMQIT.java @@ -59,9 +59,9 @@ public class OneWaySendWithMQIT extends BaseConf { producer.sendOneWay(msgSize, mq); producer.waitForResponse(5 * 1000); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); producer.clearMsg(); @@ -71,9 +71,9 @@ public class OneWaySendWithMQIT extends BaseConf { producer.asyncSend(msgSize, mq); producer.waitForResponse(5 * 1000); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithSelectorIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithSelectorIT.java index aa70556a..5dd3e447 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithSelectorIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/oneway/OneWaySendWithSelectorIT.java @@ -71,12 +71,12 @@ public class OneWaySendWithSelectorIT extends BaseConf { }); assertThat(producer.getAllMsgBody().size()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); - VerifyUtils.verifyMessageQueueId(queueId, consumer.getListner().getAllOriginMsg()); + VerifyUtils.verifyMessageQueueId(queueId, consumer.getListener().getAllOriginMsg()); producer.clearMsg(); consumer.clearMsg(); @@ -94,11 +94,11 @@ public class OneWaySendWithSelectorIT extends BaseConf { }); assertThat(producer.getAllMsgBody().size()).isEqualTo(msgSize); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); - VerifyUtils.verifyMessageQueueId(queueId, consumer.getListner().getAllOriginMsg()); + VerifyUtils.verifyMessageQueueId(queueId, consumer.getListener().getAllOriginMsg()); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgDynamicRebalanceIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgDynamicRebalanceIT.java index a6520b43..8ae936bd 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgDynamicRebalanceIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgDynamicRebalanceIT.java @@ -63,20 +63,20 @@ public class OrderMsgDynamicRebalanceIT extends BaseConf { MessageQueueMsg mqMsgs = new MessageQueueMsg(mqs, msgSize); producer.send(mqMsgs.getMsgsWithMQ()); - MQWait.waitConsumeAll(30 * 1000, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner()); + MQWait.waitConsumeAll(30 * 1000, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener()); consumer2.shutdown(); mqMsgs = new MessageQueueMsg(mqs, msgSize); producer.send(mqMsgs.getMsgsWithMQ()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListener()).getMsgs())) .isEqualTo(true); } @@ -94,22 +94,22 @@ public class OrderMsgDynamicRebalanceIT extends BaseConf { MessageQueueMsg mqMsgs = new MessageQueueMsg(mqs, msgSize); producer.send(mqMsgs.getMsgsWithMQ()); - MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListner(), - consumer2.getListner(), consumer3.getListner()); + MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), consumer1.getListener(), + consumer2.getListener(), consumer3.getListener()); consumer3.shutdown(); mqMsgs = new MessageQueueMsg(mqs, msgSize); producer.send(mqMsgs.getMsgsWithMQ()); boolean recvAll = MQWait.waitConsumeAll(30 * 1000, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner(), consumer3.getListner()); + consumer1.getListener(), consumer2.getListener(), consumer3.getListener()); assertThat(recvAll).isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer3.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer3.getListener()).getMsgs())) .isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgIT.java index 006aaa15..4b54feda 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgIT.java @@ -59,13 +59,13 @@ public class OrderMsgIT extends BaseConf { MessageQueueMsg mqMsgs = new MessageQueueMsg(mqs, msgSize); producer.send(mqMsgs.getMsgsWithMQ()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(mqMsgs.getMsgBodys()); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } @@ -77,13 +77,13 @@ public class OrderMsgIT extends BaseConf { msgSize); producer.send(mqMsgs.getMsgsWithMQ()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(mqMsgs.getMsgBodys()); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } @@ -96,13 +96,13 @@ public class OrderMsgIT extends BaseConf { msgSize); producer.send(mqMsgs.getMsgsWithMQ()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(mqMsgs.getMsgBodys()); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgRebalanceIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgRebalanceIT.java index 57b69d2e..68a207c2 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgRebalanceIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgRebalanceIT.java @@ -64,19 +64,19 @@ public class OrderMsgRebalanceIT extends BaseConf { producer.send(mqMsgs.getMsgsWithMQ()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); boolean balance = VerifyUtils.verifyBalance(producer.getAllMsgBody().size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllUndupMsgBody()).size(), + consumer1.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllUndupMsgBody()).size()); + consumer2.getListener().getAllUndupMsgBody()).size()); assertThat(balance).isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListener()).getMsgs())) .isEqualTo(true); } @@ -97,36 +97,36 @@ public class OrderMsgRebalanceIT extends BaseConf { producer.send(mqMsgs.getMsgsWithMQ()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner(), consumer3.getListner(), - consumer4.getListner()); + consumer1.getListener(), consumer2.getListener(), consumer3.getListener(), + consumer4.getListener()); assertThat(recvAll).isEqualTo(true); boolean balance = VerifyUtils .verifyBalance(producer.getAllMsgBody().size(), VerifyUtils .getFilterdMessage(producer.getAllMsgBody(), - consumer1.getListner().getAllUndupMsgBody()) + consumer1.getListener().getAllUndupMsgBody()) .size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer2.getListner().getAllUndupMsgBody()).size(), + consumer2.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer3.getListner().getAllUndupMsgBody()).size(), + consumer3.getListener().getAllUndupMsgBody()).size(), VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer4.getListner().getAllUndupMsgBody()).size()); + consumer4.getListener().getAllUndupMsgBody()).size()); logger.info(String.format("consumer1:%s;consumer2:%s;consumer3:%s,consumer4:%s", - consumer1.getListner().getAllMsgBody().size(), - consumer2.getListner().getAllMsgBody().size(), - consumer3.getListner().getAllMsgBody().size(), - consumer4.getListner().getAllMsgBody().size())); + consumer1.getListener().getAllMsgBody().size(), + consumer2.getListener().getAllMsgBody().size(), + consumer3.getListener().getAllMsgBody().size(), + consumer4.getListener().getAllMsgBody().size())); assertThat(balance).isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer3.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer3.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer4.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer4.getListener()).getMsgs())) .isEqualTo(true); } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgWithTagIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgWithTagIT.java index 7db77de4..0636d58a 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgWithTagIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/order/OrderMsgWithTagIT.java @@ -60,13 +60,13 @@ public class OrderMsgWithTagIT extends BaseConf { MessageQueueMsg mqMsgs = new MessageQueueMsg(mqs, msgSize, tag); producer.send(mqMsgs.getMsgsWithMQ()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(mqMsgs.getMsgBodys()); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } @@ -80,13 +80,13 @@ public class OrderMsgWithTagIT extends BaseConf { MessageQueueMsg mqMsgs = new MessageQueueMsg(mqs, msgSize, tag); producer.send(mqMsgs.getMsgsWithMQ()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(mqMsgs.getMsgBodys()); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } @@ -106,13 +106,13 @@ public class OrderMsgWithTagIT extends BaseConf { mqMsgs = new MessageQueueMsg(mqs, msgSize, tag1); producer.send(mqMsgs.getMsgsWithMQ()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(mqMsgs.getMsgBodys()); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } @@ -134,12 +134,12 @@ public class OrderMsgWithTagIT extends BaseConf { producer.send(mqMsgs.getMsgsWithMQ()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer1.getListner(), consumer2.getListner()); + consumer1.getListener(), consumer2.getListener()); assertThat(recvAll).isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer1.getListener()).getMsgs())) .isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer2.getListener()).getMsgs())) .isEqualTo(true); } @@ -160,10 +160,10 @@ public class OrderMsgWithTagIT extends BaseConf { producer.send(mqMsgs.getMsgsWithMQ()); boolean recvAll = MQWait.waitConsumeAll(consumeTime, producer.getAllMsgBody(), - consumer.getListner()); + consumer.getListener()); assertThat(recvAll).isEqualTo(true); - assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListner()).getMsgs())) + assertThat(VerifyUtils.verifyOrder(((RMQOrderListener) consumer.getListener()).getMsgs())) .isEqualTo(true); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/client/producer/querymsg/QueryMsgByIdIT.java b/test/src/test/java/org/apache/rocketmq/test/client/producer/querymsg/QueryMsgByIdIT.java index 2cdd66c9..2d9bac72 100644 --- a/test/src/test/java/org/apache/rocketmq/test/client/producer/querymsg/QueryMsgByIdIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/client/producer/querymsg/QueryMsgByIdIT.java @@ -57,11 +57,11 @@ public class QueryMsgByIdIT extends BaseConf { int msgSize = 20; producer.send(msgSize); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); Assert.assertEquals("Not all are consumed", 0, VerifyUtils.verify(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())); + consumer.getListener().getAllMsgBody())); - MessageExt recvMsg = (MessageExt) consumer.getListner().getFirstMsg(); + MessageExt recvMsg = (MessageExt) consumer.getListener().getFirstMsg(); MessageExt queryMsg = null; try { TestUtils.waitForMoment(3000); diff --git a/test/src/test/java/org/apache/rocketmq/test/delay/NormalMsgDelayIT.java b/test/src/test/java/org/apache/rocketmq/test/delay/NormalMsgDelayIT.java index dc5f2302..9b18d5cc 100644 --- a/test/src/test/java/org/apache/rocketmq/test/delay/NormalMsgDelayIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/delay/NormalMsgDelayIT.java @@ -57,12 +57,12 @@ public class NormalMsgDelayIT extends DelayConf { producer.send(delayMsgs); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); Assert.assertEquals("Not all are consumed", 0, VerifyUtils.verify(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())); + consumer.getListener().getAllMsgBody())); Assert.assertEquals("Timer is not correct", true, VerifyUtils.verifyDelay(DELAY_LEVEL[delayLevel - 1] * 1000, - ((RMQDelayListner) consumer.getListner()).getMsgDelayTimes())); + ((RMQDelayListner) consumer.getListener()).getMsgDelayTimes())); } @Test @@ -72,13 +72,13 @@ public class NormalMsgDelayIT extends DelayConf { producer.send(delayMsgs); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), DELAY_LEVEL[delayLevel - 1] * 1000 * 2); Assert.assertEquals("Not all are consumed", 0, VerifyUtils.verify(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())); + consumer.getListener().getAllMsgBody())); Assert.assertEquals("Timer is not correct", true, VerifyUtils.verifyDelay(DELAY_LEVEL[delayLevel - 1] * 1000, - ((RMQDelayListner) consumer.getListner()).getMsgDelayTimes())); + ((RMQDelayListner) consumer.getListener()).getMsgDelayTimes())); } @Test @@ -88,13 +88,13 @@ public class NormalMsgDelayIT extends DelayConf { producer.send(delayMsgs); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), DELAY_LEVEL[delayLevel - 1] * 1000 * 2); Assert.assertEquals("Not all are consumed", 0, VerifyUtils.verify(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())); + consumer.getListener().getAllMsgBody())); Assert.assertEquals("Timer is not correct", true, VerifyUtils.verifyDelay(DELAY_LEVEL[delayLevel - 1] * 1000, - ((RMQDelayListner) consumer.getListner()).getMsgDelayTimes())); + ((RMQDelayListner) consumer.getListener()).getMsgDelayTimes())); } @Test @@ -104,12 +104,12 @@ public class NormalMsgDelayIT extends DelayConf { producer.send(delayMsgs); Assert.assertEquals("Not all are sent", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), DELAY_LEVEL[delayLevel - 1] * 1000 * 2); Assert.assertEquals("Not all are consumed", 0, VerifyUtils.verify(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())); + consumer.getListener().getAllMsgBody())); Assert.assertEquals("Timer is not correct", true, VerifyUtils.verifyDelay(DELAY_LEVEL[delayLevel - 1] * 1000, - ((RMQDelayListner) consumer.getListner()).getMsgDelayTimes())); + ((RMQDelayListner) consumer.getListener()).getMsgDelayTimes())); } } diff --git a/test/src/test/java/org/apache/rocketmq/test/smoke/NormalMessageSendAndRecvIT.java b/test/src/test/java/org/apache/rocketmq/test/smoke/NormalMessageSendAndRecvIT.java index c4225018..35d91717 100644 --- a/test/src/test/java/org/apache/rocketmq/test/smoke/NormalMessageSendAndRecvIT.java +++ b/test/src/test/java/org/apache/rocketmq/test/smoke/NormalMessageSendAndRecvIT.java @@ -54,9 +54,9 @@ public class NormalMessageSendAndRecvIT extends BaseConf { int msgSize = 10; producer.send(msgSize); Assert.assertEquals("Not all sent succeeded", msgSize, producer.getAllUndupMsgBody().size()); - consumer.getListner().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); + consumer.getListener().waitForMessageConsume(producer.getAllMsgBody(), consumeTime); assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), - consumer.getListner().getAllMsgBody())) + consumer.getListener().getAllMsgBody())) .containsExactlyElementsIn(producer.getAllMsgBody()); } } -- GitLab