You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ni...@apache.org on 2016/12/26 02:45:02 UTC
incubator-rocketmq git commit: ROCKETMQ-3 Clean up and perfect the
unit test with thanks to zander
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master b5afe91df -> 03880d77a
ROCKETMQ-3 Clean up and perfect the unit test with thanks to zander
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/03880d77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/03880d77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/03880d77
Branch: refs/heads/master
Commit: 03880d77a984403170802e9f32a568e57347e3ab
Parents: b5afe91
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Dec 26 10:38:39 2016 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Dec 26 10:38:39 2016 +0800
----------------------------------------------------------------------
.../rocketmq/broker/api/SendMessageTest.java | 32 +++++++++-----------
.../broker/topic/TopicConfigManagerTest.java | 12 ++++----
2 files changed, 20 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/03880d77/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
----------------------------------------------------------------------
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 d9babc2..cf97876 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);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/03880d77/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
----------------------------------------------------------------------
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 7a6503f..1c93b02 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);
}
}
}