From 03880d77a984403170802e9f32a568e57347e3ab Mon Sep 17 00:00:00 2001
From: Willem Jiang <willem.jiang@gmail.com>
Date: Mon, 26 Dec 2016 10:38:39 +0800
Subject: [PATCH] ROCKETMQ-3 Clean up and perfect the unit test with thanks to
 zander

---
 .../rocketmq/broker/api/SendMessageTest.java  | 32 ++++++++-----------
 .../broker/topic/TopicConfigManagerTest.java  | 12 +++----
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java b/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
index d9babc29..cf978762 100644
--- a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
+++ b/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
@@ -63,25 +63,21 @@ public class SendMessageTest extends BrokerTestHarness{
     }
 
     @Test
-    public void testSendSingle() throws Exception {
+    public void testSendSingle() throws Exception{
         Message msg = new Message(topic, "TAG1 TAG2", "100200300", "body".getBytes());
-        try {
-            SendMessageRequestHeader requestHeader = new SendMessageRequestHeader();
-            requestHeader.setProducerGroup("abc");
-            requestHeader.setTopic(msg.getTopic());
-            requestHeader.setDefaultTopic(MixAll.DEFAULT_TOPIC);
-            requestHeader.setDefaultTopicQueueNums(4);
-            requestHeader.setQueueId(0);
-            requestHeader.setSysFlag(0);
-            requestHeader.setBornTimestamp(System.currentTimeMillis());
-            requestHeader.setFlag(msg.getFlag());
-            requestHeader.setProperties(MessageDecoder.messageProperties2String(msg.getProperties()));
+        SendMessageRequestHeader requestHeader = new SendMessageRequestHeader();
+        requestHeader.setProducerGroup("abc");
+        requestHeader.setTopic(msg.getTopic());
+        requestHeader.setDefaultTopic(MixAll.DEFAULT_TOPIC);
+        requestHeader.setDefaultTopicQueueNums(4);
+        requestHeader.setQueueId(0);
+        requestHeader.setSysFlag(0);
+        requestHeader.setBornTimestamp(System.currentTimeMillis());
+        requestHeader.setFlag(msg.getFlag());
+        requestHeader.setProperties(MessageDecoder.messageProperties2String(msg.getProperties()));
 
-            SendResult result = client.sendMessage(brokerAddr, BROKER_NAME, msg, requestHeader, 1000 * 5,
-                    CommunicationMode.SYNC, new SendMessageContext(), null);
-            assertTrue(result.getSendStatus() == SendStatus.SEND_OK);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        SendResult result = client.sendMessage(brokerAddr, BROKER_NAME, msg, requestHeader, 1000 * 5,
+                CommunicationMode.SYNC, new SendMessageContext(), null);
+        assertEquals(result.getSendStatus(), SendStatus.SEND_OK);
     }
 }
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java b/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
index 7a6503fe..1c93b027 100644
--- a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
+++ b/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
@@ -25,7 +25,7 @@ import com.alibaba.rocketmq.common.MixAll;
 import com.alibaba.rocketmq.common.TopicConfig;
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 
 /**
@@ -39,7 +39,7 @@ public class TopicConfigManagerTest extends BrokerTestHarness {
         for (int i = 0; i < 10; i++) {
             String topic = "UNITTEST-" + i;
             TopicConfig topicConfig = topicConfigManager.createTopicInSendMessageMethod(topic, MixAll.DEFAULT_TOPIC, null, 4, 0);
-            assertTrue(topicConfig != null);
+            assertNotNull(topicConfig);
         }
         topicConfigManager.persist();
 
@@ -48,15 +48,15 @@ public class TopicConfigManagerTest extends BrokerTestHarness {
         for (int i = 0; i < 10; i++) {
             String topic = "UNITTEST-" + i;
             TopicConfig topicConfig = topicConfigManager.selectTopicConfig(topic);
-            assertTrue(topicConfig == null);
+            assertNull(topicConfig);
         }
         topicConfigManager.load();
         for (int i = 0; i < 10; i++) {
             String topic = "UNITTEST-" + i;
             TopicConfig topicConfig = topicConfigManager.selectTopicConfig(topic);
-            assertTrue(topicConfig != null);
-            assertTrue(topicConfig.getTopicSysFlag() == 0);
-            assertTrue(topicConfig.getReadQueueNums() == 4);
+            assertNotNull(topicConfig);
+            assertEquals(topicConfig.getTopicSysFlag(), 0);
+            assertEquals(topicConfig.getReadQueueNums(), 4);
         }
     }
 }
-- 
GitLab