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/06 13:32:41 UTC
[camel] 01/02: Camel-AWS2-IAM: Migrated tests to Junit5
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 7b141c30c885eae6e24977ab2ec67119ca20a974
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Mar 6 14:31:21 2020 +0100
Camel-AWS2-IAM: Migrated tests to Junit5
---
components/camel-aws2-iam/pom.xml | 7 +------
.../component/aws2/iam/IAMComponentClientRegistryTest.java | 13 +++++++++----
.../component/aws2/iam/IAMComponentConfigurationTest.java | 6 ++++--
.../aws2/iam/IAMComponentVerifierExtensionTest.java | 11 ++++++-----
.../camel/component/aws2/iam/IAMProducerSpringTest.java | 7 +++++--
.../apache/camel/component/aws2/iam/IAMProducerTest.java | 7 +++++--
6 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/components/camel-aws2-iam/pom.xml b/components/camel-aws2-iam/pom.xml
index 8ce860c..a9d13c7 100644
--- a/components/camel-aws2-iam/pom.xml
+++ b/components/camel-aws2-iam/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-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java
index 24b605d..514641f 100644
--- a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java
+++ b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws2.iam;
-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 IAMComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,12 @@ public class IAMComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getIamClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalECSClientMisconfiguration() throws Exception {
IAM2Component component = context.getComponent("aws2-iam", IAM2Component.class);
- IAM2Endpoint endpoint = (IAM2Endpoint)component.createEndpoint("aws2-iam://TestDomain");
+ assertThrows(IllegalArgumentException.class, () -> {
+ IAM2Endpoint endpoint = (IAM2Endpoint)component.createEndpoint("aws2-iam://TestDomain");
+ });
}
}
diff --git a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java
index 37e398d..c740e13 100644
--- a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java
+++ b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentConfigurationTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.component.aws2.iam;
-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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class IAMComponentConfigurationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentVerifierExtensionTest.java b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentVerifierExtensionTest.java
index 7628592..52459dd 100644
--- a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentVerifierExtensionTest.java
+++ b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMComponentVerifierExtensionTest.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 IAMComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class IAMComponentVerifierExtensionTest 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 IAMComponentVerifierExtensionTest 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-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
index 2b0fcd8..ed526d2 100644
--- a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
+++ b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerSpringTest.java
@@ -20,8 +20,6 @@ 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.springframework.context.support.ClassPathXmlApplicationContext;
import software.amazon.awssdk.services.iam.model.AddUserToGroupResponse;
import software.amazon.awssdk.services.iam.model.CreateAccessKeyResponse;
@@ -37,6 +35,11 @@ import software.amazon.awssdk.services.iam.model.ListUsersResponse;
import software.amazon.awssdk.services.iam.model.RemoveUserFromGroupResponse;
import software.amazon.awssdk.services.iam.model.StatusType;
import software.amazon.awssdk.services.iam.model.UpdateAccessKeyResponse;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class IAMProducerSpringTest extends CamelSpringTestSupport {
diff --git a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
index 89c8851..c0f6e25 100644
--- a/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
+++ b/components/camel-aws2-iam/src/test/java/org/apache/camel/component/aws2/iam/IAMProducerTest.java
@@ -22,8 +22,8 @@ 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.iam.model.AddUserToGroupResponse;
import software.amazon.awssdk.services.iam.model.CreateAccessKeyResponse;
import software.amazon.awssdk.services.iam.model.CreateGroupResponse;
@@ -39,6 +39,9 @@ import software.amazon.awssdk.services.iam.model.RemoveUserFromGroupResponse;
import software.amazon.awssdk.services.iam.model.StatusType;
import software.amazon.awssdk.services.iam.model.UpdateAccessKeyResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class IAMProducerTest extends CamelTestSupport {
@BindToRegistry("amazonIAMClient")