From 2574c2217b3ea84b1bd64b03ce8220b32109e16d Mon Sep 17 00:00:00 2001 From: LiuJunJie Date: Thu, 5 Dec 2019 14:10:11 +0800 Subject: [PATCH] reformate code --- ...cosRibbonClientPropertyOverrideTests.java} | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) rename spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/{NacosRibbonClientPropertyOverrideNIWSserverTests.java => NacosRibbonClientPropertyOverrideTests.java} (52%) diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideNIWSserverTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideTests.java similarity index 52% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideNIWSserverTests.java rename to spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideTests.java index 425c7695b..76c5aeadd 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideNIWSserverTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideTests.java @@ -32,7 +32,6 @@ import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration; import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @@ -40,41 +39,45 @@ import org.springframework.test.context.junit4.SpringRunner; * @author liujunjie */ @RunWith(SpringRunner.class) -@SpringBootTest(classes = NacosRibbonClientPropertyOverrideNIWSserverTests.TestConfiguration.class, - properties = {"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848", - "spring.cloud.nacos.discovery.port=18080", - "spring.cloud.nacos.discovery.service=remoteApp", - "localApp.ribbon.NIWSServerListClassName=com.netflix.loadbalancer.ConfigurationBasedServerList", - "localApp.ribbon.listOfServers=127.0.0.1:19090", - "localApp.ribbon.ServerListRefreshInterval=15000"}) -@DirtiesContext -public class NacosRibbonClientPropertyOverrideNIWSserverTests { +@SpringBootTest(classes = + NacosRibbonClientPropertyOverrideTests.TestConfiguration.class, + properties = {"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848", + "spring.cloud.nacos.discovery.port=18080", + "spring.cloud.nacos.discovery.service=remoteApp", + "localApp.ribbon.NIWSServerListClassName=" + + "com.netflix.loadbalancer.ConfigurationBasedServerList", + "localApp.ribbon.listOfServers=127.0.0.1:19090", + "localApp.ribbon.ServerListRefreshInterval=15000"}) +public class NacosRibbonClientPropertyOverrideTests { - @Autowired - private SpringClientFactory factory; + @Autowired + private SpringClientFactory factory; - @Test - public void serverListOverridesToTest() { - ConfigurationBasedServerList.class - .cast(getLoadBalancer("localApp").getServerListImpl()); - } - @Test - public void serverListRemoteTest(){ - NacosServerList.class - .cast(getLoadBalancer("remoteApp").getServerListImpl()); - } + @Test + public void serverListOverridesToTest() { + ConfigurationBasedServerList.class + .cast(getLoadBalancer("localApp").getServerListImpl()); + } - @SuppressWarnings("unchecked") - private ZoneAwareLoadBalancer getLoadBalancer(String name) { - return (ZoneAwareLoadBalancer) this.factory.getLoadBalancer(name); - } + @Test + public void serverListRemoteTest() { + NacosServerList.class + .cast(getLoadBalancer("remoteApp").getServerListImpl()); + } - @Configuration - @RibbonClients - @EnableAutoConfiguration - @ImportAutoConfiguration({UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, - ArchaiusAutoConfiguration.class, RibbonNacosAutoConfiguration.class, NacosDiscoveryClientConfiguration.class}) - protected static class TestConfiguration { - } + @SuppressWarnings("unchecked") + private ZoneAwareLoadBalancer getLoadBalancer(String name) { + return (ZoneAwareLoadBalancer) this.factory.getLoadBalancer(name); + } + + @Configuration + @RibbonClients + @EnableAutoConfiguration + @ImportAutoConfiguration({UtilAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, + ArchaiusAutoConfiguration.class, RibbonNacosAutoConfiguration.class, + NacosDiscoveryClientConfiguration.class}) + protected static class TestConfiguration { + + } }