From e7e199dc0cc1ccf30b370334db8e07931d3e9ad3 Mon Sep 17 00:00:00 2001 From: Robert McNees Date: Tue, 16 Nov 2021 13:23:08 -0500 Subject: [PATCH] New profile to skip Docker tests --- pom.xml | 13 +++++++++++++ ...eDefinitionRepositoryEnabledByPropertyTests.java | 2 ++ .../filter/ratelimit/RedisRateLimiterTests.java | 2 ++ .../route/RedisRouteDefinitionRepositoryTests.java | 2 ++ 4 files changed, 19 insertions(+) diff --git a/pom.xml b/pom.xml index 93d4cabc..f1df83c8 100644 --- a/pom.xml +++ b/pom.xml @@ -257,6 +257,19 @@ + + withoutDockerTests + + + + maven-surefire-plugin + + DockerRequired + + + + + diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisRouteDefinitionRepositoryEnabledByPropertyTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisRouteDefinitionRepositoryEnabledByPropertyTests.java index 919e2c27..23cb9e22 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisRouteDefinitionRepositoryEnabledByPropertyTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisRouteDefinitionRepositoryEnabledByPropertyTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.gateway.config; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; @@ -35,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; properties = "spring.cloud.gateway.redis-route-definition-repository.enabled=true") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @Testcontainers +@Tag("DockerRequired") public class GatewayRedisRouteDefinitionRepositoryEnabledByPropertyTests { @Container diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiterTests.java index 96e226c8..cfcee51c 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiterTests.java @@ -20,6 +20,7 @@ import java.util.UUID; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.RetryingTest; import org.testcontainers.containers.GenericContainer; @@ -54,6 +55,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen @SpringBootTest(webEnvironment = RANDOM_PORT) @DirtiesContext @Testcontainers +@Tag("DockerRequired") public class RedisRateLimiterTests extends BaseWebClientTests { @Container diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java index a1b68795..19f66ef9 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java @@ -23,6 +23,7 @@ import java.util.function.Predicate; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; @@ -54,6 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @ActiveProfiles("redis-route-repository") @Testcontainers +@Tag("DockerRequired") public class RedisRouteDefinitionRepositoryTests { @Container