diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java index 14a4f7e1..ae39b8ac 100644 --- a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java +++ b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java @@ -28,6 +28,7 @@ import org.cassandraunit.utils.EmbeddedCassandraServerHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +43,7 @@ import org.springframework.test.context.TestExecutionListeners; /** * @author Artem Bilan */ +@Disabled @TestExecutionListeners(mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS, listeners = CassandraUnitDependencyInjectionIntegrationTestExecutionListener.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java index 7f7702f1..e5f7441c 100644 --- a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java +++ b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java @@ -21,8 +21,6 @@ import java.util.UUID; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -35,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan */ -@DisabledOnOs(OS.WINDOWS) +@Disabled @TestPropertySource(properties = { "spring.data.cassandra.schema-action=RECREATE", "cassandra.cluster.entity-base-packages=org.springframework.cloud.fn.consumer.cassandra.domain" }) diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java index 5556aaed..c7e66894 100644 --- a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java +++ b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java @@ -19,9 +19,8 @@ package org.springframework.cloud.fn.consumer.cassandra; import java.util.List; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -36,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan */ -@DisabledOnOs(OS.WINDOWS) +@Disabled @TestPropertySource(properties = { "cassandra.cluster.init-script=init-db.cql", "cassandra.ingest-query=" + diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java index 43aee559..e07be37c 100644 --- a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java +++ b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java @@ -19,9 +19,8 @@ package org.springframework.cloud.fn.consumer.cassandra; import java.util.List; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -37,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan */ -@DisabledOnOs(OS.WINDOWS) +@Disabled @TestPropertySource(properties = { "cassandra.cluster.init-script=init-db.cql", "cassandra.ingest-query=" + diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java index 3ff21add..c59928dc 100644 --- a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java +++ b/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java @@ -19,9 +19,8 @@ package org.springframework.cloud.fn.consumer.cassandra; import java.util.List; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -36,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan */ -@DisabledOnOs(OS.WINDOWS) +@Disabled @TestPropertySource(properties = { "cassandra.cluster.init-script=init-db.cql", "cassandra.ingest-query=" +