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 a7f2ae7b36ecc61ca7789c869442cbee415c9c17 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Mar 4 13:52:11 2020 +0100 Camel-AWS2-DDB: Migrated tests to Junit5 --- components/camel-aws2-ddb/pom.xml | 7 +------ .../component/aws2/ddb/BatchGetItemsCommandTest.java | 8 ++++---- .../component/aws2/ddb/DdbComponentConfigurationTest.java | 6 ++++-- .../aws2/ddb/DdbComponentRegistryClientTest.java | 15 +++++++++------ .../aws2/ddb/DdbComponentVerifierExtensionTest.java | 11 ++++++----- .../camel/component/aws2/ddb/DeleteItemCommandTest.java | 8 ++++---- .../camel/component/aws2/ddb/DeleteTableCommandTest.java | 8 ++++---- .../component/aws2/ddb/DescribeTableCommandTest.java | 8 ++++---- .../camel/component/aws2/ddb/GetItemCommandTest.java | 8 ++++---- .../camel/component/aws2/ddb/PutItemCommandTest.java | 8 ++++---- .../apache/camel/component/aws2/ddb/QueryCommandTest.java | 8 ++++---- .../apache/camel/component/aws2/ddb/ScanCommandTest.java | 8 ++++---- .../camel/component/aws2/ddb/UpdateItemCommandTest.java | 8 ++++---- .../camel/component/aws2/ddb/UpdateTableCommandTest.java | 8 ++++---- .../aws2/ddb/integration/DdbComponentIntegrationTest.java | 12 ++++++++---- .../ddbstream/DdbStreamComponentConfigurationTest.java | 7 +++++-- .../DdbStreamComponentVerifierExtensionTest.java | 11 ++++++----- 17 files changed, 79 insertions(+), 70 deletions(-) diff --git a/components/camel-aws2-ddb/pom.xml b/components/camel-aws2-ddb/pom.xml index ff86ed4..8f4739a 100644 --- a/components/camel-aws2-ddb/pom.xml +++ b/components/camel-aws2-ddb/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-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java index 7695234..3143725 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/BatchGetItemsCommandTest.java @@ -23,12 +23,12 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BatchGetItemsCommandTest { @@ -37,7 +37,7 @@ public class BatchGetItemsCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java index 4ca5775..c6263b9 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentConfigurationTest.java @@ -16,11 +16,13 @@ */ package org.apache.camel.component.aws2.ddb; -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 DdbComponentConfigurationTest extends CamelTestSupport { @Test diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java index 375f68d..d593e08 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentRegistryClientTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.aws2.ddb; -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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DdbComponentRegistryClientTest extends CamelTestSupport { @@ -31,11 +34,11 @@ public class DdbComponentRegistryClientTest extends CamelTestSupport { assertEquals("myTable", endpoint.getConfiguration().getTableName()); } - @Test(expected = IllegalArgumentException.class) + @Test public void createEndpointWithoutRegistryClient() throws Exception { Ddb2Component component = context.getComponent("aws2-ddb", Ddb2Component.class); - Ddb2Endpoint endpoint = (Ddb2Endpoint)component.createEndpoint("aws2-ddb://myTable"); - - assertEquals("myTable", endpoint.getConfiguration().getTableName()); + assertThrows(IllegalArgumentException.class, () -> { + Ddb2Endpoint endpoint = (Ddb2Endpoint)component.createEndpoint("aws2-ddb://myTable"); + }); } } diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentVerifierExtensionTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentVerifierExtensionTest.java index d07a24e..eac7b7e 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentVerifierExtensionTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DdbComponentVerifierExtensionTest.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 DdbComponentVerifierExtensionTest extends CamelTestSupport { @@ -49,7 +50,7 @@ public class DdbComponentVerifierExtensionTest 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 @@ -65,7 +66,7 @@ public class DdbComponentVerifierExtensionTest 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-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteItemCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteItemCommandTest.java index 36bbb8c..8e62d6d 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteItemCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteItemCommandTest.java @@ -22,13 +22,13 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue; import software.amazon.awssdk.services.dynamodb.model.ReturnValue; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DeleteItemCommandTest { @@ -37,7 +37,7 @@ public class DeleteItemCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java index a60de52..f6e4ada 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DeleteTableCommandTest.java @@ -19,12 +19,12 @@ package org.apache.camel.component.aws2.ddb; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughputDescription; import software.amazon.awssdk.services.dynamodb.model.TableStatus; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DeleteTableCommandTest { @@ -33,7 +33,7 @@ public class DeleteTableCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java index 845b9ae..e7fa20b 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/DescribeTableCommandTest.java @@ -22,12 +22,12 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement; import software.amazon.awssdk.services.dynamodb.model.TableStatus; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DescribeTableCommandTest { @@ -36,7 +36,7 @@ public class DescribeTableCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java index 8eabda7..59280ec 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/GetItemCommandTest.java @@ -24,11 +24,11 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class GetItemCommandTest { private GetItemCommand command; @@ -36,7 +36,7 @@ public class GetItemCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java index 05d80d7..4949ec4 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/PutItemCommandTest.java @@ -22,12 +22,12 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PutItemCommandTest { @@ -36,7 +36,7 @@ public class PutItemCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/QueryCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/QueryCommandTest.java index ab6b7c2..a8cce3f 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/QueryCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/QueryCommandTest.java @@ -24,14 +24,14 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator; import software.amazon.awssdk.services.dynamodb.model.Condition; import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class QueryCommandTest { @@ -40,7 +40,7 @@ public class QueryCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/ScanCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/ScanCommandTest.java index b2b9de0..694bef8 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/ScanCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/ScanCommandTest.java @@ -23,14 +23,14 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator; import software.amazon.awssdk.services.dynamodb.model.Condition; import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScanCommandTest { @@ -39,7 +39,7 @@ public class ScanCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateItemCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateItemCommandTest.java index 58892f5..e0e6dbf 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateItemCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateItemCommandTest.java @@ -22,15 +22,15 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeAction; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.AttributeValueUpdate; import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue; import software.amazon.awssdk.services.dynamodb.model.ReturnValue; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class UpdateItemCommandTest { @@ -39,7 +39,7 @@ public class UpdateItemCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateTableCommandTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateTableCommandTest.java index 9ff6a8c..a5a74d2 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateTableCommandTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/UpdateTableCommandTest.java @@ -19,10 +19,10 @@ package org.apache.camel.component.aws2.ddb; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class UpdateTableCommandTest { @@ -31,7 +31,7 @@ public class UpdateTableCommandTest { private Ddb2Configuration configuration; private Exchange exchange; - @Before + @BeforeEach public void setUp() { ddbClient = new AmazonDDBClientMock(); configuration = new Ddb2Configuration(); diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java index 7b0e9a7..3a7218e 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/integration/DdbComponentIntegrationTest.java @@ -26,14 +26,18 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.ddb.Ddb2Constants; import org.apache.camel.component.aws2.ddb.Ddb2Operations; -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.regions.Region; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue; -@Ignore("Must be manually tested. Provide your own credentials below!") +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +@Disabled("Must be manually tested. Provide your own credentials below!") public class DdbComponentIntegrationTest extends CamelTestSupport { @EndpointInject("direct:start") diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java index 9e56823..2909066 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentConfigurationTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.component.aws2.ddbstream; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.apache.camel.test.junit5.CamelTestSupport; + import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.regions.Region; diff --git a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentVerifierExtensionTest.java b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentVerifierExtensionTest.java index 2936b8d..1ab2513 100644 --- a/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentVerifierExtensionTest.java +++ b/components/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/DdbStreamComponentVerifierExtensionTest.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 DdbStreamComponentVerifierExtensionTest extends CamelTestSupport { @@ -49,7 +50,7 @@ public class DdbStreamComponentVerifierExtensionTest 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 @@ -65,7 +66,7 @@ public class DdbStreamComponentVerifierExtensionTest 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()); } }
