[ROCKETMQ-54] Polish unit test for RouteInfoManager and BrokerHouseKeepingService
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/e403ca39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/e403ca39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/e403ca39 Branch: refs/heads/ROCKETMQ-54 Commit: e403ca3977d7eb597083881034408239b7c79149 Parents: aae7cbe Author: stevenschew <[email protected]> Authored: Sun Jan 22 20:09:21 2017 +0800 Committer: stevenschew <[email protected]> Committed: Sun Jan 22 20:09:21 2017 +0800 ---------------------------------------------------------------------- .../processor/DefaultRequestProcessorTest.java | 1 - .../BrokerHousekeepingServiceTest.java | 59 ++++++++++++++++++++ .../namesrv/routeinfo/RouteInfoManagerTest.java | 25 ++++++++- 3 files changed, 81 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/e403ca39/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessorTest.java ---------------------------------------------------------------------- diff --git a/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessorTest.java b/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessorTest.java index 80d968f..4ee944d 100644 --- a/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessorTest.java +++ b/namesrv/src/test/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessorTest.java @@ -45,7 +45,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class DefaultRequestProcessorTest { - /** Test Target */ private DefaultRequestProcessor defaultRequestProcessor; private NamesrvController namesrvController; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/e403ca39/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/BrokerHousekeepingServiceTest.java ---------------------------------------------------------------------- diff --git a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/BrokerHousekeepingServiceTest.java b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/BrokerHousekeepingServiceTest.java new file mode 100644 index 0000000..ce6ce23 --- /dev/null +++ b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/BrokerHousekeepingServiceTest.java @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.rocketmq.namesrv.routeinfo; + +import org.apache.rocketmq.common.namesrv.NamesrvConfig; +import org.apache.rocketmq.namesrv.NamesrvController; +import org.apache.rocketmq.remoting.netty.NettyServerConfig; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +public class BrokerHousekeepingServiceTest { + private static BrokerHousekeepingService brokerHousekeepingService; + + @BeforeClass + public static void setup() { + NamesrvController namesrvController = new NamesrvController( + new NamesrvConfig(), + new NettyServerConfig() + ); + brokerHousekeepingService = new BrokerHousekeepingService(namesrvController); + } + + @AfterClass + public static void terminate() { + + } + + @Test + public void testOnChannelClose() { + brokerHousekeepingService.onChannelClose("127.0.0.1:9876", null); + } + + @Test + public void testOnChannelException() { + brokerHousekeepingService.onChannelException("127.0.0.1:9876", null); + } + + @Test + public void testOnChannelIdle() { + brokerHousekeepingService.onChannelException("127.0.0.1:9876", null); + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/e403ca39/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerTest.java ---------------------------------------------------------------------- diff --git a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerTest.java b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerTest.java index cd6c50c..5ab77be 100644 --- a/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerTest.java +++ b/namesrv/src/test/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManagerTest.java @@ -18,9 +18,12 @@ package org.apache.rocketmq.namesrv.routeinfo; import io.netty.channel.Channel; import java.util.ArrayList; +import java.util.concurrent.ConcurrentHashMap; +import org.apache.rocketmq.common.TopicConfig; import org.apache.rocketmq.common.namesrv.RegisterBrokerResult; import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper; import org.apache.rocketmq.common.protocol.route.TopicRouteData; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -30,11 +33,18 @@ import static org.mockito.Mockito.mock; public class RouteInfoManagerTest { - private RouteInfoManager routeInfoManager; + private static RouteInfoManager routeInfoManager; @Before public void setup() { routeInfoManager = new RouteInfoManager(); + testRegisterBroker(); + } + + @After + public void terminate() { + routeInfoManager.printAllPeriodically(); + routeInfoManager.unregisterBroker("default-cluster", "127.0.0.1:10911", "default-broker", 1234); } @Test @@ -52,7 +62,16 @@ public class RouteInfoManagerTest { @Test public void testRegisterBroker() { - TopicConfigSerializeWrapper topicConfigSerializeWrapper = mock(TopicConfigSerializeWrapper.class); + TopicConfigSerializeWrapper topicConfigSerializeWrapper = new TopicConfigSerializeWrapper(); + ConcurrentHashMap<String, TopicConfig> topicConfigConcurrentHashMap = new ConcurrentHashMap<>(); + TopicConfig topicConfig = new TopicConfig(); + topicConfig.setWriteQueueNums(8); + topicConfig.setTopicName("unit-test"); + topicConfig.setPerm(6); + topicConfig.setReadQueueNums(8); + topicConfig.setOrder(false); + topicConfigConcurrentHashMap.put("unit-test", topicConfig); + topicConfigSerializeWrapper.setTopicConfigTable(topicConfigConcurrentHashMap); Channel channel = mock(Channel.class); RegisterBrokerResult registerBrokerResult = routeInfoManager.registerBroker("default-cluster", "127.0.0.1:10911", "default-broker", 1234, "127.0.0.1:1001", topicConfigSerializeWrapper, new ArrayList<String>(), channel); @@ -61,7 +80,7 @@ public class RouteInfoManagerTest { @Test public void testWipeWritePermOfBrokerByLock() { - int result = routeInfoManager.wipeWritePermOfBrokerByLock("default-broker-name"); + int result = routeInfoManager.wipeWritePermOfBrokerByLock("default-broker"); assertThat(result).isEqualTo(0); }
