This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit a25d027e1ee2572600b2db5bf970a337a723c075 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed Mar 4 18:22:26 2020 +0100 Camel-AWS2-ECS: Migrated tests to Junit5 --- components/camel-aws2-ecs/pom.xml | 7 +------ .../component/aws2/ecs/ECS2ComponentClientRegistryTest.java | 13 +++++++++---- .../component/aws2/ecs/ECS2ComponentConfigurationTest.java | 8 ++++++-- .../aws2/ecs/ECS2ComponentVerifierExtensionTest.java | 12 +++++++----- .../camel/component/aws2/ecs/ECS2ProducerSpringTest.java | 6 ++++-- .../apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 6 ++++-- .../aws2/ecs/integration/ECS2ProducerIntegrationTest.java | 11 +++++++---- 7 files changed, 38 insertions(+), 25 deletions(-) diff --git a/components/camel-aws2-ecs/pom.xml b/components/camel-aws2-ecs/pom.xml index a4ea27d..d568be1 100644 --- a/components/camel-aws2-ecs/pom.xml +++ b/components/camel-aws2-ecs/pom.xml @@ -53,13 +53,8 @@ <!-- for testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java index a41fa76..5799572 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentClientRegistryTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.aws2.ecs; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ECS2ComponentClientRegistryTest extends CamelTestSupport { @@ -32,10 +35,12 @@ public class ECS2ComponentClientRegistryTest extends CamelTestSupport { assertNotNull(endpoint.getConfiguration().getEcsClient()); } - @Test(expected = IllegalArgumentException.class) + @Test public void createEndpointWithMinimalECSClientMisconfiguration() throws Exception { ECS2Component component = context.getComponent("aws2-ecs", ECS2Component.class); - ECS2Endpoint endpoint = (ECS2Endpoint)component.createEndpoint("aws-ecs://TestDomain"); + assertThrows(IllegalArgumentException.class, () -> { + ECS2Endpoint endpoint = (ECS2Endpoint)component.createEndpoint("aws-ecs://TestDomain"); + }); } } diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java index 68f8eaa..2258c0d 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java @@ -16,8 +16,12 @@ */ package org.apache.camel.component.aws2.ecs; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java index 8cd58d3..fccab29 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java @@ -16,14 +16,16 @@ */ package org.apache.camel.component.aws2.ecs; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; import org.apache.camel.Component; import org.apache.camel.component.extension.ComponentVerifierExtension; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + public class ECS2ComponentVerifierExtensionTest extends CamelTestSupport { @@ -50,7 +52,7 @@ public class ECS2ComponentVerifierExtensionTest extends CamelTestSupport { ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); } @Test @@ -67,7 +69,7 @@ public class ECS2ComponentVerifierExtensionTest extends CamelTestSupport { ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters); - Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); + assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); } } diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java index 43cc17f..bb23970 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java @@ -16,12 +16,14 @@ */ package org.apache.camel.component.aws2.ecs; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import software.amazon.awssdk.services.ecs.model.CreateClusterResponse; import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse; diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java index c9f0fa0..1147ecc 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java @@ -16,14 +16,16 @@ */ package org.apache.camel.component.aws2.ecs; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; 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 software.amazon.awssdk.services.ecs.model.CreateClusterResponse; import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse; import software.amazon.awssdk.services.ecs.model.DescribeClustersResponse; diff --git a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerIntegrationTest.java b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerIntegrationTest.java index 1055629..5903237 100644 --- a/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerIntegrationTest.java +++ b/components/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/integration/ECS2ProducerIntegrationTest.java @@ -16,17 +16,20 @@ */ package org.apache.camel.component.aws2.ecs.integration; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + import software.amazon.awssdk.services.ecs.model.ListClustersResponse; -@Ignore("This test must be manually started, you need to specify AWS Credentials") +@Disabled("This test must be manually started, you need to specify AWS Credentials") public class ECS2ProducerIntegrationTest extends CamelTestSupport { @EndpointInject("mock:result")