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 45572b28e07389949d9b1883ac1f685da34e0b83 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 17:43:42 2020 +0200 [CAMEL-11807] Upgrade camel-ssh to junit5 --- components/camel-ssh/pom.xml | 2 +- .../org/apache/camel/component/ssh/SshComponentConsumerTest.java | 2 +- .../camel/component/ssh/SshComponentErrorHandlingTest.java | 2 +- .../apache/camel/component/ssh/SshComponentKnownHostTest.java | 2 +- .../org/apache/camel/component/ssh/SshComponentProducerTest.java | 2 +- .../org/apache/camel/component/ssh/SshComponentSecurityTest.java | 2 +- .../org/apache/camel/component/ssh/SshComponentTestSupport.java | 6 +++++- .../camel/component/ssh/SshShellOutputStringHelperTest.java | 9 ++++++--- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml index 169bec6..997f6a5 100644 --- a/components/camel-ssh/pom.xml +++ b/components/camel-ssh/pom.xml @@ -59,7 +59,7 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentConsumerTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentConsumerTest.java index f418c54..d018c2c 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentConsumerTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentConsumerTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.ssh; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SshComponentConsumerTest extends SshComponentTestSupport { diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentErrorHandlingTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentErrorHandlingTest.java index 2e22e8c..7825587 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentErrorHandlingTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentErrorHandlingTest.java @@ -21,7 +21,7 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SshComponentErrorHandlingTest extends SshComponentTestSupport { diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentKnownHostTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentKnownHostTest.java index 17b723e..62fbe9c 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentKnownHostTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentKnownHostTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.ssh; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SshComponentKnownHostTest extends SshComponentTestSupport { diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java index 68cdaa2..c566be2 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentProducerTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SshComponentProducerTest extends SshComponentTestSupport { diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java index f4d0fc4..4218aaa 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentSecurityTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.sshd.common.keyprovider.FileKeyPairProvider; import org.apache.sshd.common.keyprovider.KeyPairProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SshComponentSecurityTest extends SshComponentTestSupport { diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java index 84d244d..78ac278 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshComponentTestSupport.java @@ -19,15 +19,18 @@ package org.apache.camel.component.ssh; import java.nio.file.Paths; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.sshd.common.keyprovider.FileKeyPairProvider; import org.apache.sshd.server.SshServer; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; public class SshComponentTestSupport extends CamelTestSupport { protected SshServer sshd; protected int port; @Override + @BeforeEach public void setUp() throws Exception { port = AvailablePortFinder.getNextAvailable(); @@ -43,6 +46,7 @@ public class SshComponentTestSupport extends CamelTestSupport { } @Override + @AfterEach public void tearDown() throws Exception { super.tearDown(); diff --git a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshShellOutputStringHelperTest.java b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshShellOutputStringHelperTest.java index d88830a..75a5700 100644 --- a/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshShellOutputStringHelperTest.java +++ b/components/camel-ssh/src/test/java/org/apache/camel/component/ssh/SshShellOutputStringHelperTest.java @@ -16,10 +16,13 @@ */ package org.apache.camel.component.ssh; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class SshShellOutputStringHelperTest extends Assert { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class SshShellOutputStringHelperTest { @Test public void testBeforeLast() {
