From e7b9169b3098c00ac66610d1522910e0ebf2b595 Mon Sep 17 00:00:00 2001
From: qqeasonchen <qqeasonchen@gmail.com>
Date: Sun, 29 Sep 2019 15:10:25 +0800
Subject: [PATCH] optimize unit test

---
 .../producer/DefaultMQProducerTest.java       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 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 941ee73f..991a5725 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
@@ -27,8 +27,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.rocketmq.client.ClientConfig;
 import org.apache.rocketmq.client.exception.MQBrokerException;
 import org.apache.rocketmq.client.exception.MQClientException;
@@ -319,24 +319,25 @@ public class DefaultMQProducerTest {
     @Test
     public void testRequestMessage() throws RemotingException, RequestTimeoutException, MQClientException, InterruptedException, MQBrokerException {
         when(mQClientAPIImpl.getTopicRouteInfoFromNameServer(anyString(), anyLong())).thenReturn(createTopicRoute());
+        final AtomicBoolean finish = new AtomicBoolean(false);
         new Thread(new Runnable() {
             @Override public void run() {
-                boolean flag = true;
-                ConcurrentHashMap<String, RequestResponseFuture> responseMap = null;
-                while (flag) {
-                    responseMap = RequestFutureTable.getRequestFutureTable();
-                    if (responseMap != null) {
-                        flag = false;
-                    }
-                }
+                ConcurrentHashMap<String, RequestResponseFuture> responseMap = RequestFutureTable.getRequestFutureTable();
                 assertThat(responseMap).isNotNull();
-                for (Map.Entry<String, RequestResponseFuture> entry : responseMap.entrySet()) {
-                    RequestResponseFuture future = entry.getValue();
-                    future.putResponseMessage(message);
+                while (!finish.get()) {
+                    try {
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                    }
+                    for (Map.Entry<String, RequestResponseFuture> entry : responseMap.entrySet()) {
+                        RequestResponseFuture future = entry.getValue();
+                        future.putResponseMessage(message);
+                    }
                 }
             }
         }).start();
         Message result = producer.request(message, 3 * 1000L);
+        finish.getAndSet(true);
         assertThat(result.getTopic()).isEqualTo("FooBar");
         assertThat(result.getBody()).isEqualTo(new byte[] {'a'});
     }
-- 
GitLab