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 14:45:53 UTC
[camel] branch master updated (511aa85 -> 4b1d01a)
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 511aa85 Camel-Management: Fixed CS
new 5d6242e Camel-AWS2-EC2: Migrated tests to Junit5
new 4b1d01a Camel-AWS2-EC2: 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-ec2/pom.xml | 7 +----
.../aws2/ec2/EC2ComponentClientRegistryTest.java | 13 ++++++---
.../aws2/ec2/EC2ComponentConfigurationTest.java | 33 +++++++++++++++-------
.../component/aws2/ec2/EC2ComponentSpringTest.java | 6 ++--
.../ec2/EC2ComponentVerifierExtensionTest.java | 11 ++++----
.../component/aws2/ec2/EC2OperationsTest.java | 4 +--
.../camel/component/aws2/ec2/EC2ProducerTest.java | 6 ++--
.../integration/EC2ComponentIntegrationTest.java | 8 +++---
8 files changed, 53 insertions(+), 35 deletions(-)
[camel] 02/02: Camel-AWS2-EC2: 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 4b1d01a38c37a6168ab04fa996ecee2d89b2ae7d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 4 15:45:22 2020 +0100
Camel-AWS2-EC2: Fixed CS
---
.../java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java | 4 ++--
.../java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java | 1 -
.../component/aws2/ec2/integration/EC2ComponentIntegrationTest.java | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java
index 235116b..3834658 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.aws2.ec2;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class EC2OperationsTest {
@Test
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
index d31d6c2..795a0f9 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
-
import software.amazon.awssdk.services.ec2.model.DescribeInstanceStatusResponse;
import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse;
import software.amazon.awssdk.services.ec2.model.InstanceStateName;
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java
index de9dc88..563a3c3 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.component.aws2.ec2.AWS2EC2Operations;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-
import software.amazon.awssdk.services.ec2.model.InstanceType;
@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
[camel] 01/02: Camel-AWS2-EC2: 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 5d6242ee9e677eac0e00d20c312487fe81cc9fab
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 4 15:35:12 2020 +0100
Camel-AWS2-EC2: Migrated tests to Junit5
---
components/camel-aws2-ec2/pom.xml | 7 +----
.../aws2/ec2/EC2ComponentClientRegistryTest.java | 13 ++++++---
.../aws2/ec2/EC2ComponentConfigurationTest.java | 33 +++++++++++++++-------
.../component/aws2/ec2/EC2ComponentSpringTest.java | 6 ++--
.../ec2/EC2ComponentVerifierExtensionTest.java | 11 ++++----
.../component/aws2/ec2/EC2OperationsTest.java | 4 +--
.../camel/component/aws2/ec2/EC2ProducerTest.java | 7 +++--
.../integration/EC2ComponentIntegrationTest.java | 9 +++---
8 files changed, 55 insertions(+), 35 deletions(-)
diff --git a/components/camel-aws2-ec2/pom.xml b/components/camel-aws2-ec2/pom.xml
index ca2ff33..7f58628 100644
--- a/components/camel-aws2-ec2/pom.xml
+++ b/components/camel-aws2-ec2/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-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java
index 4f6dfe7..0c5f311 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws2.ec2;
-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 EC2ComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,12 @@ public class EC2ComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonEc2Client());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalEC2ClientMisconfiguration() throws Exception {
AWS2EC2Component component = context.getComponent("aws2-ec2", AWS2EC2Component.class);
- AWS2EC2Endpoint endpoint = (AWS2EC2Endpoint)component.createEndpoint("aws-ec2://TestDomain");
+ assertThrows(IllegalArgumentException.class, () -> {
+ AWS2EC2Endpoint endpoint = (AWS2EC2Endpoint)component.createEndpoint("aws-ec2://TestDomain");
+ });
}
}
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
index 3b5ebfa..e2dc2ea 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentConfigurationTest.java
@@ -16,12 +16,17 @@
*/
package org.apache.camel.component.aws2.ec2;
-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.core.Protocol;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.ec2.Ec2Client;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class EC2ComponentConfigurationTest extends CamelTestSupport {
@Test
@@ -46,28 +51,36 @@ public class EC2ComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getAmazonEc2Client());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutDomainName() throws Exception {
AWS2EC2Component component = context.getComponent("aws2-ec2", AWS2EC2Component.class);
- component.createEndpoint("aws2-ec2:// ");
+ assertThrows(IllegalArgumentException.class, () -> {
+ component.createEndpoint("aws2-ec2:// ");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAmazonSDBClientConfiguration() throws Exception {
AWS2EC2Component component = context.getComponent("aws2-ec2", AWS2EC2Component.class);
- component.createEndpoint("aws2-ec2://TestDomain");
+ assertThrows(IllegalArgumentException.class, () -> {
+ component.createEndpoint("aws2-ec2://TestDomain");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
AWS2EC2Component component = context.getComponent("aws2-ec2", AWS2EC2Component.class);
- component.createEndpoint("aws2-ec2://TestDomain?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class, () -> {
+ component.createEndpoint("aws2-ec2://TestDomain?secretKey=yyy");
+ });
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
AWS2EC2Component component = context.getComponent("aws2-ec2", AWS2EC2Component.class);
- component.createEndpoint("aws2-ec2://TestDomain?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class, () -> {
+ component.createEndpoint("aws2-ec2://TestDomain?accessKey=xxx");
+ });
}
@Test
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
index 65e4bb3..6870d1f 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentSpringTest.java
@@ -21,8 +21,8 @@ import java.util.Collection;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.ec2.model.DescribeInstanceStatusResponse;
@@ -37,6 +37,8 @@ import software.amazon.awssdk.services.ec2.model.StopInstancesResponse;
import software.amazon.awssdk.services.ec2.model.TerminateInstancesResponse;
import software.amazon.awssdk.services.ec2.model.UnmonitorInstancesResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class EC2ComponentSpringTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentVerifierExtensionTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentVerifierExtensionTest.java
index 478bee1..6dc844b 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentVerifierExtensionTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ComponentVerifierExtensionTest.java
@@ -21,9 +21,10 @@ 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;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class EC2ComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class EC2ComponentVerifierExtensionTest 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 +68,7 @@ public class EC2ComponentVerifierExtensionTest 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-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java
index 37ccd77..235116b 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2OperationsTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.aws2.ec2;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class EC2OperationsTest {
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
index 18bde9f..d31d6c2 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/EC2ProducerTest.java
@@ -25,8 +25,9 @@ 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.ec2.model.DescribeInstanceStatusResponse;
import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse;
import software.amazon.awssdk.services.ec2.model.InstanceStateName;
@@ -39,6 +40,8 @@ import software.amazon.awssdk.services.ec2.model.StopInstancesResponse;
import software.amazon.awssdk.services.ec2.model.TerminateInstancesResponse;
import software.amazon.awssdk.services.ec2.model.UnmonitorInstancesResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class EC2ProducerTest extends CamelTestSupport {
@BindToRegistry("amazonEc2Client")
diff --git a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java
index dc17c1b..de9dc88 100644
--- a/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java
+++ b/components/camel-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/EC2ComponentIntegrationTest.java
@@ -24,12 +24,13 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.ec2.AWS2EC2Constants;
import org.apache.camel.component.aws2.ec2.AWS2EC2Operations;
-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.ec2.model.InstanceType;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class EC2ComponentIntegrationTest extends CamelTestSupport {
@Test