From 4ff61869c175cdf664c64ddbd3f47be375a4c187 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Tue, 9 Jul 2019 18:08:36 +0800 Subject: [PATCH] #734 -> update pkg name --- .../nacos/NacosConfigurationExtConfigTests.java | 5 +---- .../nacos/NacosConfigurationTests.java | 5 +---- .../{alibaba => cloud}/nacos/NacosFileExtensionTest.java | 4 +--- .../nacos/endpoint/NacosConfigEndpointTests.java | 9 +-------- 4 files changed, 4 insertions(+), 19 deletions(-) rename alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/{alibaba => cloud}/nacos/NacosConfigurationExtConfigTests.java (96%) rename alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/{alibaba => cloud}/nacos/NacosConfigurationTests.java (97%) rename alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/{alibaba => cloud}/nacos/NacosFileExtensionTest.java (95%) rename alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/{alibaba => cloud}/nacos/endpoint/NacosConfigEndpointTests.java (91%) diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationExtConfigTests.java b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java similarity index 96% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationExtConfigTests.java rename to alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java index 34d2ce9d..0aa133ff 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationExtConfigTests.java +++ b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.alibaba.nacos; +package com.alibaba.cloud.nacos; import static org.junit.Assert.assertNotNull; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; @@ -22,9 +22,6 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration; -import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration; -import com.alibaba.cloud.nacos.NacosConfigProperties; import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator; import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; import com.alibaba.nacos.client.config.NacosConfigService; diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationTests.java b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java similarity index 97% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationTests.java rename to alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java index 2d00d564..e0f4e132 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationTests.java +++ b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.alibaba.nacos; +package com.alibaba.cloud.nacos; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -41,9 +41,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringRunner; -import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration; -import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration; -import com.alibaba.cloud.nacos.NacosConfigProperties; import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator; import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpoint; import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosFileExtensionTest.java b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java similarity index 95% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosFileExtensionTest.java rename to alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java index eb7b0cfb..53691e13 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosFileExtensionTest.java +++ b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosFileExtensionTest.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package com.alibaba.alibaba.nacos; +package com.alibaba.cloud.nacos; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration; -import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration; import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; import com.alibaba.nacos.client.config.NacosConfigService; diff --git a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/endpoint/NacosConfigEndpointTests.java b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java similarity index 91% rename from alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/endpoint/NacosConfigEndpointTests.java rename to alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java index 097184b0..37204654 100644 --- a/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/endpoint/NacosConfigEndpointTests.java +++ b/alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java @@ -14,27 +14,21 @@ * limitations under the License. */ -package com.alibaba.alibaba.nacos.endpoint; +package com.alibaba.cloud.nacos.endpoint; import static org.junit.Assert.assertEquals; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration; import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration; import com.alibaba.cloud.nacos.NacosConfigProperties; -import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpoint; -import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration; -import com.alibaba.cloud.nacos.endpoint.NacosConfigHealthIndicator; import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory; import com.alibaba.nacos.client.config.NacosConfigService; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; @@ -44,7 +38,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.health.Health.Builder; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest;