From afe3bd62cab4f446d10e5e0776a2f8197aa466b5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 30 Mar 2017 12:27:15 -0600 Subject: [PATCH] Ignore AdhocTestSuite except if env var is set. For running in an IDE set GATEWAY_ADHOC_ENABLED=true in the test runner. --- .../cloud/gateway/test/AdhocTestSuite.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java index 95c656bb..955bfc01 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java @@ -17,10 +17,13 @@ package org.springframework.cloud.gateway.test; -import org.junit.Ignore; +import org.junit.ClassRule; +import org.junit.rules.TestRule; +import org.junit.runner.Description; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; +import org.junit.runners.model.Statement; import org.springframework.cloud.gateway.filter.factory.AddRequestHeaderWebFilterFactoryTests; import org.springframework.cloud.gateway.filter.factory.AddRequestParameterWebFilterFactoryTests; import org.springframework.cloud.gateway.filter.factory.HystrixWebFilterFactoryTests; @@ -41,10 +44,14 @@ import org.springframework.cloud.gateway.handler.predicate.HostRoutePredicateFac import org.springframework.cloud.gateway.handler.predicate.MethodRoutePredicateFactoryTests; import org.springframework.cloud.gateway.handler.predicate.PathRoutePredicateFactoryTests; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assume.assumeThat; + /** + * To run this suite in an IDE, set env var GATEWAY_ADHOC_ENABLED=true in test runner. * @author Spencer Gibb */ -@Ignore @RunWith(Suite.class) @SuiteClasses({GatewayIntegrationTests.class, FormIntegrationTests.class, @@ -72,4 +79,19 @@ import org.springframework.cloud.gateway.handler.predicate.PathRoutePredicateFac PathRoutePredicateFactoryTests.class, }) public class AdhocTestSuite { + + @ClassRule + public static AdhocEnabled adhocEnabled = new AdhocEnabled(); + + static class AdhocEnabled implements TestRule { + + @Override + public Statement apply(Statement base, Description description) { + assumeThat("Adhoc Tests ignored", + System.getenv("GATEWAY_ADHOC_ENABLED"), + is(equalTo("true"))); + + return base; + } + } }