From 070e4b5c50187bd6a3e6a895773997c6b1eafeff Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 4 Oct 2017 19:16:30 -0400 Subject: [PATCH] Move to zuul.test package. --- .../netflix/{ => zuul}/test/TestAutoConfiguration.java | 6 +----- .../test/ZuulApacheHttpClientConfigurationTests.java | 3 +-- .../{ => zuul}/test/ZuulOkHttpClientConfigurationTests.java | 2 +- .../src/test/resources/META-INF/spring.factories | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) rename spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/{ => zuul}/test/TestAutoConfiguration.java (85%) rename spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/{ => zuul}/test/ZuulApacheHttpClientConfigurationTests.java (97%) rename spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/{ => zuul}/test/ZuulOkHttpClientConfigurationTests.java (98%) diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java similarity index 85% rename from spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java rename to spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java index a4d783e3..aff4cdb7 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/TestAutoConfiguration.java @@ -14,21 +14,17 @@ * limitations under the License. */ -package org.springframework.cloud.netflix.test; +package org.springframework.cloud.netflix.zuul.test; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; /** * @author Spencer Gibb diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulApacheHttpClientConfigurationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java similarity index 97% rename from spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulApacheHttpClientConfigurationTests.java rename to spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java index 73e2a2e0..c12ef692 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulApacheHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.netflix.test; +package org.springframework.cloud.netflix.zuul.test; import java.io.IOException; import java.lang.reflect.Field; @@ -44,7 +44,6 @@ import org.springframework.cloud.netflix.zuul.filters.route.SimpleHostRoutingFil import org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommand; import org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommandFactory; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.LinkedMultiValueMap; diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulOkHttpClientConfigurationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulOkHttpClientConfigurationTests.java similarity index 98% rename from spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulOkHttpClientConfigurationTests.java rename to spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulOkHttpClientConfigurationTests.java index 8bf6f73b..0f973d50 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulOkHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulOkHttpClientConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.netflix.test; +package org.springframework.cloud.netflix.zuul.test; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/spring-cloud-netflix-zuul/src/test/resources/META-INF/spring.factories b/spring-cloud-netflix-zuul/src/test/resources/META-INF/spring.factories index 60ea354e..9819adfe 100644 --- a/spring-cloud-netflix-zuul/src/test/resources/META-INF/spring.factories +++ b/spring-cloud-netflix-zuul/src/test/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.netflix.test.TestAutoConfiguration +org.springframework.cloud.netflix.zuul.test.TestAutoConfiguration