You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/04/19 14:52:26 UTC
[camel] branch master updated: CAMEL-16400: adjust manual
integration tests for camel-zipkin (#5432)
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 ee82eb6 CAMEL-16400: adjust manual integration tests for camel-zipkin (#5432)
ee82eb6 is described below
commit ee82eb6b9dbbd9ee28f95a8ba2bc5de0fd008a20
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Mon Apr 19 16:50:54 2021 +0200
CAMEL-16400: adjust manual integration tests for camel-zipkin (#5432)
---
components/camel-zipkin/pom.xml | 27 ++++------------------
...ribe.java => ZipkinABCRouteScribeManualIT.java} | 5 +++-
...java => ZipkinAutoConfigureScribeManualIT.java} | 5 +++-
...ava => ZipkinMulticastRouteScribeManualIT.java} | 5 +++-
...a => ZipkinOneRouteFallbackScribeManualIT.java} | 5 +++-
...ribe.java => ZipkinOneRouteScribeManualIT.java} | 5 +++-
...e.java => ZipkinSimpleRouteScribeManualIT.java} | 5 +++-
...be.java => ZipkinTimerRouteScribeManualIT.java} | 5 +++-
...ribe.java => ZipkinTwoRouteScribeManualIT.java} | 5 +++-
9 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 749c1da..4f43c42 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -113,30 +113,13 @@
</environmentVariables>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>scribe-test</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
- <includes>
- <include>**/*Scribe.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribeManualIT.java
similarity index 86%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribeManualIT.java
index 9a96478..5308aa5 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinABCRouteScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinABCRouteTest;
import org.apache.camel.zipkin.ZipkinTracer;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinABCRouteScribe extends ZipkinABCRouteTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinABCRouteScribeManualIT extends ZipkinABCRouteTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribeManualIT.java
similarity index 90%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribeManualIT.java
index 300c246..23ea748 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinAutoConfigureScribeManualIT.java
@@ -22,6 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.zipkin.ZipkinTracer;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
/**
* Integration test requires running Zipkin/Scribe running
@@ -46,7 +47,9 @@ import org.junit.jupiter.api.Test;
* }
* </pre>
*/
-public class ZipkinAutoConfigureScribe extends CamelTestSupport {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinAutoConfigureScribeManualIT extends CamelTestSupport {
private ZipkinTracer zipkin;
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinMulticastRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinMulticastRouteScribeManualIT.java
similarity index 86%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinMulticastRouteScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinMulticastRouteScribeManualIT.java
index 8247a88..7f01fe7 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinMulticastRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinMulticastRouteScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinMulticastRouteTest;
import org.apache.camel.zipkin.ZipkinTracer;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinMulticastRouteScribe extends ZipkinMulticastRouteTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinMulticastRouteScribeManualIT extends ZipkinMulticastRouteTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribeManualIT.java
similarity index 85%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribeManualIT.java
index b173d75..a0dc3f7 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteFallbackScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinOneRouteFallbackTest;
import org.apache.camel.zipkin.ZipkinTracer;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinOneRouteFallbackScribe extends ZipkinOneRouteFallbackTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinOneRouteFallbackScribeManualIT extends ZipkinOneRouteFallbackTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribeManualIT.java
similarity index 86%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribeManualIT.java
index b929dde..1119c6f 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinOneRouteScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinOneRouteTest;
import org.apache.camel.zipkin.ZipkinTracer;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinOneRouteScribe extends ZipkinOneRouteTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinOneRouteScribeManualIT extends ZipkinOneRouteTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribeManualIT.java
similarity index 86%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribeManualIT.java
index 8adab9d..d7b3238 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinSimpleRouteScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinSimpleRouteTest;
import org.apache.camel.zipkin.ZipkinTracer;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinSimpleRouteScribe extends ZipkinSimpleRouteTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinSimpleRouteScribeManualIT extends ZipkinSimpleRouteTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribeManualIT.java
similarity index 86%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribeManualIT.java
index e50d661..62154c9 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTimerRouteScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinTimerRouteTest;
import org.apache.camel.zipkin.ZipkinTracer;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinTimerRouteScribe extends ZipkinTimerRouteTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinTimerRouteScribeManualIT extends ZipkinTimerRouteTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));
diff --git a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribeManualIT.java
similarity index 86%
rename from components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
rename to components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribeManualIT.java
index 53b943e..595d823 100644
--- a/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribe.java
+++ b/components/camel-zipkin/src/test/java/org/apache/camel/zipkin/scribe/ZipkinTwoRouteScribeManualIT.java
@@ -18,6 +18,7 @@ package org.apache.camel.zipkin.scribe;
import org.apache.camel.zipkin.ZipkinTracer;
import org.apache.camel.zipkin.ZipkinTwoRouteTest;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.libthrift.LibthriftSender;
@@ -43,7 +44,9 @@ import zipkin2.reporter.libthrift.LibthriftSender;
* <p>
* Note: the scribe transport is deprecated. Most use out-of-box defaults, such as Http, RabbitMQ or Kafka.
*/
-public class ZipkinTwoRouteScribe extends ZipkinTwoRouteTest {
+@EnabledIfSystemProperty(named = "enable.zipkin.scribe.itests", matches = "true",
+ disabledReason = "Requires Zipkin/scribe running")
+public class ZipkinTwoRouteScribeManualIT extends ZipkinTwoRouteTest {
@Override
protected void setSpanReporter(ZipkinTracer zipkin) {
zipkin.setSpanReporter(AsyncReporter.create(LibthriftSender.create("127.0.0.1")));