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 5eea1e7 CAMEL-16400: split unit and integration tests for
camel-google-pubsub (#5340)
5eea1e7 is described below
commit 5eea1e7175dcdb078374cb6be576637968817e28
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Mon Apr 12 18:26:43 2021 +0200
CAMEL-16400: split unit and integration tests for camel-google-pubsub
(#5340)
---
.../camel-google/camel-google-pubsub/pom.xml | 72 +++-------------------
.../{AckModeNoneTest.java => AckModeNoneIT.java} | 2 +-
...owledgementTest.java => AcknowledgementIT.java} | 4 +-
.../{BodyTypesTest.java => BodyTypesIT.java} | 4 +-
...SerializerTest.java => CustomSerializerIT.java} | 2 +-
.../{DeadLetterTest.java => DeadLetterIT.java} | 2 +-
...ipTest.java => GroupedExchangeRoundtripIT.java} | 4 +-
...ageOrderingTest.java => MessageOrderingIT.java} | 2 +-
...ripTest.java => SingleExchangeRoundtripIT.java} | 2 +-
9 files changed, 19 insertions(+), 75 deletions(-)
diff --git a/components/camel-google/camel-google-pubsub/pom.xml
b/components/camel-google/camel-google-pubsub/pom.xml
index 48f6e3e..8c96005 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -95,69 +95,13 @@
</dependencies>
- <profiles>
- <profile>
- <id>google-pubsub-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>google-pubsub-tests-docker-file</id>
- <activation>
- <file>
- <exists>/var/run/docker.sock</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <systemPropertyVariables>
-
<visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the DOCKER_HOST env var is set -->
- <profile>
- <id>google-pubsub-tests-docker-env</id>
- <activation>
- <property>
- <name>env.DOCKER_HOST</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <systemPropertyVariables>
-
<visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneIT.java
similarity index 98%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneIT.java
index 839a968..b70f4a4 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AckModeNoneIT.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
@TestMethodOrder(MethodOrderer.MethodName.class)
-public class AckModeNoneTest extends PubsubTestSupport {
+public class AckModeNoneIT extends PubsubTestSupport {
private static final String TOPIC_NAME = "ackNoneTopic";
private static final String SUBSCRIPTION_NAME = "ackNoneSub";
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
similarity index 97%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
index cde02e3..8a1a172 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/AcknowledgementIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
import org.junit.jupiter.api.Test;
-public class AcknowledgementTest extends PubsubTestSupport {
+public class AcknowledgementIT extends PubsubTestSupport {
private static final String TOPIC_NAME = "failureSingle";
private static final String SUBSCRIPTION_NAME = "failureSub";
@@ -63,7 +63,7 @@ public class AcknowledgementTest extends PubsubTestSupport {
from(pubsubSubscription).routeId("Fail_Receive").autoStartup(true).process(new
Processor() {
@Override
public void process(Exchange exchange) throws Exception {
- if (AcknowledgementTest.fail) {
+ if (AcknowledgementIT.fail) {
Thread.sleep(750);
throw new Exception("fail");
}
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesIT.java
similarity index 98%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesIT.java
index 29fb78a..f2fa1c8 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/BodyTypesIT.java
@@ -42,8 +42,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class BodyTypesTest extends PubsubTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(BodyTypesTest.class);
+public class BodyTypesIT extends PubsubTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(BodyTypesIT.class);
private static final String TOPIC_NAME = "typesSend";
private static final String SUBSCRIPTION_NAME = "TypesReceive";
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/CustomSerializerTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/CustomSerializerIT.java
similarity index 98%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/CustomSerializerTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/CustomSerializerIT.java
index 7772ea3..09cbc85 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/CustomSerializerTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/CustomSerializerIT.java
@@ -30,7 +30,7 @@ import
org.apache.camel.component.google.pubsub.serializer.GooglePubsubSerialize
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-public class CustomSerializerTest extends PubsubTestSupport {
+public class CustomSerializerIT extends PubsubTestSupport {
private static final String TOPIC_NAME = "typesSend";
private static final String SUBSCRIPTION_NAME = "TypesReceive";
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/DeadLetterTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/DeadLetterIT.java
similarity index 99%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/DeadLetterTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/DeadLetterIT.java
index af1e45e..8593254 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/DeadLetterTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/DeadLetterIT.java
@@ -32,7 +32,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
import org.junit.jupiter.api.Test;
-public class DeadLetterTest extends PubsubTestSupport {
+public class DeadLetterIT extends PubsubTestSupport {
private static final String INPUT_TOPIC_NAME = "camel.input-topic";
private static final String INPUT_SUBSCRIPTION_NAME =
"camel.input-topic-subscription";
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripIT.java
similarity index 97%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripIT.java
index 7f7e77e..c9409b8 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/GroupedExchangeRoundtripIT.java
@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class GroupedExchangeRoundtripTest extends PubsubTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(GroupedExchangeRoundtripTest.class);
+public class GroupedExchangeRoundtripIT extends PubsubTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(GroupedExchangeRoundtripIT.class);
private static final String TOPIC_NAME = "groupTopic";
private static final String SUBSCRIPTION_NAME = "groupSubscription";
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/MessageOrderingTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/MessageOrderingIT.java
similarity index 98%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/MessageOrderingTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/MessageOrderingIT.java
index e49509d..3995f4e 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/MessageOrderingTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/MessageOrderingIT.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.google.pubsub.GooglePubsubConstants.ORDERING_KEY;
-class MessageOrderingTest extends PubsubTestSupport {
+class MessageOrderingIT extends PubsubTestSupport {
private static final String TOPIC_NAME = "camel.input-topic";
private static final String SUBSCRIPTION_NAME =
"camel.input-topic-subscription";
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripIT.java
similarity index 98%
rename from
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
rename to
components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripIT.java
index 8658133..33e8e40 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripTest.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundtripIT.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class SingleExchangeRoundtripTest extends PubsubTestSupport {
+public class SingleExchangeRoundtripIT extends PubsubTestSupport {
private static final String TOPIC_NAME = "singleSend";
private static final String SUBSCRIPTION_NAME = "singleReceive";
