From d6d2e37b4805e9e8f7255b768481d4f398300c5a Mon Sep 17 00:00:00 2001 From: David Turanski Date: Mon, 22 Feb 2021 14:00:20 -0500 Subject: [PATCH] Tag integration tests and enable integration profile --- .../cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java | 3 +++ .../elasticsearch/ElasticsearchConsumerApplicationTests.java | 2 ++ .../cloud/fn/consumer/geode/GeodeConsumerApplicationTests.java | 2 ++ .../cloud/fn/consumer/mqtt/MqttConsumerTests.java | 2 ++ .../cloud/fn/consumer/redis/AbstractRedisConsumerTests.java | 3 +++ pom.xml | 3 ++- .../cloud/fn/supplier/geode/GeodeSupplierApplicationTests.java | 2 ++ .../cloud/fn/supplier/mqtt/MqttSupplierTests.java | 2 ++ 8 files changed, 18 insertions(+), 1 deletion(-) diff --git a/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java b/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java index f3db2d13..a19946bd 100644 --- a/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java +++ b/common/cdc-debezium-boot-starter/src/test/java/org/springframework/cloud/fn/common/cdc/CdcBootStarterIntegrationTest.java @@ -20,6 +20,7 @@ import java.time.Duration; import com.zaxxer.hikari.HikariDataSource; 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; @@ -38,6 +39,8 @@ import static org.awaitility.Awaitility.await; * @author David Turanski * @author Artem Bilan */ + +@Tag("integration") @Testcontainers public class CdcBootStarterIntegrationTest { diff --git a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java b/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java index f415345c..cf35120b 100644 --- a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java +++ b/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java @@ -30,6 +30,7 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.elasticsearch.ElasticsearchContainer; import org.testcontainers.junit.jupiter.Container; @@ -43,6 +44,7 @@ import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; +@Tag("integration") @Testcontainers(disabledWithoutDocker = true) public class ElasticsearchConsumerApplicationTests { diff --git a/consumer/geode-consumer/src/test/java/org/springframework/cloud/fn/consumer/geode/GeodeConsumerApplicationTests.java b/consumer/geode-consumer/src/test/java/org/springframework/cloud/fn/consumer/geode/GeodeConsumerApplicationTests.java index 890657bd..59f0b8a1 100644 --- a/consumer/geode-consumer/src/test/java/org/springframework/cloud/fn/consumer/geode/GeodeConsumerApplicationTests.java +++ b/consumer/geode-consumer/src/test/java/org/springframework/cloud/fn/consumer/geode/GeodeConsumerApplicationTests.java @@ -25,6 +25,7 @@ import lombok.NoArgsConstructor; import org.apache.geode.cache.Region; import org.apache.geode.pdx.PdxInstance; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -36,6 +37,7 @@ import org.springframework.messaging.support.GenericMessage; import static org.assertj.core.api.Assertions.assertThat; +@Tag("integration") public class GeodeConsumerApplicationTests { private static ApplicationContextRunner applicationContextRunner; diff --git a/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java b/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java index 694460ce..414f30d7 100644 --- a/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java +++ b/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.fn.consumer.mqtt; import java.util.function.Consumer; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; @@ -39,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(properties = "mqtt.consumer.topic=test") @DirtiesContext +@Tag("integration") public class MqttConsumerTests { static { diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java b/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java index a49439e2..d742afc9 100644 --- a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java +++ b/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java @@ -18,6 +18,8 @@ package org.springframework.cloud.fn.consumer.redis; import java.util.function.Consumer; +import org.junit.jupiter.api.Tag; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -31,6 +33,7 @@ import org.springframework.test.annotation.DirtiesContext; */ @SpringBootTest @DirtiesContext +@Tag("integration") public class AbstractRedisConsumerTests { @Autowired diff --git a/pom.xml b/pom.xml index f74d6457..9bc3ea09 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.cloud.fn diff --git a/supplier/geode-supplier/src/test/java/org/springframework/cloud/fn/supplier/geode/GeodeSupplierApplicationTests.java b/supplier/geode-supplier/src/test/java/org/springframework/cloud/fn/supplier/geode/GeodeSupplierApplicationTests.java index e898a455..0178cd2d 100644 --- a/supplier/geode-supplier/src/test/java/org/springframework/cloud/fn/supplier/geode/GeodeSupplierApplicationTests.java +++ b/supplier/geode-supplier/src/test/java/org/springframework/cloud/fn/supplier/geode/GeodeSupplierApplicationTests.java @@ -28,6 +28,7 @@ import org.apache.geode.cache.EntryEvent; import org.apache.geode.cache.Region; import org.apache.geode.pdx.PdxInstance; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -41,6 +42,7 @@ import org.springframework.cloud.fn.test.support.geode.GeodeContainerIntializer; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; +@Tag("integration") public class GeodeSupplierApplicationTests { private static ApplicationContextRunner applicationContextRunner; diff --git a/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java b/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java index 2cd995c1..4705f644 100644 --- a/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java +++ b/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java @@ -19,6 +19,7 @@ package org.springframework.cloud.fn.supplier.mqtt; import java.util.function.Supplier; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; import reactor.core.publisher.Flux; @@ -49,6 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @SpringBootTest(properties = {"mqtt.supplier.topics=test,fake", "mqtt.supplier.qos=0,0"}) @DirtiesContext +@Tag("integration") public class MqttSupplierTests { static {