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 060d04419654dee734a1edef7f913fbef760c7d5 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 10:37:37 2020 +0200 [CAMEL-11807] Upgrade camel-digitalocean to junit5 --- components/camel-digitalocean/pom.xml | 2 +- .../component/digitalocean/DigitalOceanComponentTest.java | 7 +++++-- .../integration/DigitalOceanComponentIntegrationTest.java | 12 +++++++++--- .../digitalocean/integration/DigitalOceanTestSupport.java | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/components/camel-digitalocean/pom.xml b/components/camel-digitalocean/pom.xml index d55a4ca..294b311 100644 --- a/components/camel-digitalocean/pom.xml +++ b/components/camel-digitalocean/pom.xml @@ -59,7 +59,7 @@ <!-- testing --> <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-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java index 7bb23c6..fe7a33a 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java @@ -25,8 +25,11 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.digitalocean.constants.DigitalOceanHeaders; import org.apache.camel.component.digitalocean.constants.DigitalOceanOperations; import org.apache.camel.component.mock.MockEndpoint; -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.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DigitalOceanComponentTest extends CamelTestSupport { diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java index cec9a44..aab45ee 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java @@ -33,10 +33,16 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.digitalocean.constants.DigitalOceanHeaders; import org.apache.camel.component.digitalocean.constants.DigitalOceanOperations; import org.apache.camel.component.mock.MockEndpoint; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Must be manually tested. Provide your own oAuthToken") +import static org.apache.camel.test.junit5.TestSupport.assertCollectionSize; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Must be manually tested. Provide your own oAuthToken") public class DigitalOceanComponentIntegrationTest extends DigitalOceanTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java index 00527fd..e40dab0 100644 --- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java +++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java @@ -21,7 +21,7 @@ import java.io.InputStream; import java.net.URL; import java.util.Properties; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; public class DigitalOceanTestSupport extends CamelTestSupport {
