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 a594384e2c4edcf5bddcd32164868d1669fabdc4 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Wed Jul 22 16:03:05 2020 +0200 [CAMEL-11807] Upgrade camel-sip to junit5 --- components/camel-sip/pom.xml | 6 +++--- .../org/apache/camel/component/sip/PublishSubscribeTest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml index 849bdb5..5a6b839 100644 --- a/components/camel-sip/pom.xml +++ b/components/camel-sip/pom.xml @@ -54,12 +54,12 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <!-- logging --> diff --git a/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java b/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java index 80f6212..2928e05 100644 --- a/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java +++ b/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java @@ -24,12 +24,12 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Test manually as CI server cannot run this test") +@Disabled("Test manually as CI server cannot run this test") public class PublishSubscribeTest extends CamelTestSupport { private int port1; @@ -46,7 +46,7 @@ public class PublishSubscribeTest extends CamelTestSupport { private ProducerTemplate producerTemplate; @Override - @Before + @BeforeEach public void setUp() throws Exception { port1 = AvailablePortFinder.getNextAvailable(); port2 = AvailablePortFinder.getNextAvailable();