From a8cd103d77d68a5fcd8b3014ea8866af485c0b15 Mon Sep 17 00:00:00 2001 From: yx9o Date: Thu, 11 Jul 2024 19:50:36 +0800 Subject: [PATCH 1/4] [ISSUE #8384] Add more test coverage for ClientConfig --- .../rocketmq/client/ClientConfigTest.java | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java diff --git a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java new file mode 100644 index 00000000000..738255f6478 --- /dev/null +++ b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java @@ -0,0 +1,119 @@ +/* + * 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.client; + +import org.apache.rocketmq.common.message.MessageQueue; +import org.apache.rocketmq.remoting.protocol.LanguageCode; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; + +import java.util.Collection; +import java.util.Collections; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +@RunWith(MockitoJUnitRunner.class) +public class ClientConfigTest { + + private ClientConfig clientConfig; + + private final String resource = "resource"; + + @Before + public void init() { + clientConfig = createClientConfig(); + } + + @Test + public void assertClientConfig() { + assertEquals("unitName", clientConfig.getUnitName()); + assertEquals("127.0.0.1", clientConfig.getClientIP()); + assertEquals(1, clientConfig.getClientCallbackExecutorThreads()); + assertEquals(1000 * 30, clientConfig.getPollNameServerInterval()); + assertEquals(1000 * 30, clientConfig.getHeartbeatBrokerInterval()); + assertEquals(1000 * 5, clientConfig.getPersistConsumerOffsetInterval()); + assertEquals(1000, clientConfig.getPullTimeDelayMillsWhenException()); + assertEquals("{}", clientConfig.getSocksProxyConfig()); + assertEquals(LanguageCode.JAVA, clientConfig.getLanguage()); + assertEquals(AccessChannel.LOCAL, clientConfig.getAccessChannel()); + assertEquals(1000 * 3, clientConfig.getMqClientApiTimeout()); + assertEquals(200, clientConfig.getDetectTimeout()); + assertEquals(1000 * 2, clientConfig.getDetectInterval()); + assertTrue(clientConfig.isUnitMode()); + assertTrue(clientConfig.isDecodeReadBody()); + assertTrue(clientConfig.isDecodeDecompressBody()); + assertTrue(clientConfig.isEnableStreamRequestType()); + assertTrue(clientConfig.isSendLatencyEnable()); + assertTrue(clientConfig.isEnableHeartbeatChannelEventListener()); + assertFalse(clientConfig.isUseHeartbeatV2()); + } + + @Test + public void testWithNamespace() { + Set resources = clientConfig.withNamespace(Collections.singleton(resource)); + assertTrue(resources.contains("lmq%resource")); + } + + @Test + public void testWithoutNamespace() { + String actual = clientConfig.withoutNamespace(resource); + assertEquals(resource, actual); + Set resources = clientConfig.withoutNamespace(Collections.singleton(resource)); + assertTrue(resources.contains(resource)); + } + + @Test + public void testQueuesWithNamespace() { + MessageQueue messageQueue = new MessageQueue(); + messageQueue.setTopic("defaultTopic"); + Collection messageQueues = clientConfig.queuesWithNamespace(Collections.singleton(messageQueue)); + assertTrue(messageQueues.contains(messageQueue)); + assertEquals("lmq%defaultTopic", messageQueues.iterator().next().getTopic()); + } + + private ClientConfig createClientConfig() { + ClientConfig result = new ClientConfig(); + result.setUnitName("unitName"); + result.setClientIP("127.0.0.1"); + result.setClientCallbackExecutorThreads(1); + result.setPollNameServerInterval(1000 * 30); + result.setHeartbeatBrokerInterval(1000 * 30); + result.setPersistConsumerOffsetInterval(1000 * 5); + result.setPullTimeDelayMillsWhenException(1000); + result.setUnitMode(true); + result.setSocksProxyConfig("{}"); + result.setLanguage(LanguageCode.JAVA); + result.setDecodeReadBody(true); + result.setDecodeDecompressBody(true); + result.setAccessChannel(AccessChannel.LOCAL); + result.setMqClientApiTimeout(1000 * 3); + result.setEnableStreamRequestType(true); + result.setSendLatencyEnable(true); + result.setEnableHeartbeatChannelEventListener(true); + result.setDetectTimeout(200); + result.setDetectInterval(1000 * 2); + result.setUseHeartbeatV2(false); + result.buildMQClientId(); + result.setNamespace("lmq"); + return result; + } +} From 29955b8eb093bc10b8aa7b9d6557693dbf0000c8 Mon Sep 17 00:00:00 2001 From: yx9o Date: Thu, 11 Jul 2024 20:36:50 +0800 Subject: [PATCH 2/4] Update test --- .../test/java/org/apache/rocketmq/client/ClientConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java index 738255f6478..5a4131cbad6 100644 --- a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java @@ -63,8 +63,8 @@ public void assertClientConfig() { assertTrue(clientConfig.isDecodeDecompressBody()); assertTrue(clientConfig.isEnableStreamRequestType()); assertTrue(clientConfig.isSendLatencyEnable()); - assertTrue(clientConfig.isEnableHeartbeatChannelEventListener()); assertFalse(clientConfig.isUseHeartbeatV2()); + assertTrue(clientConfig.isEnableHeartbeatChannelEventListener()); } @Test From af67474e512560a7ab9a806015eb67e15bc4ceef Mon Sep 17 00:00:00 2001 From: yx9o Date: Thu, 11 Jul 2024 21:24:24 +0800 Subject: [PATCH 3/4] Update test --- .../test/java/org/apache/rocketmq/client/ClientConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java index 5a4131cbad6..738255f6478 100644 --- a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java @@ -63,8 +63,8 @@ public void assertClientConfig() { assertTrue(clientConfig.isDecodeDecompressBody()); assertTrue(clientConfig.isEnableStreamRequestType()); assertTrue(clientConfig.isSendLatencyEnable()); - assertFalse(clientConfig.isUseHeartbeatV2()); assertTrue(clientConfig.isEnableHeartbeatChannelEventListener()); + assertFalse(clientConfig.isUseHeartbeatV2()); } @Test From 67684160aa921cc730b0656a11ee7fbad77abf14 Mon Sep 17 00:00:00 2001 From: yx9o Date: Sun, 14 Jul 2024 16:22:52 +0800 Subject: [PATCH 4/4] Update test --- .../rocketmq/client/ClientConfigTest.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java index 738255f6478..5afe9cc011d 100644 --- a/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/ClientConfigTest.java @@ -28,7 +28,6 @@ import java.util.Set; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @RunWith(MockitoJUnitRunner.class) @@ -43,30 +42,6 @@ public void init() { clientConfig = createClientConfig(); } - @Test - public void assertClientConfig() { - assertEquals("unitName", clientConfig.getUnitName()); - assertEquals("127.0.0.1", clientConfig.getClientIP()); - assertEquals(1, clientConfig.getClientCallbackExecutorThreads()); - assertEquals(1000 * 30, clientConfig.getPollNameServerInterval()); - assertEquals(1000 * 30, clientConfig.getHeartbeatBrokerInterval()); - assertEquals(1000 * 5, clientConfig.getPersistConsumerOffsetInterval()); - assertEquals(1000, clientConfig.getPullTimeDelayMillsWhenException()); - assertEquals("{}", clientConfig.getSocksProxyConfig()); - assertEquals(LanguageCode.JAVA, clientConfig.getLanguage()); - assertEquals(AccessChannel.LOCAL, clientConfig.getAccessChannel()); - assertEquals(1000 * 3, clientConfig.getMqClientApiTimeout()); - assertEquals(200, clientConfig.getDetectTimeout()); - assertEquals(1000 * 2, clientConfig.getDetectInterval()); - assertTrue(clientConfig.isUnitMode()); - assertTrue(clientConfig.isDecodeReadBody()); - assertTrue(clientConfig.isDecodeDecompressBody()); - assertTrue(clientConfig.isEnableStreamRequestType()); - assertTrue(clientConfig.isSendLatencyEnable()); - assertTrue(clientConfig.isEnableHeartbeatChannelEventListener()); - assertFalse(clientConfig.isUseHeartbeatV2()); - } - @Test public void testWithNamespace() { Set resources = clientConfig.withNamespace(Collections.singleton(resource));