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 c91840a CAMEL-16400: adjust manual integration tests for camel-beanstalk (#5405) c91840a is described below commit c91840a01352c663ff5338c45e096d256085331c Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Fri Apr 16 18:11:11 2021 +0200 CAMEL-16400: adjust manual integration tests for camel-beanstalk (#5405) --- components/camel-beanstalk/pom.xml | 25 +++++++--------------- ...stSupport.java => BeanstalkCamelITSupport.java} | 5 +++-- ...ionTest.java => BuryProducerIntegrationIT.java} | 5 ++++- ...grationTest.java => ConsumerIntegrationIT.java} | 5 ++++- ...nTest.java => DeleteProducerIntegrationIT.java} | 5 ++++- ...tionTest.java => PutProducerIntegrationIT.java} | 5 ++++- ...Test.java => ReleaseProducerIntegrationIT.java} | 5 ++++- ...onTest.java => TouchProducerIntegrationIT.java} | 5 ++++- 8 files changed, 35 insertions(+), 25 deletions(-) diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml index 40745ff..94b238c 100644 --- a/components/camel-beanstalk/pom.xml +++ b/components/camel-beanstalk/pom.xml @@ -70,21 +70,12 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>integration</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes /> - </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-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelITSupport.java similarity index 88% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelITSupport.java index 1e4deb4..cad374b 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelTestSupport.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BeanstalkCamelITSupport.java @@ -22,7 +22,7 @@ import org.apache.camel.component.beanstalk.ConnectionSettingsFactory; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.BeforeEach; -public abstract class BeanstalkCamelTestSupport extends CamelTestSupport { +public abstract class BeanstalkCamelITSupport extends CamelTestSupport { protected final ConnectionSettingsFactory connFactory = ConnectionSettingsFactory.DEFAULT; protected final String tubeName = String.format("test%d", System.currentTimeMillis()); protected Client reader; @@ -33,7 +33,8 @@ public abstract class BeanstalkCamelTestSupport extends CamelTestSupport { public void setUp() throws Exception { super.setUp(); - ConnectionSettings conn = connFactory.parseUri(tubeName); + String host = System.getProperty("beanstalk.host"); + ConnectionSettings conn = connFactory.parseUri(host + "/" + tubeName); writer = conn.newWritingClient(); reader = conn.newReadingClient(false); } diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationIT.java similarity index 92% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationIT.java index 55f1796..82e226f 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/BuryProducerIntegrationIT.java @@ -28,6 +28,7 @@ import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -35,7 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -public class BuryProducerIntegrationTest extends BeanstalkCamelTestSupport { +@EnabledIfSystemProperty(named = "beanstalk.host", matches = ".*", + disabledReason = "Requires a beanstalk server running") +public class BuryProducerIntegrationIT extends BeanstalkCamelITSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationIT.java similarity index 90% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationIT.java index 6d48fab..1ddc54c 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ConsumerIntegrationIT.java @@ -25,8 +25,11 @@ import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.beanstalk.Helper; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; -public class ConsumerIntegrationTest extends BeanstalkCamelTestSupport { +@EnabledIfSystemProperty(named = "beanstalk.host", matches = ".*", + disabledReason = "Requires a beanstalk server running") +public class ConsumerIntegrationIT extends BeanstalkCamelITSupport { final String testMessage = "Hello, world!"; @EndpointInject("mock:result") diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationIT.java similarity index 91% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationIT.java index 55299dd..f5e942d 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/DeleteProducerIntegrationIT.java @@ -27,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -34,7 +35,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -public class DeleteProducerIntegrationTest extends BeanstalkCamelTestSupport { +@EnabledIfSystemProperty(named = "beanstalk.host", matches = ".*", + disabledReason = "Requires a beanstalk server running") +public class DeleteProducerIntegrationIT extends BeanstalkCamelITSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationIT.java similarity index 93% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationIT.java index 4700d72..8e4ae76 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/PutProducerIntegrationIT.java @@ -30,12 +30,15 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -public class PutProducerIntegrationTest extends BeanstalkCamelTestSupport { +@EnabledIfSystemProperty(named = "beanstalk.host", matches = ".*", + disabledReason = "Requires a beanstalk server running") +public class PutProducerIntegrationIT extends BeanstalkCamelITSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationIT.java similarity index 91% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationIT.java index baeee64..c0ac744 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/ReleaseProducerIntegrationIT.java @@ -28,6 +28,7 @@ import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -35,7 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -public class ReleaseProducerIntegrationTest extends BeanstalkCamelTestSupport { +@EnabledIfSystemProperty(named = "beanstalk.host", matches = ".*", + disabledReason = "Requires a beanstalk server running") +public class ReleaseProducerIntegrationIT extends BeanstalkCamelITSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationIT.java similarity index 92% rename from components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java rename to components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationIT.java index e3b1328..611db58 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/integration/TouchProducerIntegrationIT.java @@ -28,6 +28,7 @@ import org.apache.camel.component.beanstalk.Headers; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -35,7 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -public class TouchProducerIntegrationTest extends BeanstalkCamelTestSupport { +@EnabledIfSystemProperty(named = "beanstalk.host", matches = ".*", + disabledReason = "Requires a beanstalk server running") +public class TouchProducerIntegrationIT extends BeanstalkCamelITSupport { @EndpointInject("mock:result") protected MockEndpoint resultEndpoint;