This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5968ea01d47353de4e05b1246b6161017a4070f6 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Sat May 20 08:54:46 2023 +0200 (chores) build: remove unused 'it-tests' profile Integration tests are now run via failsafe plugin --- components/camel-irc/pom.xml | 40 ---------------------- ...stSupport.java => IrcIntegrationITSupport.java} | 4 +-- ...lRouteTest.java => IrcMultiChannelRouteIT.java} | 7 ++-- .../it/{IrcOnReplyTest.java => IrcOnReplyIT.java} | 7 ++-- .../it/{IrcPrivmsgTest.java => IrcPrivmsgIT.java} | 7 ++-- .../irc/it/{IrcRouteTest.java => IrcRouteIT.java} | 7 ++-- ...IrcsListUsersTest.java => IrcsListUsersIT.java} | 7 ++-- .../it/{IrcsRouteTest.java => IrcsRouteIT.java} | 6 +++- ...t.java => IrcsWithSslContextParamsRouteIT.java} | 2 +- 9 files changed, 33 insertions(+), 54 deletions(-) diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml index fd2e1116882..0f1a63cf704 100644 --- a/components/camel-irc/pom.xml +++ b/components/camel-irc/pom.xml @@ -31,46 +31,6 @@ <name>Camel :: IRC</name> <description>Camel IRC support</description> - <properties> - </properties> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude> - **/it/** - </exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>it-tests</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration combine.self="override"> - <includes> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - - </profile> - </profiles> - <dependencies> <dependency> diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java similarity index 95% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java index 20fcb1f627f..a42e5c2c1db 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationITSupport.java @@ -27,9 +27,9 @@ import org.junit.jupiter.api.BeforeEach; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class IrcIntegrationTestSupport extends CamelTestSupport { +public class IrcIntegrationITSupport extends CamelTestSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(IrcIntegrationTestSupport.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IrcIntegrationITSupport.class); @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteIT.java similarity index 90% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteIT.java index 539de3fb686..dc950df00ff 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteIT.java @@ -24,12 +24,15 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.irc.IrcConstants; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class IrcMultiChannelRouteTest extends IrcIntegrationTestSupport { +@EnabledIfSystemProperty(named = "enable.irc.itests", matches = ".*", + disabledReason = "Must be enabled manually to avoid flooding an IRC network with test messages") +public class IrcMultiChannelRouteIT extends IrcIntegrationITSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(IrcMultiChannelRouteTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IrcMultiChannelRouteIT.class); protected String body1 = "Message One"; protected String body2 = "Message Two"; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyIT.java similarity index 89% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyIT.java index a75df9f02f5..e7e7fcdd787 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyIT.java @@ -23,12 +23,15 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.irc.IrcConstants; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class IrcOnReplyTest extends IrcIntegrationTestSupport { +@EnabledIfSystemProperty(named = "enable.irc.itests", matches = ".*", + disabledReason = "Must be enabled manually to avoid flooding an IRC network with test messages") +public class IrcOnReplyIT extends IrcIntegrationITSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(IrcOnReplyTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IrcOnReplyIT.class); protected String command = "WHO #camel-test"; protected String resultEnd = "End of /WHO list."; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgIT.java similarity index 90% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgIT.java index 4d74c1c574c..d370e540ce6 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgIT.java @@ -23,12 +23,15 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.irc.IrcConstants; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class IrcPrivmsgTest extends IrcIntegrationTestSupport { +@EnabledIfSystemProperty(named = "enable.irc.itests", matches = ".*", + disabledReason = "Must be enabled manually to avoid flooding an IRC network with test messages") +public class IrcPrivmsgIT extends IrcIntegrationITSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(IrcPrivmsgTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IrcPrivmsgIT.class); protected String expectedBody1 = "Message One"; protected String expectedBody2 = "Message Two"; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteIT.java similarity index 90% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteIT.java index e124ffde138..f8724fafda2 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteIT.java @@ -23,12 +23,15 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.irc.IrcConstants; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class IrcRouteTest extends IrcIntegrationTestSupport { +@EnabledIfSystemProperty(named = "enable.irc.itests", matches = ".*", + disabledReason = "Must be enabled manually to avoid flooding an IRC network with test messages") +public class IrcRouteIT extends IrcIntegrationITSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(IrcRouteTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IrcRouteIT.class); protected String body1 = "Message One"; protected String body2 = "Message Two"; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersIT.java similarity index 88% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersIT.java index cf76373556b..638ddeb439f 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersIT.java @@ -20,6 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.irc.IrcConfiguration; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,9 +30,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * Integration test for the {@link IrcConfiguration#isNamesOnJoin()} option. Joins a channel and asserts that the * username of the current test user is listed for the channel. */ -public class IrcsListUsersTest extends IrcIntegrationTestSupport { +@EnabledIfSystemProperty(named = "enable.irc.itests", matches = ".*", + disabledReason = "Must be enabled manually to avoid flooding an IRC network with test messages") +public class IrcsListUsersIT extends IrcIntegrationITSupport { - private static final Logger LOGGER = LoggerFactory.getLogger(IrcsListUsersTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IrcsListUsersIT.class); /** message code for a reply to a <code>NAMES</code> command. */ private static final String IRC_RPL_NAMREPLY = "353"; diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteIT.java similarity index 78% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteIT.java index 4109756872e..e010eeb8391 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteIT.java @@ -16,7 +16,11 @@ */ package org.apache.camel.component.irc.it; -public class IrcsRouteTest extends IrcRouteTest { +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + +@EnabledIfSystemProperty(named = "enable.irc.itests", matches = ".*", + disabledReason = "Must be enabled manually to avoid flooding an IRC network with test messages") +public class IrcsRouteIT extends IrcRouteIT { @Override protected String sendUri() { diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteIT.java similarity index 97% rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteIT.java index af386ce30f3..9720d6c225b 100644 --- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java +++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteIT.java @@ -23,7 +23,7 @@ import org.apache.camel.support.jsse.TrustManagersParameters; import org.junit.jupiter.api.Disabled; @Disabled -public class IrcsWithSslContextParamsRouteTest extends IrcRouteTest { +public class IrcsWithSslContextParamsRouteIT extends IrcRouteIT { // TODO This test is disabled until we can find a public SSL enabled IRC // server to test against. To use this test, follow the following procedures: