You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by st...@apache.org on 2017/01/22 09:12:01 UTC
[12/14] incubator-rocketmq git commit: Merge branch 'master' into
ROCKETMQ-57
Merge branch 'master' into ROCKETMQ-57
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/524c8fcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/524c8fcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/524c8fcf
Branch: refs/heads/ROCKETMQ-57
Commit: 524c8fcf359c353b8c11171cf55dfe0787a476dc
Parents: 78603cd e9a87ea
Author: stevenschew <st...@apache.org>
Authored: Sun Jan 22 16:23:08 2017 +0800
Committer: stevenschew <st...@apache.org>
Committed: Sun Jan 22 16:23:08 2017 +0800
----------------------------------------------------------------------
.../rocketmq/broker/BrokerControllerTest.java | 20 +-
.../broker/client/ProducerManagerTest.java | 90 +++++++
.../processor/ClientManageProcessorTest.java | 132 +++++++++++
.../processor/PullMessageProcessorTest.java | 231 ++++++++++++++++++
.../processor/SendMessageProcessorTest.java | 226 ++++++++++++++++++
.../rocketmq/example/quickstart/Consumer.java | 28 +++
.../rocketmq/example/quickstart/Producer.java | 46 +++-
.../namesrv/NameServerInstanceTest.java | 47 ++++
.../rocketmq/namesrv/NamesrvControllerTest.java | 47 ++++
.../namesrv/kvconfig/KVConfigManagerTest.java | 54 +++++
.../kvconfig/KVConfigSerializeWrapperTest.java | 53 +++++
.../processor/DefaultRequestProcessorTest.java | 19 +-
.../namesrv/routeinfo/RouteInfoManagerTest.java | 103 ++++++++
.../remoting/netty/NettyRemotingServer.java | 4 +-
.../remoting/protocol/RemotingCommand.java | 12 -
.../remoting/protocol/RocketMQSerializable.java | 11 +-
.../remoting/protocol/protocol.sevialize.txt | 21 --
.../rocketmq/remoting/protocol/protocol.txt | 21 --
.../org/apache/rocketmq/remoting/MixTest.java | 30 ---
.../apache/rocketmq/remoting/NettyRPCTest.java | 233 -------------------
.../rocketmq/remoting/RemotingServerTest.java | 158 +++++++++++++
.../protocol/RocketMQSerializableTest.java | 16 +-
.../rocketmq/subclass/TestSubClassAuto.java | 27 ---
.../org/apache/rocketmq/store/ConsumeQueue.java | 28 +--
.../rocketmq/store/DefaultMessageStore.java | 14 +-
.../org/apache/rocketmq/store/MappedFile.java | 22 +-
.../apache/rocketmq/store/MappedFileQueue.java | 4 +
.../store/schedule/ScheduleMessageService.java | 2 +-
.../rocketmq/store/MappedFileQueueTest.java | 50 +++-
.../tools/admin/DefaultMQAdminExtTest.java | 44 +++-
30 files changed, 1350 insertions(+), 443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/524c8fcf/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
----------------------------------------------------------------------
diff --cc tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
index 830abf0,bb80eb4..2d54263
--- a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
+++ b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java
@@@ -38,10 -62,14 +62,14 @@@ import org.apache.rocketmq.common.proto
import org.apache.rocketmq.common.protocol.route.QueueData;
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
- import org.apache.rocketmq.remoting.exception.*;
+ import org.apache.rocketmq.remoting.exception.RemotingCommandException;
+ import org.apache.rocketmq.remoting.exception.RemotingConnectException;
+ import org.apache.rocketmq.remoting.exception.RemotingException;
+ import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
+ import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
import org.apache.rocketmq.tools.admin.api.MessageTrack;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
@@@ -217,10 -237,9 +241,9 @@@ public class DefaultMQAdminExtTest
assertThat(result.getProperty("serverSocketRcvBufSize")).isEqualTo("655350");
}
-
@Test
public void testFetchAllTopicList() throws RemotingException, MQClientException, InterruptedException {
- TopicList topicList = defaultMQAdminExtImpl.fetchAllTopicList();
+ TopicList topicList = defaultMQAdminExt.fetchAllTopicList();
assertThat(topicList.getTopicList().size()).isEqualTo(2);
assertThat(topicList.getTopicList()).contains("topic_one");
}
@@@ -303,10 -322,9 +326,9 @@@
assertThat(kvs.getTable().get("cluster-name")).isEqualTo("default-cluster");
}
-
@Test
public void testQueryTopicConsumeByWho() throws InterruptedException, RemotingException, MQClientException, MQBrokerException {
- GroupList groupList = defaultMQAdminExtImpl.queryTopicConsumeByWho("UnitTest");
+ GroupList groupList = defaultMQAdminExt.queryTopicConsumeByWho("UnitTest");
assertThat(groupList.getGroupList().contains("consumer-group-two")).isTrue();
}