Repository: incubator-rocketmq Updated Branches: refs/heads/ROCKETMQ-57 63de56c7b -> 9e48842eb
[ROCKETMQ-57] change @Before and @After to @BeforeClass and @AfterClass Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/9e48842e Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/9e48842e Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/9e48842e Branch: refs/heads/ROCKETMQ-57 Commit: 9e48842eb0dfc4f391a7547e3d5735c468ae4244 Parents: 63de56c Author: stevenschew <[email protected]> Authored: Sun Jan 22 10:30:01 2017 +0800 Committer: stevenschew <[email protected]> Committed: Sun Jan 22 10:30:01 2017 +0800 ---------------------------------------------------------------------- .../tools/admin/DefaultMQAdminExtTest.java | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/9e48842e/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java ---------------------------------------------------------------------- diff --git a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java index da3bd8c..93ba7bd 100644 --- a/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java +++ b/tools/src/test/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtTest.java @@ -37,9 +37,7 @@ 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.tools.admin.api.MessageTrack; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; @@ -55,17 +53,17 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class DefaultMQAdminExtTest { - private DefaultMQAdminExtImpl defaultMQAdminExtImpl; - private MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig()); - private MQClientAPIImpl mQClientAPIImpl; - private Properties properties = new Properties(); - private TopicList topicList = new TopicList(); - private TopicRouteData topicRouteData = new TopicRouteData(); - private KVTable kvTable = new KVTable(); - private ClusterInfo clusterInfo = new ClusterInfo(); - - @Before - public void init() throws Exception { + private static DefaultMQAdminExtImpl defaultMQAdminExtImpl; + private static MQClientInstance mqClientInstance = MQClientManager.getInstance().getAndCreateMQClientInstance(new ClientConfig()); + private static MQClientAPIImpl mQClientAPIImpl; + private static Properties properties = new Properties(); + private static TopicList topicList = new TopicList(); + private static TopicRouteData topicRouteData = new TopicRouteData(); + private static KVTable kvTable = new KVTable(); + private static ClusterInfo clusterInfo = new ClusterInfo(); + + @BeforeClass + public static void init() throws Exception { mQClientAPIImpl = mock(MQClientAPIImpl.class); DefaultMQAdminExt defaultMQAdminExt = new DefaultMQAdminExt(); defaultMQAdminExtImpl = new DefaultMQAdminExtImpl(defaultMQAdminExt, 1000); @@ -196,8 +194,8 @@ public class DefaultMQAdminExtTest { when(mQClientAPIImpl.getConsumerRunningInfo(anyString(), anyString(), anyString(), anyBoolean(), anyLong())).thenReturn(consumerRunningInfo); } - @After - public void terminate() throws Exception { + @AfterClass + public static void terminate() throws Exception { if (defaultMQAdminExtImpl != null) defaultMQAdminExtImpl.shutdown(); }
