This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5a746d5815b395624d6ce68e2e357f8a6bf0ec5d Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 11:21:05 2020 +0200 [CAMEL-11807] Upgrade camel-yammer to junit5 --- components/camel-yammer/pom.xml | 6 +++--- .../apache/camel/component/yammer/YammerComponentTestSupport.java | 2 +- .../camel/component/yammer/YammerMessageAndUserRouteTest.java | 6 ++++-- .../camel/component/yammer/YammerMessageProducerRouteTest.java | 4 +++- .../org/apache/camel/component/yammer/YammerMessageRouteTest.java | 4 +++- .../camel/component/yammer/YammerMessagesConsumerOptionTest.java | 4 +++- .../camel/component/yammer/YammerMultipleUsersRouteTest.java | 8 +++++--- .../camel/component/yammer/YammerUserPollEnrichRouteTest.java | 8 +++++--- .../org/apache/camel/component/yammer/YammerUserRouteTest.java | 4 +++- 9 files changed, 30 insertions(+), 16 deletions(-) diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml index e722fdf..1ab5aaf 100644 --- a/components/camel-yammer/pom.xml +++ b/components/camel-yammer/pom.xml @@ -68,14 +68,14 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java index 4d938b5..028e512 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java @@ -19,7 +19,7 @@ package org.apache.camel.component.yammer; import java.io.InputStream; import org.apache.camel.CamelContext; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; public abstract class YammerComponentTestSupport extends CamelTestSupport { diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java index 8df242a..01e49a9 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java @@ -22,8 +22,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.yammer.model.Messages; import org.apache.camel.component.yammer.model.User; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class YammerMessageAndUserRouteTest extends CamelTestSupport { diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java index bfdf379..e013ffb 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageProducerRouteTest.java @@ -20,7 +20,9 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.yammer.model.Messages; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class YammerMessageProducerRouteTest extends YammerComponentTestSupport { diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java index 3c546f7..15dce40 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageRouteTest.java @@ -20,7 +20,9 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.yammer.model.Messages; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class YammerMessageRouteTest extends YammerComponentTestSupport { diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java index 9d5ede9..354b968 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessagesConsumerOptionTest.java @@ -17,7 +17,9 @@ package org.apache.camel.component.yammer; import org.apache.camel.builder.RouteBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class YammerMessagesConsumerOptionTest extends YammerComponentTestSupport { diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java index fbd1a5d..69982d9 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java @@ -22,10 +22,12 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.yammer.model.User; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Online access to yammer and fails with 401 authentication error") +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Disabled("Online access to yammer and fails with 401 authentication error") public class YammerMultipleUsersRouteTest extends YammerComponentTestSupport { @SuppressWarnings("unchecked") diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java index 8b9addd..01916e8 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java @@ -20,10 +20,12 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.yammer.model.User; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Online access to yammer and fails with 401 authentication error") +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Disabled("Online access to yammer and fails with 401 authentication error") public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport { @Test diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java index 48f0bc7..4cca226 100644 --- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java +++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java @@ -20,7 +20,9 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.yammer.model.User; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class YammerUserRouteTest extends YammerComponentTestSupport {
