add test for #831

spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigPropertiesServerAddressBothLevelTests.java

@@ -0,0 +1,41 @@
+package com.alibaba.cloud.nacos;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
+
+/**
+ * @author <a href="mailto:lyuzb@lyuzb.com">lyuzb</a>
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NacosConfigPropertiesServerAddressBothLevelTests.TestConfig.class, properties = {
+		"spring.cloud.nacos.config.server-addr=321,321,321,321:8848",
+		"spring.cloud.nacos.server-addr=123.123.123.123:8848"
+		}, webEnvironment = RANDOM_PORT)
+public class NacosConfigPropertiesServerAddressBothLevelTests {
+
+	@Autowired
+	private NacosConfigProperties properties;
+	
+	@Test
+	public void testGetServerAddr() {
+		assertEquals("NacosConfigProperties server address was wrong","321,321,321,321:8848", properties.getServerAddr());
+	}
+	
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ NacosConfigEndpointAutoConfiguration.class,
+			NacosConfigAutoConfiguration.class, NacosConfigBootstrapConfiguration.class })
+	public static class TestConfig {
+	}
+}

spring-cloud-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/NacosConfigPropertiesServerAddressTopLevelTests.java

@@ -0,0 +1,40 @@
+package com.alibaba.cloud.nacos;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
+
+/**
+ * @author <a href="mailto:lyuzb@lyuzb.com">lyuzb</a>
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NacosConfigPropertiesServerAddressTopLevelTests.TestConfig.class, properties = {
+		"spring.cloud.nacos.server-addr=123.123.123.123:8848"
+		}, webEnvironment = RANDOM_PORT)
+public class NacosConfigPropertiesServerAddressTopLevelTests {
+
+	@Autowired
+	private NacosConfigProperties properties;
+	
+	@Test
+	public void testGetServerAddr() {
+		assertEquals("NacosConfigProperties server address was wrong","123.123.123.123:8848", properties.getServerAddr());
+	}
+	
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ NacosConfigEndpointAutoConfiguration.class,
+			NacosConfigAutoConfiguration.class, NacosConfigBootstrapConfiguration.class })
+	public static class TestConfig {
+	}
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryPropertiesServerAddressBothLevelTests.java

@@ -0,0 +1,45 @@
+package com.alibaba.cloud.nacos;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+
+/**
+ * @author <a href="mailto:lyuzb@lyuzb.com">lyuzb</a>
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NacosDiscoveryPropertiesServerAddressBothLevelTests.TestConfig.class, properties = {
+		"spring.cloud.nacos.discovery.server-addr=321.321.321.321:8848",
+		"spring.cloud.nacos.server-addr=123.123.123.123:8848"
+		}, webEnvironment = RANDOM_PORT)
+public class NacosDiscoveryPropertiesServerAddressBothLevelTests {
+
+	@Autowired
+	private NacosDiscoveryProperties properties;
+	
+	@Test
+	public void testGetServerAddr() {
+		assertEquals("NacosDiscoveryProperties server address was wrong","321.321.321.321:8848", properties.getServerAddr());
+	}
+	
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
+			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryAutoConfiguration.class })
+	public static class TestConfig {
+	}
+}

spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryPropertiesServerAddressTopLevelTests.java

@@ -0,0 +1,47 @@
+package com.alibaba.cloud.nacos;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+
+/**
+ * 
+ * @author <a href="mailto:lyuzb@lyuzb.com">lyuzb</a>
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = NacosDiscoveryPropertiesServerAddressTopLevelTests.TestConfig.class, properties = {
+		"spring.cloud.nacos.server-addr=123.123.123.123:8848"
+		}, webEnvironment = RANDOM_PORT)
+
+public class NacosDiscoveryPropertiesServerAddressTopLevelTests {
+
+	@Autowired
+	private NacosDiscoveryProperties properties;
+	
+	@Test
+	public void testGetServerAddr() {
+		assertEquals("NacosDiscoveryProperties server address was wrong","123.123.123.123:8848", properties.getServerAddr());
+	}
+	
+	@Configuration
+	@EnableAutoConfiguration
+	@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
+			NacosDiscoveryClientAutoConfiguration.class,
+			NacosDiscoveryAutoConfiguration.class })
+	public static class TestConfig {
+	}
+}