[rocketmq] branch develop updated: Fix DefaultLitePullConsumerTest#testConsumerCommitSyncWithMQOffset (#4973)

[li...@apache.org]

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

lizhanhui 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 ec0426ca0 Fix DefaultLitePullConsumerTest#testConsumerCommitSyncWithMQOffset (#4973)
ec0426ca0 is described below

commit ec0426ca0ebeb1e75bbaa5a2c450fee202125663
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Fri Sep 2 15:00:09 2022 +0800

    Fix DefaultLitePullConsumerTest#testConsumerCommitSyncWithMQOffset (#4973)
---
 .../apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
index 1db13f89c..220f89f30 100644
--- a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
+++ b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
@@ -20,13 +20,13 @@ package org.apache.rocketmq.client.consumer;
 import java.io.ByteArrayOutputStream;
 import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.rocketmq.client.ClientConfig;
@@ -67,6 +67,7 @@ import org.mockito.stubbing.Answer;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -189,7 +190,7 @@ public class DefaultLitePullConsumerTest {
         //mock assign and reset offset
         litePullConsumer.assign(set);
         litePullConsumer.seek(messageQueue, 0);
-
+        await().atMost(Duration.ofSeconds(5)).untilAsserted(() -> assertThat(litePullConsumer.committed(messageQueue)).isEqualTo(0));
         //commit offset 1
         Map<MessageQueue, Long> commitOffset = new HashMap<>();
         commitOffset.put(messageQueue, 1L);