You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/04 17:43:44 UTC
[camel] branch master updated (4eb0449 -> 68742b3)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4eb0449 Add a profile to run the impsort plugin (sort and remove unused imports)
new a25d027 Camel-AWS2-ECS: Migrated tests to Junit5
new 68742b3 Camel-AWS2-ECS: Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-aws2-ecs/pom.xml | 7 +------
.../component/aws2/ecs/ECS2ComponentClientRegistryTest.java | 13 +++++++++----
.../component/aws2/ecs/ECS2ComponentConfigurationTest.java | 6 ++++--
.../aws2/ecs/ECS2ComponentVerifierExtensionTest.java | 11 ++++++-----
.../camel/component/aws2/ecs/ECS2ProducerSpringTest.java | 6 ++++--
.../apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 6 ++++--
.../aws2/ecs/integration/ECS2ProducerIntegrationTest.java | 10 ++++++----
7 files changed, 34 insertions(+), 25 deletions(-)
[camel] 02/02: Camel-AWS2-ECS: Fixed CS
Posted by ac...@apache.org.
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 68742b36cb7a9170b38e52eb6eba0057a3861da7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 4 18:43:15 2020 +0100
Camel-AWS2-ECS: Fixed CS
---
.../camel/component/aws2/ecs/ECS2ComponentConfigurationTest.java | 6 ++----
.../component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java | 3 +--
.../org/apache/camel/component/aws2/ecs/ECS2ProducerSpringTest.java | 4 ++--
.../java/org/apache/camel/component/aws2/ecs/ECS2ProducerTest.java | 4 ++--
.../component/aws2/ecs/integration/ECS2ProducerIntegrationTest.java | 5 ++---
5 files changed, 9 insertions(+), 13 deletions(-)
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 2258c0d..a061142 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,15 +16,13 @@
*/
package org.apache.camel.component.aws2.ecs;
-
-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;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ECS2ComponentConfigurationTest extends CamelTestSupport {
@Test
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 fccab29..6cd7100 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,8 +16,6 @@
*/
package org.apache.camel.component.aws2.ecs;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.util.HashMap;
import java.util.Map;
@@ -26,6 +24,7 @@ import org.apache.camel.component.extension.ComponentVerifierExtension;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ECS2ComponentVerifierExtensionTest extends CamelTestSupport {
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 bb23970..286f9d7 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,8 +16,6 @@
*/
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;
@@ -30,6 +28,8 @@ import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse;
import software.amazon.awssdk.services.ecs.model.DescribeClustersResponse;
import software.amazon.awssdk.services.ecs.model.ListClustersResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ECS2ProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
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 1147ecc..b687e28 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,8 +16,6 @@
*/
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;
@@ -31,6 +29,8 @@ import software.amazon.awssdk.services.ecs.model.DeleteClusterResponse;
import software.amazon.awssdk.services.ecs.model.DescribeClustersResponse;
import software.amazon.awssdk.services.ecs.model.ListClustersResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ECS2ProducerTest extends CamelTestSupport {
@BindToRegistry("amazonEcsClient")
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 5903237..066e46e 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,8 +16,6 @@
*/
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;
@@ -26,9 +24,10 @@ import org.apache.camel.component.mock.MockEndpoint;
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;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@Disabled("This test must be manually started, you need to specify AWS Credentials")
public class ECS2ProducerIntegrationTest extends CamelTestSupport {
[camel] 01/02: Camel-AWS2-ECS: Migrated tests to Junit5
Posted by ac...@apache.org.
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 <an...@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")