This is an automated email from the ASF dual-hosted git repository. davsclaus 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 c3addd9 (chores): use JUnit's 5 @DisabledOnOs for disabling tests on specific OSes (#5383) c3addd9 is described below commit c3addd98572ba93216dcc4913776f08ecbcc560a Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Fri Apr 16 06:21:21 2021 +0200 (chores): use JUnit's 5 @DisabledOnOs for disabling tests on specific OSes (#5383) removes OS-specific profiles for camel-atom, camel-iota and camel-printer --- components/camel-atom/pom.xml | 16 ------------- .../camel/component/atom/AtomEndpointTest.java | 3 +++ .../atom/AtomEntryPollingConsumerTest.java | 3 +++ .../AtomEntryPollingConsumerWithBasicAuthTest.java | 3 +++ .../camel/component/atom/AtomEntrySortTest.java | 3 +++ .../camel/component/atom/AtomGoodBlogsTest.java | 3 +++ .../camel/component/atom/AtomHttpConsumerTest.java | 3 +++ .../atom/AtomHttpNoCamelParametersTest.java | 3 +++ .../atom/AtomPollingConsumerIdleMessageTest.java | 3 +++ .../component/atom/AtomPollingConsumerTest.java | 3 +++ .../atom/AtomPollingConsumerWithBasicAuthTest.java | 3 +++ .../component/atom/AtomPollingLowDelayTest.java | 3 +++ .../component/atom/AtomPollingUnthrottledTest.java | 3 +++ .../camel/component/atom/AtomProducerTest.java | 3 +++ .../apache/camel/component/atom/AtomRouteTest.java | 3 +++ .../camel/component/atom/JettyTestServer.java | 3 +++ .../component/atom/UpdatedDateFilterTest.java | 3 +++ components/camel-iota/pom.xml | 26 ---------------------- .../camel/component/iota/IOTAProducerTest.java | 4 ++++ components/camel-printer/pom.xml | 16 ------------- .../camel/component/printer/PrinterPrintTest.java | 3 +++ 21 files changed, 55 insertions(+), 58 deletions(-) diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index 1f51c80..5c1d9ac 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -198,22 +198,6 @@ <scope>test</scope> </dependency> </dependencies> - - <!-- skip tests on AIX --> - <profiles> - <profile> - <id>aix</id> - <activation> - <os> - <family>AIX</family> - </os> - </activation> - <properties> - <skipTests>true</skipTests> - </properties> - </profile> - </profiles> - </project> diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java index 5a2472b..33b5a11 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java @@ -17,10 +17,13 @@ package org.apache.camel.component.atom; import org.apache.camel.builder.RouteBuilder; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; /** * Unit test for AtomPollingConsumer */ +@DisabledOnOs(OS.AIX) public class AtomEndpointTest extends AtomPollingConsumerTest { @Override diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java index 5c96f0b..c09517a 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java @@ -23,10 +23,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; /** * Unit test for AtomEntryPollingConsumer */ +@DisabledOnOs(OS.AIX) public class AtomEntryPollingConsumerTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java index 958fd35..cd4fbc5 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerWithBasicAuthTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.atom; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; +@DisabledOnOs(OS.AIX) public class AtomEntryPollingConsumerWithBasicAuthTest extends AtomEntryPollingConsumerTest { @Override diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java index 2b87ace..2673ec9 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java @@ -26,7 +26,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.Registry; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; +@DisabledOnOs(OS.AIX) public class AtomEntrySortTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java index 1105c04..ecefd6c 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java @@ -24,10 +24,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.SimpleRegistry; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; /** * Example for wiki documentation */ +@DisabledOnOs(OS.AIX) public class AtomGoodBlogsTest { // START SNIPPET: e1 diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java index 1d8eff7..20a187b 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpConsumerTest.java @@ -21,10 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; /** * Unit test for consuming from a http feed */ +@DisabledOnOs(OS.AIX) public class AtomHttpConsumerTest extends CamelTestSupport { @Disabled("requires to be online for testing") diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java index 9efebf8..8cb5b68 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomHttpNoCamelParametersTest.java @@ -18,10 +18,13 @@ package org.apache.camel.component.atom; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@DisabledOnOs(OS.AIX) public class AtomHttpNoCamelParametersTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java index 16e3d8c..15bd11b 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerIdleMessageTest.java @@ -20,6 +20,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertNull; @@ -27,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; * Test to verify that the polling consumer delivers an empty Exchange when the sendEmptyMessageWhenIdle property is set * and a polling event yields no results. */ +@DisabledOnOs(OS.AIX) public class AtomPollingConsumerIdleMessageTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java index 70d2041..89ea366 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java @@ -25,6 +25,8 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -33,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit test for AtomPollingConsumer */ +@DisabledOnOs(OS.AIX) public class AtomPollingConsumerTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java index e6bf83e..e2b0716 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerWithBasicAuthTest.java @@ -19,7 +19,10 @@ package org.apache.camel.component.atom; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; +@DisabledOnOs(OS.AIX) public class AtomPollingConsumerWithBasicAuthTest extends AtomPollingConsumerTest { @Override diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java index 9579ea0..e12b6cb 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java @@ -20,10 +20,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; /** * Unit test for fast polling using a low delay */ +@DisabledOnOs(OS.AIX) public class AtomPollingLowDelayTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java index 83a9834..88e780b 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingUnthrottledTest.java @@ -20,7 +20,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; +@DisabledOnOs(OS.AIX) public class AtomPollingUnthrottledTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java index eae9aa5..9ffd4a7 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java @@ -19,12 +19,15 @@ package org.apache.camel.component.atom; import org.apache.camel.Endpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertThrows; /** * Unit test for AtomProducer. */ +@DisabledOnOs(OS.AIX) public class AtomProducerTest extends CamelTestSupport { @Test diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java index d926094..7504936 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java @@ -24,12 +24,15 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@DisabledOnOs(OS.AIX) public class AtomRouteTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(AtomRouteTest.class); diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java index 03f3ee7..9547044 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/JettyTestServer.java @@ -38,11 +38,14 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Credential; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.fail; +@DisabledOnOs(OS.AIX) public final class JettyTestServer { private static final Logger LOG = LoggerFactory.getLogger(JettyTestServer.class); diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java index 7e86ae9..7e6b2a6 100644 --- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java +++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java @@ -25,6 +25,8 @@ import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.apache.camel.component.feed.EntryFilter; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -32,6 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Unit test for UpdatedDateFilter */ +@DisabledOnOs(OS.AIX) public class UpdatedDateFilterTest { @Test diff --git a/components/camel-iota/pom.xml b/components/camel-iota/pom.xml index c6b9af6..fb14429 100644 --- a/components/camel-iota/pom.xml +++ b/components/camel-iota/pom.xml @@ -71,30 +71,4 @@ <scope>test</scope> </dependency> </dependencies> - - <!-- skip tests on AIX and HP-UX --> - <profiles> - <profile> - <id>aix</id> - <activation> - <os> - <family>AIX</family> - </os> - </activation> - <properties> - <skipTests>true</skipTests> - </properties> - </profile> - <profile> - <id>hpux</id> - <activation> - <os> - <family>HP-UX</family> - </os> - </activation> - <properties> - <skipTests>true</skipTests> - </properties> - </profile> - </profiles> </project> diff --git a/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java b/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java index 7f1f867..aff369c 100644 --- a/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java +++ b/components/camel-iota/src/test/java/org/apache/camel/component/iota/IOTAProducerTest.java @@ -22,9 +22,13 @@ import org.apache.camel.test.junit5.CamelTestSupport; import org.iota.jota.error.InternalException; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// Doesn't work on AIX and HP-UX +@DisabledOnOs({ OS.AIX, OS.OTHER }) public class IOTAProducerTest extends CamelTestSupport { private static final String SEED = "IHDEENZYITYVYSPKAURUZAQKGVJEREFDJMYTANNXXGPZ9GJWTEOJJ9IPMXOGZNQLSNMFDSQOTZAEETUEA"; diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml index 2696bba..bc37a2a 100644 --- a/components/camel-printer/pom.xml +++ b/components/camel-printer/pom.xml @@ -79,20 +79,4 @@ </plugin> </plugins> </build> - - <!-- skip tests on AIX --> - <profiles> - <profile> - <id>aix</id> - <activation> - <os> - <family>AIX</family> - </os> - </activation> - <properties> - <skipTests>true</skipTests> - </properties> - </profile> - </profiles> - </project> diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java index 7611d87..56255fb 100644 --- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java +++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java @@ -45,6 +45,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -56,6 +58,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@DisabledOnOs(OS.AIX) public class PrinterPrintTest extends CamelTestSupport { Class<?> printServiceLookupServicesClass = PrintServiceLookup.class.getDeclaredClasses()[0]; Object printServiceLookup;