This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 4eb5567 CAMEL-16400: split unit and integration tests for camel-infinispan (#5351) 4eb5567 is described below commit 4eb5567fa59a03f3e9a997e155a80e6a82d9ab45 Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Tue Apr 13 19:16:36 2021 +0200 CAMEL-16400: split unit and integration tests for camel-infinispan (#5351) --- .../camel-infinispan/camel-infinispan/pom.xml | 95 ++++------------------ ...> InfinispanRemoteAggregationRepositoryIT.java} | 2 +- ...anRemoteAggregationRepositoryOperationsIT.java} | 2 +- ...t.java => InfinispanRemoteConfigurationIT.java} | 2 +- ...erTest.java => InfinispanRemoteConsumerIT.java} | 2 +- ....java => InfinispanRemoteCustomListenerIT.java} | 4 +- ...=> InfinispanRemoteIdempotentRepositoryIT.java} | 2 +- ...erTest.java => InfinispanRemoteProducerIT.java} | 2 +- ...t.java => InfinispanRemoteQueryConsumerIT.java} | 3 +- ...t.java => InfinispanRemoteQueryProducerIT.java} | 2 +- ...va => AbstractInfinispanRemoteClusteredIT.java} | 2 +- ...t.java => InfinispanRemoteClusteredViewIT.java} | 2 +- ...finispanRemoteIdempotentRepositoryCamelIT.java} | 2 +- ...inispanRemoteIdempotentRepositorySpringIT.java} | 2 +- 14 files changed, 28 insertions(+), 96 deletions(-) diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml index 0e67b43..a798b11 100644 --- a/components/camel-infinispan/camel-infinispan/pom.xml +++ b/components/camel-infinispan/camel-infinispan/pom.xml @@ -150,87 +150,20 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - </dependencies> - <profiles> - <profile> - <id>infinispan-skip-tests</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- activate test if the docker socket file is accessible --> - <profile> - <id>infinispan-tests-docker-file</id> - <activation> - <file> - <exists>/var/run/docker.sock</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <skipTests>${skipTests}</skipTests> - <systemPropertyVariables> - <visibleassertions.silence>true</visibleassertions.silence> - </systemPropertyVariables> - <systemProperties> - <property> - <name>infinispan.test.jgroups.protocol</name> - <value>tcp</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- activate test if the DOCKER_HOST env var is set --> - <profile> - <id>infinispan-tests-docker-env</id> - <activation> - <property> - <name>env.DOCKER_HOST</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <skipTests>${skipTests}</skipTests> - <systemPropertyVariables> - <visibleassertions.silence>true</visibleassertions.silence> - </systemPropertyVariables> - <systemProperties> - <property> - <name>infinispan.test.jgroups.protocol</name> - <value>tcp</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <visibleassertions.silence>true</visibleassertions.silence> + <infinispan.test.jgroups.protocol>tcp</infinispan.test.jgroups.protocol> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java similarity index 97% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java index 5ac1c2e..d7ed20a 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryIT.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteAggregationRepositoryTest extends InfinispanRemoteTestSupport { +public class InfinispanRemoteAggregationRepositoryIT extends InfinispanRemoteTestSupport { public static final int COMPLETION_SIZE = 4; public static final String CORRELATOR_HEADER = "CORRELATOR_HEADER"; diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java similarity index 98% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java index f6248fd..d4d871d 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepositoryOperationsIT.java @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteAggregationRepositoryOperationsTest extends InfinispanRemoteTestSupport { +public class InfinispanRemoteAggregationRepositoryOperationsIT extends InfinispanRemoteTestSupport { private InfinispanRemoteAggregationRepository aggregationRepository; @Override diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java similarity index 98% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java index 36ebe4a..697afa7 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteConfigurationTest { +public class InfinispanRemoteConfigurationIT { @RegisterExtension static InfinispanService service = InfinispanServiceFactory.createService(); diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java similarity index 95% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java index 2e81f2f..1a6aabe 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConsumerIT.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteConsumerTest extends InfinispanRemoteTestSupport implements InfinispanConsumerTestSupport { +public class InfinispanRemoteConsumerIT extends InfinispanRemoteTestSupport implements InfinispanConsumerTestSupport { @Test public void consumerReceivedEventNotifications() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java similarity index 94% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java index a1855f9..9637fc3 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteCustomListenerIT.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteCustomListenerTest extends InfinispanRemoteTestSupport implements InfinispanConsumerTestSupport { +public class InfinispanRemoteCustomListenerIT extends InfinispanRemoteTestSupport implements InfinispanConsumerTestSupport { @Test public void consumerReceivedEventNotifications() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -82,7 +82,7 @@ public class InfinispanRemoteCustomListenerTest extends InfinispanRemoteTestSupp @BindToRegistry public InfinispanRemoteCustomListener myCustomListener() { - return new InfinispanRemoteCustomListenerTest.MyRemoteCustomListener(); + return new InfinispanRemoteCustomListenerIT.MyRemoteCustomListener(); } @ClientListener diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java similarity index 96% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java index 15e393e..825fc21 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteIdempotentRepositoryIT.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteIdempotentRepositoryTest extends InfinispanRemoteTestSupport +public class InfinispanRemoteIdempotentRepositoryIT extends InfinispanRemoteTestSupport implements InfinispanIdempotentRepositoryTestSupport { private Supplier<IdempotentRepository> repo = Suppliers.memorize(() -> { diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java similarity index 97% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java index 010072d..b318ac5 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteProducerIT.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteProducerTest extends InfinispanRemoteTestSupport implements InfinispanProducerTestSupport { +public class InfinispanRemoteProducerIT extends InfinispanRemoteTestSupport implements InfinispanProducerTestSupport { @BindToRegistry("mappingFunction") public static BiFunction<String, String, String> mappingFunction() { diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java similarity index 98% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java index 5f3ed9e..e15ae56 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryConsumerIT.java @@ -42,8 +42,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteQueryConsumerTest extends InfinispanRemoteQueryTestSupport { - +public class InfinispanRemoteQueryConsumerIT extends InfinispanRemoteQueryTestSupport { @BindToRegistry("continuousQueryBuilder") public static final InfinispanQueryBuilder CONTINUOUS_QUERY_BUILDER = qf -> qf.from(User.class).having("name").like("CQ%").build(); diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java similarity index 98% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java index 89c8e3f..1f5d609 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteQueryProducerIT.java @@ -49,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteQueryProducerTest extends InfinispanRemoteQueryTestSupport { +public class InfinispanRemoteQueryProducerIT extends InfinispanRemoteQueryTestSupport { @BindToRegistry("noResultQueryBuilder") public static final InfinispanQueryBuilder NO_RESULT_QUERY_BUILDER diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java similarity index 99% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java index 2851003..c0f5878 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/AbstractInfinispanRemoteClusteredIT.java @@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.fail; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @DisabledOnOs(OS.MAC) -public class AbstractInfinispanRemoteClusteredTest { +public class AbstractInfinispanRemoteClusteredIT { @RegisterExtension public static InfinispanService service = InfinispanServiceFactory.createService(); diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredViewTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredViewIT.java similarity index 98% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredViewTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredViewIT.java index fb214e4..df32a57 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredViewTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredViewIT.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @DisabledOnOs(OS.MAC) -public class InfinispanRemoteClusteredViewTest { +public class InfinispanRemoteClusteredViewIT { @RegisterExtension public static InfinispanService service = InfinispanServiceFactory.createService(); diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryCamelTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryCamelIT.java similarity index 95% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryCamelTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryCamelIT.java index d47a550..7269528 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryCamelTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositoryCamelIT.java @@ -21,7 +21,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.test.annotation.DirtiesContext; @DirtiesContext -public class SpringInfinispanRemoteIdempotentRepositoryCamelTest +public class SpringInfinispanRemoteIdempotentRepositoryCamelIT extends SpringInfinispanRemoteIdempotentRepositoryTestSupport { @Override diff --git a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositorySpringTest.java b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositorySpringIT.java similarity index 95% rename from components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositorySpringTest.java rename to components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositorySpringIT.java index 4726f42..96c02ee 100644 --- a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositorySpringTest.java +++ b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/spring/SpringInfinispanRemoteIdempotentRepositorySpringIT.java @@ -21,7 +21,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.test.annotation.DirtiesContext; @DirtiesContext -public class SpringInfinispanRemoteIdempotentRepositorySpringTest +public class SpringInfinispanRemoteIdempotentRepositorySpringIT extends SpringInfinispanRemoteIdempotentRepositoryTestSupport { @Override