From 70b0c063492bfd91869f05e03fded9a6541c64e7 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 27 Oct 2017 17:13:32 -0400 Subject: [PATCH] Fix zuul tests --- .../netflix/zuul/FiltersEndpointTests.java | 2 + .../netflix/zuul/test/AdhocZuulTestSuite.java | 91 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/AdhocZuulTestSuite.java diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FiltersEndpointTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FiltersEndpointTests.java index a4a4d831..7751f236 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FiltersEndpointTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/FiltersEndpointTests.java @@ -26,6 +26,7 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.netflix.zuul.ZuulFilter; @@ -39,6 +40,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = RANDOM_PORT) +@DirtiesContext public class FiltersEndpointTests { @Autowired diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/AdhocZuulTestSuite.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/AdhocZuulTestSuite.java new file mode 100644 index 00000000..76a38093 --- /dev/null +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/AdhocZuulTestSuite.java @@ -0,0 +1,91 @@ +/* + * Copyright 2013-2017 the original author or authors. + * + * Licensed 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.springframework.cloud.netflix.zuul.test; + +import org.junit.Ignore; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +/** + * A test suite for probing weird ordering problems in the tests. + * + * @author Dave Syer + */ +@RunWith(Suite.class) +@SuiteClasses({ +org.springframework.cloud.netflix.zuul.ContextPathZuulProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.filters.CompositeRouteLocatorTests.class, + org.springframework.cloud.netflix.zuul.filters.CustomHostRoutingFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.discovery.DiscoveryClientRouteLocatorTests.class, + org.springframework.cloud.netflix.zuul.filters.discovery.PatternServiceRouteMapperIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.discovery.PatternServiceRouteMapperTests.class, + org.springframework.cloud.netflix.zuul.filters.post.LocationRewriteFilterIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.post.LocationRewriteFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilterIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.post.SendErrorFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.post.SendResponseFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.pre.FormBodyWrapperFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.pre.PreDecorationFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelperTests.class, + org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommandFactoryTest.class, + org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommandFallbackTests.class, + org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommandIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonRetryIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.EagerLoadOfZuulConfigurationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.LazyLoadOfZuulConfigurationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommandFactoryTest.class, + org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommandFallbackTests.class, + org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommandIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonRetryIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.restclient.RestClientRibbonCommandFallbackTests.class, + org.springframework.cloud.netflix.zuul.filters.route.restclient.RestClientRibbonCommandIntegrationTests.class, + org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommandTests.class, + org.springframework.cloud.netflix.zuul.filters.route.RibbonRoutingFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.route.SendForwardFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.route.SimpleHostRoutingFilterTests.class, + org.springframework.cloud.netflix.zuul.filters.route.support.RibbonCommandCauseFallbackPropagationTest.class, + org.springframework.cloud.netflix.zuul.filters.route.support.RibbonCommandHystrixThreadPoolKeyTests.class, + org.springframework.cloud.netflix.zuul.filters.SimpleRouteLocatorTests.class, + org.springframework.cloud.netflix.zuul.filters.ZuulPropertiesTests.class, + org.springframework.cloud.netflix.zuul.FiltersEndpointTests.class, + org.springframework.cloud.netflix.zuul.FormZuulProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.FormZuulServletProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.metrics.DefaultCounterFactoryTests.class, + org.springframework.cloud.netflix.zuul.metrics.ZuulEmptyMetricsApplicationTests.class, + org.springframework.cloud.netflix.zuul.metrics.ZuulMetricsApplicationTests.class, + org.springframework.cloud.netflix.zuul.RetryableZuulProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.RoutesEndpointDetailsTests.class, + org.springframework.cloud.netflix.zuul.RoutesEndpointIntegrationTests.class, + org.springframework.cloud.netflix.zuul.RoutesEndpointTests.class, + org.springframework.cloud.netflix.zuul.ServletPathZuulProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.SimpleZuulProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.SimpleZuulServerApplicationTests.class, + org.springframework.cloud.netflix.zuul.test.ZuulApacheHttpClientConfigurationTests.class, + org.springframework.cloud.netflix.zuul.test.ZuulOkHttpClientConfigurationTests.class, + org.springframework.cloud.netflix.zuul.web.ZuulHandlerMappingTests.class, + org.springframework.cloud.netflix.zuul.ZuulFilterInitializerTests.class, + org.springframework.cloud.netflix.zuul.ZuulProxyApplicationTests.class, + org.springframework.cloud.netflix.zuul.ZuulProxyAutoConfigurationTests.class, + org.springframework.cloud.netflix.zuul.ZuulProxyConfigurationTests.class, + org.springframework.cloud.netflix.zuul.ZuulServerAutoConfigurationTests.class, +}) +@Ignore +public class AdhocZuulTestSuite { + +}