You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/06/22 16:09:32 UTC
[camel] 01/07: [CAMEL-11807] Upgrade camel-aws-* to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 26dbf61c9e681f0995d52e0e80cd80e69ebdc6dd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Sat Jun 20 00:36:07 2020 +0200
[CAMEL-11807] Upgrade camel-aws-* to junit5
---
components/camel-aws-cw/pom.xml | 8 +--
.../aws/cw/CwComponentConfigurationTest.java | 23 ++++---
.../aws/cw/CwComponentRegistryClientTest.java | 11 ++--
.../camel/component/aws/cw/CwComponentTest.java | 8 +--
.../aws/cw/CwComponentVerifierExtensionTest.java | 11 ++--
.../cw/integration/CwComponentIntegrationTest.java | 8 +--
components/camel-aws-ddb/pom.xml | 8 +--
.../aws/ddb/BatchGetItemsCommandTest.java | 10 +--
.../aws/ddb/DdbComponentConfigurationTest.java | 6 +-
.../aws/ddb/DdbComponentRegistryClientTest.java | 14 ++--
.../camel/component/aws/ddb/DdbComponentTest.java | 7 +-
.../aws/ddb/DdbComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/ddb/DeleteItemCommandTest.java | 10 +--
.../component/aws/ddb/DeleteTableCommandTest.java | 10 +--
.../aws/ddb/DescribeTableCommandTest.java | 10 +--
.../component/aws/ddb/GetItemCommandTest.java | 9 +--
.../component/aws/ddb/PutItemCommandTest.java | 10 +--
.../camel/component/aws/ddb/QueryCommandTest.java | 10 +--
.../camel/component/aws/ddb/ScanCommandTest.java | 10 +--
.../component/aws/ddb/UpdateItemCommandTest.java | 10 +--
.../component/aws/ddb/UpdateTableCommandTest.java | 10 +--
.../integration/DdbComponentIntegrationTest.java | 11 ++--
.../DdbStreamComponentConfigurationTest.java | 6 +-
.../DdbStreamComponentVerifierExtensionTest.java | 11 ++--
.../aws/ddbstream/DdbStreamConsumerTest.java | 30 ++++-----
.../aws/ddbstream/DdbStreamEndpointTest.java | 37 +++++------
.../aws/ddbstream/ShardIteratorHandlerTest.java | 58 +++++++++--------
.../ShardListAfterSequenceParametrisedTest.java | 35 ++++------
.../ShardListAtSequenceParametrisedTest.java | 55 +++++++---------
.../component/aws/ddbstream/ShardListTest.java | 24 +++----
components/camel-aws-ec2/pom.xml | 8 +--
.../aws/ec2/EC2ComponentClientRegistryTest.java | 12 ++--
.../aws/ec2/EC2ComponentConfigurationTest.java | 28 +++++---
.../component/aws/ec2/EC2ComponentSpringTest.java | 6 +-
.../aws/ec2/EC2ComponentVerifierExtensionTest.java | 11 ++--
.../camel/component/aws/ec2/EC2OperationsTest.java | 5 +-
.../camel/component/aws/ec2/EC2ProducerTest.java | 24 ++++---
.../integration/EC2ComponentIntegrationTest.java | 8 +--
components/camel-aws-ecs/pom.xml | 6 +-
.../aws/ecs/ECSComponentClientRegistryTest.java | 12 ++--
.../aws/ecs/ECSComponentConfigurationTest.java | 6 +-
.../aws/ecs/ECSComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/ecs/ECSProducerSpringTest.java | 6 +-
.../camel/component/aws/ecs/ECSProducerTest.java | 6 +-
components/camel-aws-eks/pom.xml | 6 +-
.../aws/eks/EKSComponentClientRegistryTest.java | 12 ++--
.../aws/eks/EKSComponentConfigurationTest.java | 6 +-
.../aws/eks/EKSComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/eks/EKSProducerSpringTest.java | 6 +-
.../camel/component/aws/eks/EKSProducerTest.java | 6 +-
components/camel-aws-iam/pom.xml | 6 +-
.../aws/iam/IAMComponentClientRegistryTest.java | 12 ++--
.../aws/iam/IAMComponentConfigurationTest.java | 6 +-
.../aws/iam/IAMComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/iam/IAMProducerSpringTest.java | 7 +-
.../camel/component/aws/iam/IAMProducerTest.java | 7 +-
components/camel-aws-kinesis/pom.xml | 8 +--
.../KinesisFirehoseComponentConfigurationTest.java | 6 +-
...esisFirehoseComponentVerifierExtensionTest.java | 11 ++--
.../aws/firehose/KinesisFirehoseEndpointTest.java | 27 ++++----
.../aws/firehose/KinesisFirehoseProducerTest.java | 12 ++--
.../KinesisFirehoseComponentIntegrationTest.java | 6 +-
.../kinesis/KinesisComponentConfigurationTest.java | 6 +-
.../KinesisComponentVerifierExtensionTest.java | 11 ++--
.../KinesisConsumerClosedShardWithFailTest.java | 42 +++++++-----
.../KinesisConsumerClosedShardWithSilentTest.java | 76 ++++++++++------------
.../component/aws/kinesis/KinesisConsumerTest.java | 76 ++++++++++------------
.../component/aws/kinesis/KinesisEndpointTest.java | 56 ++++++++--------
.../component/aws/kinesis/KinesisProducerTest.java | 14 ++--
.../aws/kinesis/RecordStringConverterTest.java | 8 +--
.../KinesisComponentIntegrationTest.java | 12 ++--
components/camel-aws-kms/pom.xml | 6 +-
.../aws/kms/KMSComponentClientRegistryTest.java | 12 ++--
.../aws/kms/KMSComponentConfigurationTest.java | 6 +-
.../aws/kms/KMSComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/kms/KMSProducerSpringTest.java | 7 +-
.../camel/component/aws/kms/KMSProducerTest.java | 7 +-
components/camel-aws-lambda/pom.xml | 8 +--
.../lambda/LambdaComponentClientRegistryTest.java | 13 ++--
.../lambda/LambdaComponentConfigurationTest.java | 27 +++++---
.../aws/lambda/LambdaComponentSpringTest.java | 11 +++-
.../LambdaComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/lambda/LambdaOperationsTest.java | 4 +-
.../lambda/LambdaProducerDefaultFunctionTest.java | 7 +-
.../component/aws/lambda/LambdaProducerTest.java | 8 ++-
.../LambdaComponentIntegrationTest.java | 14 ++--
components/camel-aws-mq/pom.xml | 6 +-
.../aws/mq/MQComponentClientRegistryTest.java | 12 ++--
.../aws/mq/MQComponentConfigurationTest.java | 6 +-
.../aws/mq/MQComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/mq/MQProducerSpringTest.java | 6 +-
.../camel/component/aws/mq/MQProducerTest.java | 6 +-
components/camel-aws-msk/pom.xml | 6 +-
.../aws/msk/MSKComponentClientRegistryTest.java | 12 ++--
.../aws/msk/MSKComponentConfigurationTest.java | 6 +-
.../aws/msk/MSKComponentVerifierExtensionTest.java | 11 ++--
.../component/aws/msk/MSKProducerSpringTest.java | 6 +-
.../camel/component/aws/msk/MSKProducerTest.java | 6 +-
components/camel-aws-s3/pom.xml | 8 +--
.../component/aws/s3/AWSS3ClientFactoryTest.java | 11 ++--
.../camel/component/aws/s3/AmazonS3ClientMock.java | 7 +-
.../aws/s3/AmazonS3EncryptionClientMock.java | 7 +-
.../s3/S3BatchConsumerMaxMessagesPerPollTest.java | 4 +-
.../component/aws/s3/S3BatchConsumerTest.java | 4 +-
.../aws/s3/S3ComponentClientRegistryTest.java | 15 +++--
.../aws/s3/S3ComponentConfigurationTest.java | 27 +++++---
.../aws/s3/S3ComponentContentLengthFileTest.java | 18 +++--
.../s3/S3ComponentCopyObjectEncryptionTest.java | 7 +-
.../aws/s3/S3ComponentCopyObjectSpringTest.java | 7 +-
.../aws/s3/S3ComponentCopyObjectTest.java | 7 +-
.../aws/s3/S3ComponentDeleteObjectSpringTest.java | 6 +-
.../aws/s3/S3ComponentDeleteObjectTest.java | 6 +-
.../aws/s3/S3ComponentDownloadLinkSpringTest.java | 6 +-
.../aws/s3/S3ComponentDownloadLinkTest.java | 6 +-
.../aws/s3/S3ComponentExistingBucketTest.java | 9 ++-
.../aws/s3/S3ComponentFileDeleteTest.java | 5 +-
.../component/aws/s3/S3ComponentFileTest.java | 18 +++--
.../aws/s3/S3ComponentGetObjectRangeTest.java | 4 +-
.../component/aws/s3/S3ComponentGetObjectTest.java | 4 +-
.../aws/s3/S3ComponentKeyNameFileTest.java | 18 +++--
.../aws/s3/S3ComponentListBucketsSpringTest.java | 6 +-
.../aws/s3/S3ComponentListBucketsTest.java | 6 +-
.../aws/s3/S3ComponentListObjectTest.java | 6 +-
.../aws/s3/S3ComponentListObjectsSpringTest.java | 6 +-
.../aws/s3/S3ComponentNonExistingBucketTest.java | 8 ++-
.../component/aws/s3/S3ComponentSpringTest.java | 8 ++-
.../component/aws/s3/S3ComponentStringTest.java | 8 ++-
.../aws/s3/S3ComponentVerifierExtensionTest.java | 11 ++--
.../camel/component/aws/s3/S3ConsumerCronTest.java | 6 +-
.../component/aws/s3/S3ConsumerDelimiterTest.java | 6 +-
.../aws/s3/S3ConsumerIdleMessageTest.java | 6 +-
.../component/aws/s3/S3ConsumerPrefixTest.java | 6 +-
.../camel/component/aws/s3/S3IncludeBodyTest.java | 9 ++-
.../impl/IAMOptimizedAWSS3ClientImplTest.java | 21 +++---
.../client/impl/StandardAWSS3ClientImplTest.java | 21 +++---
.../s3/integration/S3ComponentIntegrationTest.java | 14 ++--
.../S3ObjectRangeOperationIntegrationTest.java | 8 +--
components/camel-aws-sdb/pom.xml | 6 +-
.../component/aws/sdb/AbstractSdbCommandTest.java | 14 ++--
.../aws/sdb/BatchDeleteAttributesCommandTest.java | 10 +--
.../aws/sdb/BatchPutAttributesCommandTest.java | 11 ++--
.../aws/sdb/DeleteAttributesCommandTest.java | 18 ++---
.../component/aws/sdb/DeleteDomainCommandTest.java | 8 +--
.../aws/sdb/DomainMetadataCommandTest.java | 8 +--
.../aws/sdb/GetAttributesCommandTest.java | 18 ++---
.../component/aws/sdb/ListDomainsCommandTest.java | 10 +--
.../aws/sdb/PutAttributesCommandTest.java | 18 ++---
.../aws/sdb/SdbComponentConfigurationTest.java | 32 ++++++---
.../component/aws/sdb/SdbComponentSpringTest.java | 12 ++--
.../camel/component/aws/sdb/SdbComponentTest.java | 8 ++-
.../aws/sdb/SdbComponentVerifierExtensionTest.java | 11 ++--
.../camel/component/aws/sdb/SdbOperationsTest.java | 4 +-
.../camel/component/aws/sdb/SelectCommandTest.java | 10 +--
.../integration/SdbComponentIntegrationTest.java | 10 +--
components/camel-aws-ses/pom.xml | 6 +-
.../aws/ses/SESComponentClientRegistryTest.java | 12 ++--
.../aws/ses/SesComponentConfigurationTest.java | 31 ++++++---
.../component/aws/ses/SesComponentSpringTest.java | 11 ++--
.../camel/component/aws/ses/SesComponentTest.java | 7 +-
.../aws/ses/SesComponentVerifierExtensionTest.java | 11 ++--
.../integration/SesComponentIntegrationTest.java | 10 +--
components/camel-aws-sns/pom.xml | 18 +++--
.../component/aws/sns/AmazonSNSClientMock.java | 9 +--
.../aws/sns/SNSComponentClientRegistryTest.java | 12 ++--
.../aws/sns/SnsComponentConfigurationTest.java | 26 +++++---
.../component/aws/sns/SnsComponentSpringTest.java | 6 +-
.../camel/component/aws/sns/SnsComponentTest.java | 6 +-
.../aws/sns/SnsComponentVerifierExtensionTest.java | 11 ++--
.../camel/component/aws/sns/SnsProducerTest.java | 31 +++++----
.../integration/SnsComponentIntegrationTest.java | 10 +--
.../SnsTopicWithKmsEncryptionIntegrationTest.java | 10 +--
components/camel-aws-sqs/pom.xml | 13 ++--
.../component/aws/sqs/SqsBatchConsumerTest.java | 4 +-
.../aws/sqs/SqsComponentClientRegistryTest.java | 12 ++--
.../aws/sqs/SqsComponentConfigurationTest.java | 25 ++++---
.../component/aws/sqs/SqsComponentSpringTest.java | 7 +-
.../camel/component/aws/sqs/SqsComponentTest.java | 7 +-
.../aws/sqs/SqsComponentVerifierExtensionTest.java | 11 ++--
.../aws/sqs/SqsConcurrentConsumerTest.java | 10 ++-
.../component/aws/sqs/SqsConfigurationTest.java | 11 ++--
.../aws/sqs/SqsConsumerIdleMessageTest.java | 6 +-
.../sqs/SqsDoesNotExtendMessageVisibilityTest.java | 8 ++-
.../aws/sqs/SqsEndpointExplicitQueueUrlTest.java | 11 ++--
.../camel/component/aws/sqs/SqsEndpointTest.java | 8 +--
.../aws/sqs/SqsEndpointUseExistingQueueTest.java | 4 +-
.../aws/sqs/SqsExtendMessageVisibilityTest.java | 9 ++-
.../aws/sqs/SqsFilterMessagesWithNoDeleteTest.java | 11 ++--
.../component/aws/sqs/SqsProducerBatchTest.java | 6 +-
.../component/aws/sqs/SqsProducerDeleteTest.java | 6 +-
.../aws/sqs/SqsProducerListQueuesTest.java | 7 +-
.../camel/component/aws/sqs/SqsProducerTest.java | 53 ++++++++-------
.../integration/SqsComponentIntegrationTest.java | 11 ++--
.../SqsConsumerMessageIntegrationTest.java | 8 +--
.../SqsProducerBatchSendFifoIntegrationTest.java | 8 +--
.../SqsProducerBatchSendIntegrationTest.java | 8 +--
.../SqsProducerDeleteMessageIntegrationTest.java | 8 +--
components/camel-aws-swf/pom.xml | 8 +--
.../aws/swf/CamelSWFActivityClientTest.java | 6 +-
.../aws/swf/CamelSWFActivityConsumerTest.java | 2 +-
.../component/aws/swf/CamelSWFTestSupport.java | 2 +-
.../aws/swf/CamelSWFWorkflowClientTest.java | 25 ++++---
.../aws/swf/CamelSWFWorkflowConsumerTest.java | 2 +-
.../aws/swf/CamelSWFWorkflowProducerTest.java | 3 +-
.../aws/swf/SWFComponentClientRegistryTest.java | 12 ++--
.../aws/swf/SWFComponentConfigurationTest.java | 6 +-
.../component/aws/swf/SwfComponentSpringTest.java | 6 +-
.../aws/swf/SwfComponentVerifierExtensionTest.java | 11 ++--
.../aws/swf/integration/CamelSWFEndToEndTest.java | 8 +--
components/camel-aws-translate/pom.xml | 6 +-
.../aws/translate/TranslateProducerSpringTest.java | 6 +-
.../aws/translate/TranslateProducerTest.java | 6 +-
.../TranslateProducerIntegrationTest.java | 10 +--
components/camel-aws-xray/pom.xml | 2 +-
.../camel/component/aws/xray/ABCRouteTest.java | 3 +-
.../camel/component/aws/xray/BeanTracingTest.java | 3 +-
.../aws/xray/CamelAwsXRayTestSupport.java | 20 ++++--
.../aws/xray/ClientRecipientListRouteTest.java | 3 +-
.../aws/xray/ComprehensiveTrackingTest.java | 3 +-
.../component/aws/xray/CustomComponentTest.java | 3 +-
.../camel/component/aws/xray/EIPTracingTest.java | 7 +-
.../component/aws/xray/ErrorHandlingTest.java | 3 +-
.../apache/camel/component/aws/xray/ErrorTest.java | 3 +-
.../camel/component/aws/xray/FakeAWSDaemon.java | 9 +--
.../aws/xray/MulticastParallelRouteTest.java | 3 +-
.../component/aws/xray/MulticastRouteTest.java | 3 +-
.../component/aws/xray/Route2ConcurrentTest.java | 3 +-
.../component/aws/xray/RouteConcurrentTest.java | 3 +-
.../aws/xray/SpringAwsXRaySimpleRouteTest.java | 23 +++++--
.../apache/camel/component/aws/xray/TestUtils.java | 14 ++--
.../camel/component/aws/xray/TwoService2Test.java | 3 +-
.../camel/component/aws/xray/TwoServiceTest.java | 3 +-
.../aws/xray/TwoServiceWithExcludeTest.java | 3 +-
.../camel/component/aws/xray/json/JsonTest.java | 8 ++-
233 files changed, 1552 insertions(+), 1102 deletions(-)
diff --git a/components/camel-aws-cw/pom.xml b/components/camel-aws-cw/pom.xml
index e81c26c..01a949e 100644
--- a/components/camel-aws-cw/pom.xml
+++ b/components/camel-aws-cw/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
index 057d830..a4325fe 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentConfigurationTest.java
@@ -22,9 +22,11 @@ import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
import org.apache.camel.BindToRegistry;
-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;
import static org.mockito.Mockito.mock;
public class CwComponentConfigurationTest extends CamelTestSupport {
@@ -46,22 +48,25 @@ public class CwComponentConfigurationTest extends CamelTestSupport {
assertEquals(NOW, endpoint.getConfiguration().getTimestamp());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
CwComponent component = context.getComponent("aws-cw", CwComponent.class);
- component.createEndpoint("aws-cw://camel.apache.org/test?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-cw://camel.apache.org/test?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
CwComponent component = context.getComponent("aws-cw", CwComponent.class);
- component.createEndpoint("aws-cw://camel.apache.org/test?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-cw://camel.apache.org/test?accessKey=xxx"));
}
-
- @Test(expected = IllegalArgumentException.class)
+
+ @Test
public void createEndpointWithoutSecretKeyAndAccessKeyConfiguration() throws Exception {
CwComponent component = context.getComponent("aws-cw", CwComponent.class);
- component.createEndpoint("aws-cw://camel.apache.org/test?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-cw://camel.apache.org/test"));
}
@Test
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
index 51182eb..af7c117 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentRegistryClientTest.java
@@ -20,9 +20,11 @@ import java.util.Date;
import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;
import org.apache.camel.BindToRegistry;
-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;
import static org.mockito.Mockito.mock;
public class CwComponentRegistryClientTest extends CamelTestSupport {
@@ -44,9 +46,10 @@ public class CwComponentRegistryClientTest extends CamelTestSupport {
assertEquals(NOW, endpoint.getConfiguration().getTimestamp());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalS3ClientMisconfiguration() throws Exception {
CwComponent component = context.getComponent("aws-cw", CwComponent.class);
- CwEndpoint endpoint = (CwEndpoint)component.createEndpoint("aws-cw://camel.apache.org/test");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-cw://camel.apache.org/test"));
}
}
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
index 03dc265..9bdadbf 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentTest.java
@@ -31,11 +31,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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 org.mockito.ArgumentCaptor;
-import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -125,7 +125,7 @@ public class CwComponentTest extends CamelTestSupport {
List<Dimension> dimensions = argument.getValue().getMetricData().get(0).getDimensions();
Dimension dimension = dimensions.get(0);
- assertThat(dimensions.size(), is(2));
+ assertEquals(2, dimensions.size());
assertEquals("keyOne", dimension.getName());
assertEquals("valueOne", dimension.getValue());
}
diff --git a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.java
index d01190a..7cacc5b 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/CwComponentVerifierExtensionTest.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 CwComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class CwComponentVerifierExtensionTest 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 CwComponentVerifierExtensionTest 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-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
index bceed8f..ea65e64 100644
--- a/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
+++ b/components/camel-aws-cw/src/test/java/org/apache/camel/component/aws/cw/integration/CwComponentIntegrationTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.cw.CwConstants;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class CwComponentIntegrationTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-ddb/pom.xml b/components/camel-aws-ddb/pom.xml
index 8ce7874..4a34ed7 100644
--- a/components/camel-aws-ddb/pom.xml
+++ b/components/camel-aws-ddb/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
index 5a40121..ae205fe 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/BatchGetItemsCommandTest.java
@@ -25,10 +25,12 @@ import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class BatchGetItemsCommandTest {
@@ -37,7 +39,7 @@ public class BatchGetItemsCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java
index d0d9208..1849723 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.ddb;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class DdbComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentRegistryClientTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentRegistryClientTest.java
index 73b6b06..597399b 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentRegistryClientTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentRegistryClientTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.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,10 @@ public class DdbComponentRegistryClientTest extends CamelTestSupport {
assertEquals("myTable", endpoint.getConfiguration().getTableName());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutRegistryClient() throws Exception {
DdbComponent component = context.getComponent("aws-ddb", DdbComponent.class);
- DdbEndpoint endpoint = (DdbEndpoint)component.createEndpoint("aws-ddb://myTable");
-
- assertEquals("myTable", endpoint.getConfiguration().getTableName());
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ddb://myTable"));
}
}
\ No newline at end of file
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentTest.java
index 6d069f1..a773804 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentTest.java
@@ -19,8 +19,11 @@ package org.apache.camel.component.aws.ddb;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.engine.DefaultProducerTemplate;
-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.assertNull;
public class DdbComponentTest extends CamelTestSupport {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtensionTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtensionTest.java
index 23e9ed3..c9d5bb4 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DdbComponentVerifierExtensionTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/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-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
index df315b9..01fae7c 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteItemCommandTest.java
@@ -24,10 +24,12 @@ import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class DeleteItemCommandTest {
@@ -36,7 +38,7 @@ public class DeleteItemCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
index 63fd070..6774873 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DeleteTableCommandTest.java
@@ -25,10 +25,12 @@ import com.amazonaws.services.dynamodbv2.model.TableStatus;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class DeleteTableCommandTest {
@@ -37,7 +39,7 @@ public class DeleteTableCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
index af8a81c..71f56c7 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/DescribeTableCommandTest.java
@@ -24,10 +24,12 @@ import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class DescribeTableCommandTest {
@@ -36,7 +38,7 @@ public class DescribeTableCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
index fe82447..d9dcd92 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/GetItemCommandTest.java
@@ -25,10 +25,11 @@ import com.amazonaws.services.dynamodbv2.model.AttributeValue;
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 static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertEquals;
public class GetItemCommandTest {
private GetItemCommand command;
@@ -36,7 +37,7 @@ public class GetItemCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
index d37e2ed..e684d5b 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/PutItemCommandTest.java
@@ -24,10 +24,12 @@ import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class PutItemCommandTest {
@@ -36,7 +38,7 @@ public class PutItemCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
index 1925fba..24bbbcf 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/QueryCommandTest.java
@@ -28,10 +28,12 @@ import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class QueryCommandTest {
@@ -40,7 +42,7 @@ public class QueryCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
index 6e08867..1b928b3 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/ScanCommandTest.java
@@ -27,10 +27,12 @@ import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class ScanCommandTest {
@@ -39,7 +41,7 @@ public class ScanCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
index 76498e7..7f9a5ce 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateItemCommandTest.java
@@ -26,10 +26,12 @@ import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class UpdateItemCommandTest {
@@ -38,7 +40,7 @@ public class UpdateItemCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
index b768bfa..1bd6e41 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/UpdateTableCommandTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.aws.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 org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
-import static org.junit.Assert.assertEquals;
public class UpdateTableCommandTest {
@@ -31,7 +33,7 @@ public class UpdateTableCommandTest {
private DdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
ddbClient = new AmazonDDBClientMock();
configuration = new DdbConfiguration();
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
index 06fa004..839db6e 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddb/integration/DdbComponentIntegrationTest.java
@@ -29,11 +29,14 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.ddb.DdbConstants;
import org.apache.camel.component.aws.ddb.DdbOperations;
-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;
-@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-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java
index 8c53c48..579b150 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.ddbstream;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class DdbStreamComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtensionTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtensionTest.java
index fa83648..283c2c4 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentVerifierExtensionTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/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());
}
}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
index b22e287..d4c25d8 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamConsumerTest.java
@@ -36,24 +36,24 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DdbStreamConsumerTest {
private DdbStreamConsumer undertest;
@@ -70,7 +70,7 @@ public class DdbStreamConsumerTest {
private final DdbStreamEndpoint endpoint = new DdbStreamEndpoint(null, new DdbStreamConfiguration(), component);
private GetRecordsAnswer recordsAnswer;
- @Before
+ @BeforeEach
public void setup() throws Exception {
endpoint.getConfiguration().setAmazonDynamoDbStreamsClient(amazonDynamoDBStreams);
endpoint.start();
@@ -90,7 +90,7 @@ public class DdbStreamConsumerTest {
answers.put("shard_iterator_d_000", createRecords("21", "25"));
answers.put("shard_iterator_d_001", createRecords("30", "35", "40"));
recordsAnswer = new GetRecordsAnswer(shardIterators, answers);
- when(amazonDynamoDBStreams.getRecords(any(GetRecordsRequest.class))).thenAnswer(recordsAnswer);
+ lenient().when(amazonDynamoDBStreams.getRecords(any(GetRecordsRequest.class))).thenAnswer(recordsAnswer);
}
String pad(String num, int to) {
@@ -122,9 +122,9 @@ public class DdbStreamConsumerTest {
verify(processor, times(3)).process(exchangeCaptor.capture(), any(AsyncCallback.class));
verify(shardIteratorHandler, times(2)).getShardIterator(null); // first poll. Second poll, getRecords fails with an expired shard.
verify(shardIteratorHandler).getShardIterator("9"); // second poll, with a resumeFrom.
- assertThat(exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getDynamodb().getSequenceNumber(), is("9"));
- assertThat(exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getDynamodb().getSequenceNumber(), is("11"));
- assertThat(exchangeCaptor.getAllValues().get(2).getIn().getBody(Record.class).getDynamodb().getSequenceNumber(), is("13"));
+ assertEquals("9", exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getDynamodb().getSequenceNumber());
+ assertEquals("11", exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getDynamodb().getSequenceNumber());
+ assertEquals("13", exchangeCaptor.getAllValues().get(2).getIn().getBody(Record.class).getDynamodb().getSequenceNumber());
}
@Test
@@ -140,8 +140,8 @@ public class DdbStreamConsumerTest {
ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
verify(processor, times(2)).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getDynamodb().getSequenceNumber(), is("35"));
- assertThat(exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getDynamodb().getSequenceNumber(), is("40"));
+ assertEquals("35", exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getDynamodb().getSequenceNumber());
+ assertEquals("40", exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getDynamodb().getSequenceNumber());
}
@Test
@@ -157,7 +157,7 @@ public class DdbStreamConsumerTest {
ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
verify(processor, times(1)).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getDynamodb().getSequenceNumber(), is("40"));
+ assertEquals("40", exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getDynamodb().getSequenceNumber());
}
private static Collection<Record> createRecords(String... sequenceNumbers) {
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java
index d4c5dae..1713617 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java
@@ -20,25 +20,21 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class DdbStreamEndpointTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
private CamelContext context;
@@ -47,7 +43,7 @@ public class DdbStreamEndpointTest {
@Mock
private AmazonDynamoDBStreams amazonDynamoDBStreams;
- @Before
+ @BeforeEach
public void setup() throws Exception {
SimpleRegistry registry = new SimpleRegistry();
registry.bind("someSeqNumProv", sequenceNumberProvider);
@@ -65,7 +61,7 @@ public class DdbStreamEndpointTest {
+ "&iteratorType=AFTER_SEQUENCE_NUMBER"
+ "&sequenceNumberProvider=#someSeqNumProv");
- assertThat(undertest.getSequenceNumber(), is("seq"));
+ assertEquals("seq", undertest.getSequenceNumber());
}
@Test
@@ -76,7 +72,7 @@ public class DdbStreamEndpointTest {
+ "&iteratorType=AFTER_SEQUENCE_NUMBER"
+ "&sequenceNumberProvider=seq");
- assertThat(undertest.getSequenceNumber(), is("seq"));
+ assertEquals("seq", undertest.getSequenceNumber());
}
@Test
@@ -86,18 +82,21 @@ public class DdbStreamEndpointTest {
+ "&iteratorType=LATEST"
+ "&sequenceNumberProvider=#someSeqNumProv");
- assertThat(undertest.getSequenceNumber(), is(""));
+ assertEquals("", undertest.getSequenceNumber());
verify(sequenceNumberProvider, never()).getSequenceNumber();
}
@Test
public void sequenceNumberFetchingThrowsSomethingUsefulIfMisconfigurered() throws Exception {
- expectedException.expectMessage(containsString("sequenceNumberProvider"));
-
DdbStreamEndpoint undertest = (DdbStreamEndpoint)context.getEndpoint("aws-ddbstream://table"
+ "?amazonDynamoDbStreamsClient=#ddbStreamsClient"
+ "&iteratorType=AT_SEQUENCE_NUMBER"); // NOTE: missing sequence number provider parameter
- undertest.getSequenceNumber();
+ try {
+ undertest.getSequenceNumber();
+ fail("Expected exception");
+ } catch (IllegalStateException e) {
+ assertTrue(e.getMessage().contains("sequenceNumberProvider"));
+ }
}
}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java
index 67f0d12..1a444e1 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardIteratorHandlerTest.java
@@ -28,20 +28,24 @@ import com.amazonaws.services.dynamodbv2.model.Stream;
import com.amazonaws.services.dynamodbv2.model.StreamDescription;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class ShardIteratorHandlerTest {
private ShardIteratorHandler undertest;
@@ -52,20 +56,20 @@ public class ShardIteratorHandlerTest {
private final DdbStreamComponent component = new DdbStreamComponent(context);
private final DdbStreamEndpoint endpoint = new DdbStreamEndpoint(null, new DdbStreamConfiguration(), component);
- @Before
+ @BeforeEach
public void setup() throws Exception {
endpoint.getConfiguration().setAmazonDynamoDbStreamsClient(amazonDynamoDBStreams);
endpoint.start();
undertest = new ShardIteratorHandler(endpoint);
- when(amazonDynamoDBStreams.listStreams(any(ListStreamsRequest.class))).thenReturn(
+ lenient().when(amazonDynamoDBStreams.listStreams(any(ListStreamsRequest.class))).thenReturn(
new ListStreamsResult()
.withStreams(new Stream()
.withStreamArn("arn:aws:dynamodb:region:12345:table/table_name/stream/timestamp")
)
);
- when(amazonDynamoDBStreams.describeStream(any(DescribeStreamRequest.class))).thenReturn(
+ lenient().when(amazonDynamoDBStreams.describeStream(any(DescribeStreamRequest.class))).thenReturn(
new DescribeStreamResult()
.withStreamDescription(
new StreamDescription()
@@ -81,7 +85,7 @@ public class ShardIteratorHandlerTest {
)
);
- when(amazonDynamoDBStreams.getShardIterator(any(GetShardIteratorRequest.class))).thenAnswer(new Answer<GetShardIteratorResult>() {
+ lenient().when(amazonDynamoDBStreams.getShardIterator(any(GetShardIteratorRequest.class))).thenAnswer(new Answer<GetShardIteratorResult>() {
@Override
public GetShardIteratorResult answer(InvocationOnMock invocation) throws Throwable {
return new GetShardIteratorResult()
@@ -100,8 +104,8 @@ public class ShardIteratorHandlerTest {
ArgumentCaptor<GetShardIteratorRequest> getIteratorCaptor = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(amazonDynamoDBStreams).getShardIterator(getIteratorCaptor.capture());
- assertThat(getIteratorCaptor.getValue().getShardId(), is("d"));
- assertThat(shardIterator, is("shard_iterator_d_000"));
+ assertEquals("d", getIteratorCaptor.getValue().getShardId());
+ assertEquals("shard_iterator_d_000", shardIterator);
}
@Test
@@ -112,7 +116,7 @@ public class ShardIteratorHandlerTest {
String shardIterator = undertest.getShardIterator(null);
verify(amazonDynamoDBStreams, times(0)).getShardIterator(any(GetShardIteratorRequest.class));
- assertThat(shardIterator, is("bar"));
+ assertEquals("bar", shardIterator);
}
@Test
@@ -123,8 +127,8 @@ public class ShardIteratorHandlerTest {
ArgumentCaptor<GetShardIteratorRequest> getIteratorCaptor = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(amazonDynamoDBStreams).getShardIterator(getIteratorCaptor.capture());
- assertThat(getIteratorCaptor.getValue().getShardId(), is("a"));
- assertThat(shardIterator, is("shard_iterator_a_000"));
+ assertEquals("a", getIteratorCaptor.getValue().getShardId());
+ assertEquals("shard_iterator_a_000", shardIterator);
}
@Test
@@ -142,9 +146,9 @@ public class ShardIteratorHandlerTest {
verify(amazonDynamoDBStreams, times(4)).getShardIterator(getIteratorCaptor.capture());
String[] shards = new String[]{"a", "b", "c", "d"};
for (int i = 0; i < shards.length; ++i) {
- assertThat(getIteratorCaptor.getAllValues().get(i).getShardId(), is(shards[i]));
+ assertEquals(shards[i], getIteratorCaptor.getAllValues().get(i).getShardId());
}
- assertThat(shardIterators, is(new String[]{"shard_iterator_a_000", "shard_iterator_b_000", "shard_iterator_c_000", "shard_iterator_d_000"}));
+ assertArrayEquals(new String[]{"shard_iterator_a_000", "shard_iterator_b_000", "shard_iterator_c_000", "shard_iterator_d_000"}, shardIterators);
}
@@ -157,8 +161,8 @@ public class ShardIteratorHandlerTest {
ArgumentCaptor<GetShardIteratorRequest> getIteratorCaptor = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(amazonDynamoDBStreams).getShardIterator(getIteratorCaptor.capture());
- assertThat(getIteratorCaptor.getValue().getShardId(), is("b"));
- assertThat(shardIterator, is("shard_iterator_b_000"));
+ assertEquals("b", getIteratorCaptor.getValue().getShardId());
+ assertEquals("shard_iterator_b_000", shardIterator);
}
@Test
@@ -170,8 +174,8 @@ public class ShardIteratorHandlerTest {
ArgumentCaptor<GetShardIteratorRequest> getIteratorCaptor = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(amazonDynamoDBStreams).getShardIterator(getIteratorCaptor.capture());
- assertThat(getIteratorCaptor.getValue().getShardId(), is("d"));
- assertThat(shardIterator, is("shard_iterator_d_000"));
+ assertEquals("d", getIteratorCaptor.getValue().getShardId());
+ assertEquals("shard_iterator_d_000", shardIterator);
}
@Test
@@ -182,9 +186,9 @@ public class ShardIteratorHandlerTest {
ArgumentCaptor<GetShardIteratorRequest> getIteratorCaptor = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(amazonDynamoDBStreams).getShardIterator(getIteratorCaptor.capture());
- assertThat(getIteratorCaptor.getValue().getShardId(), is("b"));
- assertThat(shardIterator, is("shard_iterator_b_000"));
- assertThat(getIteratorCaptor.getValue().getShardIteratorType(), is(ShardIteratorType.AFTER_SEQUENCE_NUMBER.name()));
- assertThat(getIteratorCaptor.getValue().getSequenceNumber(), is("12"));
+ assertEquals("b", getIteratorCaptor.getValue().getShardId());
+ assertEquals("shard_iterator_b_000", shardIterator);
+ assertEquals(ShardIteratorType.AFTER_SEQUENCE_NUMBER.name(), getIteratorCaptor.getValue().getShardIteratorType());
+ assertEquals("12", getIteratorCaptor.getValue().getSequenceNumber());
}
}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAfterSequenceParametrisedTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAfterSequenceParametrisedTest.java
index 7a39f7a..9f62b09 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAfterSequenceParametrisedTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAfterSequenceParametrisedTest.java
@@ -20,28 +20,20 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(Parameterized.class)
+
+@ExtendWith(MockitoExtension.class)
public class ShardListAfterSequenceParametrisedTest {
private ShardList undertest;
- private final String inputSequenceNumber;
- private final String expectedShardId;
-
- public ShardListAfterSequenceParametrisedTest(String inputSequenceNumber, String expectedShardId) {
- this.inputSequenceNumber = inputSequenceNumber;
- this.expectedShardId = expectedShardId;
- }
-
- @Parameterized.Parameters
- public static Collection<Object[]> paramaters() {
+ public static Collection<Object[]> parameters() {
List<Object[]> results = new ArrayList<>();
results.add(new Object[]{"0", "a"});
results.add(new Object[]{"3", "a"});
@@ -55,7 +47,7 @@ public class ShardListAfterSequenceParametrisedTest {
return results;
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
undertest = new ShardList();
undertest.addAll(ShardListTest.createShardsWithSequenceNumbers(null,
@@ -66,8 +58,9 @@ public class ShardListAfterSequenceParametrisedTest {
));
}
- @Test
- public void assertions() throws Exception {
- assertThat(undertest.afterSeq(inputSequenceNumber).getShardId(), is(expectedShardId));
+ @ParameterizedTest
+ @MethodSource("parameters")
+ public void assertions(String inputSequenceNumber, String expectedShardId) throws Exception {
+ assertEquals(expectedShardId, undertest.afterSeq(inputSequenceNumber).getShardId());
}
}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAtSequenceParametrisedTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAtSequenceParametrisedTest.java
index fadbfb5..bd89162 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAtSequenceParametrisedTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListAtSequenceParametrisedTest.java
@@ -19,43 +19,33 @@ package org.apache.camel.component.aws.ddbstream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.stream.Stream;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(Parameterized.class)
public class ShardListAtSequenceParametrisedTest {
private ShardList undertest;
- private final String inputSequenceNumber;
- private final String expectedShardId;
-
- public ShardListAtSequenceParametrisedTest(String inputSequenceNumber, String expectedShardId) {
- this.inputSequenceNumber = inputSequenceNumber;
- this.expectedShardId = expectedShardId;
- }
-
- @Parameterized.Parameters
- public static Collection<Object[]> paramaters() {
- List<Object[]> results = new ArrayList<>();
- results.add(new Object[]{"0", "a"});
- results.add(new Object[]{"3", "a"});
- results.add(new Object[]{"6", "b"});
- results.add(new Object[]{"8", "b"});
- results.add(new Object[]{"15", "b"});
- results.add(new Object[]{"16", "c"});
- results.add(new Object[]{"18", "d"});
- results.add(new Object[]{"25", "d"});
- results.add(new Object[]{"30", "d"});
- return results;
+ public static Stream<Arguments> parameters() {
+ return Stream.of(
+ Arguments.of("0", "a"),
+ Arguments.of("3", "a"),
+ Arguments.of("6", "b"),
+ Arguments.of("8", "b"),
+ Arguments.of("15", "b"),
+ Arguments.of("16", "c"),
+ Arguments.of("18", "d"),
+ Arguments.of("25", "d"),
+ Arguments.of("30", "d")
+ );
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
undertest = new ShardList();
undertest.addAll(ShardListTest.createShardsWithSequenceNumbers(null,
@@ -66,8 +56,9 @@ public class ShardListAtSequenceParametrisedTest {
));
}
- @Test
- public void assertions() throws Exception {
- assertThat(undertest.atSeq(inputSequenceNumber).getShardId(), is(expectedShardId));
+ @ParameterizedTest
+ @MethodSource("parameters")
+ public void assertions(String inputSequenceNumber, String expectedShardId) throws Exception {
+ assertEquals(expectedShardId, undertest.atSeq(inputSequenceNumber).getShardId());
}
}
diff --git a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java
index c243d61..ea164ba 100644
--- a/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java
+++ b/components/camel-aws-ddb/src/test/java/org/apache/camel/component/aws/ddbstream/ShardListTest.java
@@ -21,10 +21,9 @@ import java.util.List;
import com.amazonaws.services.dynamodbv2.model.SequenceNumberRange;
import com.amazonaws.services.dynamodbv2.model.Shard;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ShardListTest {
@@ -41,7 +40,7 @@ public class ShardListTest {
shards.add(first);
shards.add(second);
- assertThat(shards.nextAfter(first), is(second));
+ assertEquals(second, shards.nextAfter(first));
}
@Test
@@ -56,7 +55,7 @@ public class ShardListTest {
shards.add(first);
shards.add(second);
- assertThat(shards.nextAfter(first), is(second));
+ assertEquals(second, shards.nextAfter(first));
}
@Test
@@ -71,7 +70,7 @@ public class ShardListTest {
shards.add(first);
shards.add(second);
- assertThat(shards.nextAfter(first), is(second));
+ assertEquals(second, shards.nextAfter(first));
Shard second2 = new Shard()
.withParentShardId("first_shard")
@@ -82,8 +81,8 @@ public class ShardListTest {
shards.add(second2);
shards.add(third);
- assertThat(shards.nextAfter(first), is(second));
- assertThat(shards.nextAfter(second), is(third));
+ assertEquals(second, shards.nextAfter(first));
+ assertEquals(third, shards.nextAfter(second));
}
@Test
@@ -91,7 +90,7 @@ public class ShardListTest {
ShardList shards = new ShardList();
shards.addAll(createShards(null, "a", "b", "c", "d"));
- assertThat(shards.first().getShardId(), is("a"));
+ assertEquals("a", shards.first().getShardId());
}
@Test
@@ -99,7 +98,7 @@ public class ShardListTest {
ShardList shards = new ShardList();
shards.addAll(createShards("a", "b", "c", "d"));
- assertThat(shards.first().getShardId(), is("b"));
+ assertEquals("b", shards.first().getShardId());
}
@Test
@@ -107,7 +106,7 @@ public class ShardListTest {
ShardList shards = new ShardList();
shards.addAll(createShards("a", "b", "c", "d"));
- assertThat(shards.last().getShardId(), is("d"));
+ assertEquals("d", shards.last().getShardId());
}
@Test
@@ -116,7 +115,8 @@ public class ShardListTest {
shards.addAll(createShards(null, "a", "b", "c", "d"));
Shard removeBefore = new Shard().withShardId("c").withParentShardId("b");
shards.removeOlderThan(removeBefore);
- assertThat(shards.first().getShardId(), is("c"));
+
+ assertEquals("c", shards.first().getShardId());
}
static List<Shard> createShardsWithSequenceNumbers(String initialParent, String... shardIdsAndSeqNos) {
diff --git a/components/camel-aws-ec2/pom.xml b/components/camel-aws-ec2/pom.xml
index 6bb950a..1528d3e 100644
--- a/components/camel-aws-ec2/pom.xml
+++ b/components/camel-aws-ec2/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentClientRegistryTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentClientRegistryTest.java
index 57fee6f..9413673 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentClientRegistryTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.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,11 @@ public class EC2ComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonEc2Client());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalEC2ClientMisconfiguration() throws Exception {
EC2Component component = context.getComponent("aws-ec2", EC2Component.class);
- EC2Endpoint endpoint = (EC2Endpoint)component.createEndpoint("aws-ec2://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ec2://TestDomain"));
}
}
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java
index d022af6..1684971 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurationTest.java
@@ -19,9 +19,13 @@ package org.apache.camel.component.aws.ec2;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.ec2.AmazonEC2Client;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
public class EC2ComponentConfigurationTest extends CamelTestSupport {
@@ -48,28 +52,32 @@ public class EC2ComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getAmazonEc2Client());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutDomainName() throws Exception {
EC2Component component = context.getComponent("aws-ec2", EC2Component.class);
- component.createEndpoint("aws-ec2:// ");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ec2:// "));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAmazonSDBClientConfiguration() throws Exception {
EC2Component component = context.getComponent("aws-ec2", EC2Component.class);
- component.createEndpoint("aws-ec2://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ec2://TestDomain"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
EC2Component component = context.getComponent("aws-ec2", EC2Component.class);
- component.createEndpoint("aws-ec2://TestDomain?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ec2://TestDomain?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
EC2Component component = context.getComponent("aws-ec2", EC2Component.class);
- component.createEndpoint("aws-ec2://TestDomain?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ec2://TestDomain?accessKey=xxx"));
}
@Test
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
index 1250f42..b911001 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentSpringTest.java
@@ -32,11 +32,13 @@ import com.amazonaws.services.ec2.model.TerminateInstancesResult;
import com.amazonaws.services.ec2.model.UnmonitorInstancesResult;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class EC2ComponentSpringTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtensionTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtensionTest.java
index a69b070..6b7fd20 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ComponentVerifierExtensionTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/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-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2OperationsTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2OperationsTest.java
index 0296377..d225386c 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2OperationsTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2OperationsTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.camel.component.aws.ec2;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertEquals;
public class EC2OperationsTest {
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
index f4a8660..39d0014 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/EC2ProducerTest.java
@@ -38,8 +38,12 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class EC2ProducerTest extends CamelTestSupport {
@@ -118,8 +122,8 @@ public class EC2ProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- assertTrue("Should be failed", exchange.isFailed());
- assertTrue("Should be IllegalArgumentException", exchange.getException() instanceof IllegalArgumentException);
+ assertTrue(exchange.isFailed(), "Should be failed");
+ assertTrue(exchange.getException() instanceof IllegalArgumentException, "Should be IllegalArgumentException");
assertEquals("AMI must be specified", exchange.getException().getMessage());
}
@@ -139,8 +143,8 @@ public class EC2ProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- assertTrue("Should be failed", exchange.isFailed());
- assertTrue("Should be IllegalArgumentException", exchange.getException() instanceof IllegalArgumentException);
+ assertTrue(exchange.isFailed(), "Should be failed");
+ assertTrue(exchange.getException() instanceof IllegalArgumentException, "Should be IllegalArgumentException");
assertEquals("Instance Type must be specified", exchange.getException().getMessage());
}
@@ -160,8 +164,8 @@ public class EC2ProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- assertTrue("Should be failed", exchange.isFailed());
- assertTrue("Should be IllegalArgumentException", exchange.getException() instanceof IllegalArgumentException);
+ assertTrue(exchange.isFailed(), "Should be failed");
+ assertTrue(exchange.getException() instanceof IllegalArgumentException, "Should be IllegalArgumentException");
assertEquals("Min instances count must be specified", exchange.getException().getMessage());
}
@@ -181,8 +185,8 @@ public class EC2ProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- assertTrue("Should be failed", exchange.isFailed());
- assertTrue("Should be IllegalArgumentException", exchange.getException() instanceof IllegalArgumentException);
+ assertTrue(exchange.isFailed(), "Should be failed");
+ assertTrue(exchange.getException() instanceof IllegalArgumentException, "Should be IllegalArgumentException");
assertEquals("Max instances count must be specified", exchange.getException().getMessage());
}
diff --git a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
index 8dd301b..6ca1229 100644
--- a/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
+++ b/components/camel-aws-ec2/src/test/java/org/apache/camel/component/aws/ec2/integration/EC2ComponentIntegrationTest.java
@@ -25,11 +25,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.ec2.EC2Constants;
import org.apache.camel.component.aws.ec2.EC2Operations;
-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;
-@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
diff --git a/components/camel-aws-ecs/pom.xml b/components/camel-aws-ecs/pom.xml
index a9fe486..c40716f 100644
--- a/components/camel-aws-ecs/pom.xml
+++ b/components/camel-aws-ecs/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
index 5de1ddf..926c457 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.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 ECSComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class ECSComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getEcsClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalECSClientMisconfiguration() throws Exception {
ECSComponent component = context.getComponent("aws-ecs", ECSComponent.class);
- ECSEndpoint endpoint = (ECSEndpoint)component.createEndpoint("aws-ecs://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ecs://TestDomain"));
}
}
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java
index 8efe838..7703348 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.ecs;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class ECSComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtensionTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtensionTest.java
index ee19d77..e8da07b 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtensionTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSComponentVerifierExtensionTest.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 ECSComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class ECSComponentVerifierExtensionTest 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 ECSComponentVerifierExtensionTest 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-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java
index 331c038..0657683 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerSpringTest.java
@@ -24,10 +24,12 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ECSProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java
index 7094b90..66eeb3b 100644
--- a/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java
+++ b/components/camel-aws-ecs/src/test/java/org/apache/camel/component/aws/ecs/ECSProducerTest.java
@@ -26,8 +26,10 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
public class ECSProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-eks/pom.xml b/components/camel-aws-eks/pom.xml
index 99db7fa..ee038e9 100644
--- a/components/camel-aws-eks/pom.xml
+++ b/components/camel-aws-eks/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentClientRegistryTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentClientRegistryTest.java
index 9b1867d..421c94c 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentClientRegistryTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.eks;
-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 EKSComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class EKSComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getEksClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalECSClientMisconfiguration() throws Exception {
EKSComponent component = context.getComponent("aws-eks", EKSComponent.class);
- EKSEndpoint endpoint = (EKSEndpoint)component.createEndpoint("aws-eks://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-eks://TestDomain"));
}
}
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java
index 595d059..b96987c 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.eks;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class EKSComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtensionTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtensionTest.java
index c3d88e6..4e04ac7 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtensionTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSComponentVerifierExtensionTest.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 EKSComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class EKSComponentVerifierExtensionTest 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 EKSComponentVerifierExtensionTest 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-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java
index cf0aa56..e1c4b06 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerSpringTest.java
@@ -25,10 +25,12 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class EKSProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java
index eff53b6..0de8f31 100644
--- a/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java
+++ b/components/camel-aws-eks/src/test/java/org/apache/camel/component/aws/eks/EKSProducerTest.java
@@ -27,8 +27,10 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
public class EKSProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-iam/pom.xml b/components/camel-aws-iam/pom.xml
index 60fa125..0ba32a7 100644
--- a/components/camel-aws-iam/pom.xml
+++ b/components/camel-aws-iam/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentClientRegistryTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentClientRegistryTest.java
index 9aca8da..047f040 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentClientRegistryTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.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,11 @@ public class IAMComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getIamClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalECSClientMisconfiguration() throws Exception {
IAMComponent component = context.getComponent("aws-iam", IAMComponent.class);
- IAMEndpoint endpoint = (IAMEndpoint)component.createEndpoint("aws-iam://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-iam://TestDomain"));
}
}
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java
index a94ec10..42c7599 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.iam;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class IAMComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtensionTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtensionTest.java
index f1cb81d..aa32337 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMComponentVerifierExtensionTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/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-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java
index 4f734f5..9e8b878 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerSpringTest.java
@@ -34,10 +34,13 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class IAMProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java
index cc4eb52..3012b48 100644
--- a/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java
+++ b/components/camel-aws-iam/src/test/java/org/apache/camel/component/aws/iam/IAMProducerTest.java
@@ -36,8 +36,11 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class IAMProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-kinesis/pom.xml b/components/camel-aws-kinesis/pom.xml
index 138ad35..25bf7de 100644
--- a/components/camel-aws-kinesis/pom.xml
+++ b/components/camel-aws-kinesis/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java
index ff6f286..d4b4622 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.firehose;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class KinesisFirehoseComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtensionTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtensionTest.java
index a74010a..860870d 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtensionTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentVerifierExtensionTest.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 KinesisFirehoseComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class KinesisFirehoseComponentVerifierExtensionTest extends CamelTestSupp
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 KinesisFirehoseComponentVerifierExtensionTest extends CamelTestSupp
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-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointTest.java
index dcf7dec..c12a7bb 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointTest.java
@@ -21,16 +21,15 @@ import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisFirehoseEndpointTest {
@Mock
@@ -38,7 +37,7 @@ public class KinesisFirehoseEndpointTest {
private CamelContext camelContext;
- @Before
+ @BeforeEach
public void setup() throws Exception {
SimpleRegistry registry = new SimpleRegistry();
registry.bind("firehoseClient", amazonKinesisFirehoseClient);
@@ -52,8 +51,8 @@ public class KinesisFirehoseEndpointTest {
);
endpoint.start();
- assertThat(endpoint.getClient(), is(amazonKinesisFirehoseClient));
- assertThat(endpoint.getConfiguration().getStreamName(), is("some_stream_name"));
+ assertEquals(amazonKinesisFirehoseClient, endpoint.getClient());
+ assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
}
@Test
@@ -62,9 +61,9 @@ public class KinesisFirehoseEndpointTest {
+ "?accessKey=xxx&secretKey=yyy®ion=us-east-1"
);
- assertThat(endpoint.getConfiguration().getRegion(), is(Regions.US_EAST_1.getName()));
- assertThat(endpoint.getConfiguration().getAccessKey(), is("xxx"));
- assertThat(endpoint.getConfiguration().getSecretKey(), is("yyy"));
- assertThat(endpoint.getConfiguration().getStreamName(), is("some_stream_name"));
+ assertEquals(Regions.US_EAST_1.getName(), endpoint.getConfiguration().getRegion());
+ assertEquals("xxx", endpoint.getConfiguration().getAccessKey());
+ assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
+ assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
}
}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java
index 7d4c6b8..b183154 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/KinesisFirehoseProducerTest.java
@@ -23,18 +23,18 @@ import com.amazonaws.services.kinesisfirehose.model.PutRecordRequest;
import com.amazonaws.services.kinesisfirehose.model.PutRecordResult;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisFirehoseProducerTest {
private static final String STREAM_NAME = "streams";
@@ -57,7 +57,7 @@ public class KinesisFirehoseProducerTest {
private KinesisFirehoseProducer kinesisFirehoseProducer;
- @Before
+ @BeforeEach
public void setup() throws Exception {
when(kinesisFirehoseEndpoint.getClient()).thenReturn(kinesisFirehoseClient);
when(kinesisFirehoseEndpoint.getConfiguration()).thenReturn(kinesisFirehoseConfiguration);
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
index 01ff6db..b67b187 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.firehose.KinesisFirehoseConstants;
-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;
public class KinesisFirehoseComponentIntegrationTest extends CamelTestSupport {
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
index d6d147b..720b2d8 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.kinesis;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class KinesisComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtensionTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtensionTest.java
index 3672990..cecdc54 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtensionTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisComponentVerifierExtensionTest.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 KinesisComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class KinesisComponentVerifierExtensionTest 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 KinesisComponentVerifierExtensionTest 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-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java
index 141d762..aa87c77 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithFailTest.java
@@ -32,20 +32,20 @@ import com.amazonaws.services.kinesis.model.StreamDescription;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisConsumerClosedShardWithFailTest {
@Mock
@@ -58,7 +58,7 @@ public class KinesisConsumerClosedShardWithFailTest {
private KinesisConsumer undertest;
- @Before
+ @BeforeEach
public void setup() throws Exception {
KinesisConfiguration configuration = new KinesisConfiguration();
configuration.setAmazonKinesisClient(kinesisClient);
@@ -81,19 +81,25 @@ public class KinesisConsumerClosedShardWithFailTest {
when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class))).thenReturn(new GetShardIteratorResult().withShardIterator("shardIterator"));
}
- @Test(expected = ReachedClosedStatusException.class)
+ @Test
public void itObtainsAShardIteratorOnFirstPoll() throws Exception {
- undertest.poll();
+ try {
+ undertest.poll();
- final ArgumentCaptor<DescribeStreamRequest> describeStreamReqCap = ArgumentCaptor.forClass(DescribeStreamRequest.class);
- final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
+ final ArgumentCaptor<DescribeStreamRequest> describeStreamReqCap = ArgumentCaptor.forClass(DescribeStreamRequest.class);
+ final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
- verify(kinesisClient).describeStream(describeStreamReqCap.capture());
- assertThat(describeStreamReqCap.getValue().getStreamName(), is("streamName"));
+ verify(kinesisClient).describeStream(describeStreamReqCap.capture());
+ assertEquals("streamName", describeStreamReqCap.getValue().getStreamName());
- verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardId"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("LATEST"));
+ verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardId", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("LATEST", getShardIteratorReqCap.getValue().getShardIteratorType());
+
+ fail("Expected ReachedClosedStatusException");
+ } catch (ReachedClosedStatusException e) {
+ // expected
+ }
}
}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java
index a7eb3e2..89fa8c3 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerClosedShardWithSilentTest.java
@@ -36,21 +36,21 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisConsumerClosedShardWithSilentTest {
@Mock
@@ -63,7 +63,7 @@ public class KinesisConsumerClosedShardWithSilentTest {
private KinesisConsumer undertest;
- @Before
+ @BeforeEach
public void setup() throws Exception {
KinesisConfiguration configuration = new KinesisConfiguration();
configuration.setAmazonKinesisClient(kinesisClient);
@@ -78,22 +78,18 @@ public class KinesisConsumerClosedShardWithSilentTest {
Shard shard = new Shard().withShardId("shardId").withSequenceNumberRange(range);
ArrayList<Shard> shardList = new ArrayList<>();
shardList.add(shard);
-
- when(kinesisClient.getRecords(any(GetRecordsRequest.class)))
+
+ lenient().when(kinesisClient.getRecords(any(GetRecordsRequest.class)))
.thenReturn(new GetRecordsResult()
- .withNextShardIterator("nextShardIterator")
- );
- when(kinesisClient.describeStream(any(DescribeStreamRequest.class)))
+ .withNextShardIterator("nextShardIterator"));
+ lenient().when(kinesisClient.describeStream(any(DescribeStreamRequest.class)))
.thenReturn(new DescribeStreamResult()
.withStreamDescription(new StreamDescription()
- .withShards(shardList)
- )
- );
- when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class)))
+ .withShards(shardList)));
+ lenient().when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class)))
.thenReturn(new GetShardIteratorResult()
- .withShardIterator("shardIterator")
- );
+ .withShardIterator("shardIterator"));
}
@Test
@@ -104,12 +100,12 @@ public class KinesisConsumerClosedShardWithSilentTest {
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(kinesisClient).describeStream(describeStreamReqCap.capture());
- assertThat(describeStreamReqCap.getValue().getStreamName(), is("streamName"));
+ assertEquals("streamName", describeStreamReqCap.getValue().getStreamName());
verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardId"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("LATEST"));
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardId", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("LATEST", getShardIteratorReqCap.getValue().getShardIteratorType());
}
@Test
@@ -121,9 +117,9 @@ public class KinesisConsumerClosedShardWithSilentTest {
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardIdPassedAsUrlParam"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("LATEST"));
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardIdPassedAsUrlParam", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("LATEST", getShardIteratorReqCap.getValue().getShardIteratorType());
}
@Test
@@ -137,13 +133,13 @@ public class KinesisConsumerClosedShardWithSilentTest {
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(kinesisClient).describeStream(describeStreamReqCap.capture());
- assertThat(describeStreamReqCap.getValue().getStreamName(), is("streamName"));
+ assertEquals("streamName", describeStreamReqCap.getValue().getStreamName());
verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardId"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("AFTER_SEQUENCE_NUMBER"));
- assertThat(getShardIteratorReqCap.getValue().getStartingSequenceNumber(), is("12345"));
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardId", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("AFTER_SEQUENCE_NUMBER", getShardIteratorReqCap.getValue().getShardIteratorType());
+ assertEquals("12345", getShardIteratorReqCap.getValue().getStartingSequenceNumber());
}
@@ -154,7 +150,7 @@ public class KinesisConsumerClosedShardWithSilentTest {
final ArgumentCaptor<GetRecordsRequest> getRecordsReqCap = ArgumentCaptor.forClass(GetRecordsRequest.class);
verify(kinesisClient).getRecords(getRecordsReqCap.capture());
- assertThat(getRecordsReqCap.getValue().getShardIterator(), is("shardIterator"));
+ assertEquals("shardIterator", getRecordsReqCap.getValue().getShardIterator());
}
@Test
@@ -167,8 +163,8 @@ public class KinesisConsumerClosedShardWithSilentTest {
verify(kinesisClient, times(1)).describeStream(any(DescribeStreamRequest.class));
verify(kinesisClient, times(1)).getShardIterator(any(GetShardIteratorRequest.class));
verify(kinesisClient, times(2)).getRecords(getRecordsReqCap.capture());
- assertThat(getRecordsReqCap.getAllValues().get(0).getShardIterator(), is("shardIterator"));
- assertThat(getRecordsReqCap.getAllValues().get(1).getShardIterator(), is("nextShardIterator"));
+ assertEquals("shardIterator", getRecordsReqCap.getAllValues().get(0).getShardIterator());
+ assertEquals("nextShardIterator", getRecordsReqCap.getAllValues().get(1).getShardIterator());
}
@Test
@@ -181,12 +177,12 @@ public class KinesisConsumerClosedShardWithSilentTest {
int messageCount = undertest.poll();
- assertThat(messageCount, is(2));
+ assertEquals(2, messageCount);
final ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
verify(processor, times(2)).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getSequenceNumber(), is("1"));
- assertThat(exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getSequenceNumber(), is("2"));
+ assertEquals("1", exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getSequenceNumber());
+ assertEquals("2", exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getSequenceNumber());
}
@Test
@@ -208,8 +204,8 @@ public class KinesisConsumerClosedShardWithSilentTest {
final ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
verify(processor).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME, long.class), is(42L));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.PARTITION_KEY, String.class), is(partitionKey));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER, String.class), is(sequenceNumber));
+ assertEquals(42L, exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME, long.class));
+ assertEquals(partitionKey, exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.PARTITION_KEY, String.class));
+ assertEquals(sequenceNumber, exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER, String.class));
}
}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
index 62b5b59..f9d8812 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
@@ -36,21 +36,21 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisConsumerTest {
@Mock
@@ -63,7 +63,7 @@ public class KinesisConsumerTest {
private KinesisConsumer undertest;
- @Before
+ @BeforeEach
public void setup() throws Exception {
KinesisConfiguration configuration = new KinesisConfiguration();
configuration.setAmazonKinesisClient(kinesisClient);
@@ -78,22 +78,18 @@ public class KinesisConsumerTest {
Shard shard = new Shard().withShardId("shardId").withSequenceNumberRange(range);
ArrayList<Shard> shardList = new ArrayList<>();
shardList.add(shard);
-
- when(kinesisClient.getRecords(any(GetRecordsRequest.class)))
+
+ lenient().when(kinesisClient.getRecords(any(GetRecordsRequest.class)))
.thenReturn(new GetRecordsResult()
- .withNextShardIterator("nextShardIterator")
- );
- when(kinesisClient.describeStream(any(DescribeStreamRequest.class)))
+ .withNextShardIterator("nextShardIterator"));
+ lenient().when(kinesisClient.describeStream(any(DescribeStreamRequest.class)))
.thenReturn(new DescribeStreamResult()
.withStreamDescription(new StreamDescription()
- .withShards(shardList)
- )
- );
- when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class)))
+ .withShards(shardList)));
+ lenient().when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class)))
.thenReturn(new GetShardIteratorResult()
- .withShardIterator("shardIterator")
- );
+ .withShardIterator("shardIterator"));
}
@Test
@@ -104,12 +100,12 @@ public class KinesisConsumerTest {
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(kinesisClient).describeStream(describeStreamReqCap.capture());
- assertThat(describeStreamReqCap.getValue().getStreamName(), is("streamName"));
+ assertEquals("streamName", describeStreamReqCap.getValue().getStreamName());
verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardId"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("LATEST"));
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardId", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("LATEST", getShardIteratorReqCap.getValue().getShardIteratorType());
}
@Test
@@ -121,9 +117,9 @@ public class KinesisConsumerTest {
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardIdPassedAsUrlParam"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("LATEST"));
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardIdPassedAsUrlParam", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("LATEST", getShardIteratorReqCap.getValue().getShardIteratorType());
}
@Test
@@ -137,13 +133,13 @@ public class KinesisConsumerTest {
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
verify(kinesisClient).describeStream(describeStreamReqCap.capture());
- assertThat(describeStreamReqCap.getValue().getStreamName(), is("streamName"));
+ assertEquals("streamName", describeStreamReqCap.getValue().getStreamName());
verify(kinesisClient).getShardIterator(getShardIteratorReqCap.capture());
- assertThat(getShardIteratorReqCap.getValue().getStreamName(), is("streamName"));
- assertThat(getShardIteratorReqCap.getValue().getShardId(), is("shardId"));
- assertThat(getShardIteratorReqCap.getValue().getShardIteratorType(), is("AFTER_SEQUENCE_NUMBER"));
- assertThat(getShardIteratorReqCap.getValue().getStartingSequenceNumber(), is("12345"));
+ assertEquals("streamName", getShardIteratorReqCap.getValue().getStreamName());
+ assertEquals("shardId", getShardIteratorReqCap.getValue().getShardId());
+ assertEquals("AFTER_SEQUENCE_NUMBER", getShardIteratorReqCap.getValue().getShardIteratorType());
+ assertEquals("12345", getShardIteratorReqCap.getValue().getStartingSequenceNumber());
}
@@ -154,7 +150,7 @@ public class KinesisConsumerTest {
final ArgumentCaptor<GetRecordsRequest> getRecordsReqCap = ArgumentCaptor.forClass(GetRecordsRequest.class);
verify(kinesisClient).getRecords(getRecordsReqCap.capture());
- assertThat(getRecordsReqCap.getValue().getShardIterator(), is("shardIterator"));
+ assertEquals("shardIterator", getRecordsReqCap.getValue().getShardIterator());
}
@Test
@@ -167,8 +163,8 @@ public class KinesisConsumerTest {
verify(kinesisClient, times(1)).describeStream(any(DescribeStreamRequest.class));
verify(kinesisClient, times(1)).getShardIterator(any(GetShardIteratorRequest.class));
verify(kinesisClient, times(2)).getRecords(getRecordsReqCap.capture());
- assertThat(getRecordsReqCap.getAllValues().get(0).getShardIterator(), is("shardIterator"));
- assertThat(getRecordsReqCap.getAllValues().get(1).getShardIterator(), is("nextShardIterator"));
+ assertEquals("shardIterator", getRecordsReqCap.getAllValues().get(0).getShardIterator());
+ assertEquals("nextShardIterator", getRecordsReqCap.getAllValues().get(1).getShardIterator());
}
@Test
@@ -181,12 +177,12 @@ public class KinesisConsumerTest {
int messageCount = undertest.poll();
- assertThat(messageCount, is(2));
+ assertEquals(2, messageCount);
final ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
verify(processor, times(2)).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getSequenceNumber(), is("1"));
- assertThat(exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getSequenceNumber(), is("2"));
+ assertEquals("1", exchangeCaptor.getAllValues().get(0).getIn().getBody(Record.class).getSequenceNumber());
+ assertEquals("2", exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).getSequenceNumber());
}
@Test
@@ -208,9 +204,9 @@ public class KinesisConsumerTest {
final ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
verify(processor).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME, long.class), is(42L));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.PARTITION_KEY, String.class), is(partitionKey));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER, String.class), is(sequenceNumber));
+ assertEquals(42L, exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME, long.class));
+ assertEquals(partitionKey, exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.PARTITION_KEY, String.class));
+ assertEquals(sequenceNumber, exchangeCaptor.getValue().getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER, String.class));
}
}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisEndpointTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisEndpointTest.java
index 53330da..4028bc4 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisEndpointTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisEndpointTest.java
@@ -21,16 +21,16 @@ import com.amazonaws.services.kinesis.model.ShardIteratorType;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(MockitoJUnitRunner.class)
+
+@ExtendWith(MockitoExtension.class)
public class KinesisEndpointTest {
@Mock
@@ -38,7 +38,7 @@ public class KinesisEndpointTest {
private CamelContext camelContext;
- @Before
+ @BeforeEach
public void setup() throws Exception {
SimpleRegistry registry = new SimpleRegistry();
registry.bind("kinesisClient", amazonKinesisClient);
@@ -55,12 +55,12 @@ public class KinesisEndpointTest {
+ "&sequenceNumber=123"
);
- assertThat(endpoint.getConfiguration().getAmazonKinesisClient(), is(amazonKinesisClient));
- assertThat(endpoint.getConfiguration().getStreamName(), is("some_stream_name"));
- assertThat(endpoint.getConfiguration().getIteratorType(), is(ShardIteratorType.LATEST));
- assertThat(endpoint.getConfiguration().getMaxResultsPerRequest(), is(101));
- assertThat(endpoint.getConfiguration().getSequenceNumber(), is("123"));
- assertThat(endpoint.getConfiguration().getShardId(), is("abc"));
+ assertEquals(amazonKinesisClient, endpoint.getConfiguration().getAmazonKinesisClient());
+ assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
+ assertEquals(ShardIteratorType.LATEST, endpoint.getConfiguration().getIteratorType());
+ assertEquals(101, endpoint.getConfiguration().getMaxResultsPerRequest());
+ assertEquals("123", endpoint.getConfiguration().getSequenceNumber());
+ assertEquals("abc", endpoint.getConfiguration().getShardId());
}
@Test
@@ -69,10 +69,10 @@ public class KinesisEndpointTest {
+ "?amazonKinesisClient=#kinesisClient"
);
- assertThat(endpoint.getConfiguration().getAmazonKinesisClient(), is(amazonKinesisClient));
- assertThat(endpoint.getConfiguration().getStreamName(), is("some_stream_name"));
- assertThat(endpoint.getConfiguration().getIteratorType(), is(ShardIteratorType.TRIM_HORIZON));
- assertThat(endpoint.getConfiguration().getMaxResultsPerRequest(), is(1));
+ assertEquals(amazonKinesisClient, endpoint.getConfiguration().getAmazonKinesisClient());
+ assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
+ assertEquals(ShardIteratorType.TRIM_HORIZON, endpoint.getConfiguration().getIteratorType());
+ assertEquals(1, endpoint.getConfiguration().getMaxResultsPerRequest());
}
@Test
@@ -84,11 +84,11 @@ public class KinesisEndpointTest {
+ "&sequenceNumber=123"
);
- assertThat(endpoint.getConfiguration().getAmazonKinesisClient(), is(amazonKinesisClient));
- assertThat(endpoint.getConfiguration().getStreamName(), is("some_stream_name"));
- assertThat(endpoint.getConfiguration().getIteratorType(), is(ShardIteratorType.AFTER_SEQUENCE_NUMBER));
- assertThat(endpoint.getConfiguration().getShardId(), is("abc"));
- assertThat(endpoint.getConfiguration().getSequenceNumber(), is("123"));
+ assertEquals(amazonKinesisClient, endpoint.getConfiguration().getAmazonKinesisClient());
+ assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
+ assertEquals(ShardIteratorType.AFTER_SEQUENCE_NUMBER, endpoint.getConfiguration().getIteratorType());
+ assertEquals("abc", endpoint.getConfiguration().getShardId());
+ assertEquals("123", endpoint.getConfiguration().getSequenceNumber());
}
@Test
@@ -100,10 +100,10 @@ public class KinesisEndpointTest {
+ "&sequenceNumber=123"
);
- assertThat(endpoint.getConfiguration().getAmazonKinesisClient(), is(amazonKinesisClient));
- assertThat(endpoint.getConfiguration().getStreamName(), is("some_stream_name"));
- assertThat(endpoint.getConfiguration().getIteratorType(), is(ShardIteratorType.AT_SEQUENCE_NUMBER));
- assertThat(endpoint.getConfiguration().getShardId(), is("abc"));
- assertThat(endpoint.getConfiguration().getSequenceNumber(), is("123"));
+ assertEquals(amazonKinesisClient, endpoint.getConfiguration().getAmazonKinesisClient());
+ assertEquals("some_stream_name", endpoint.getConfiguration().getStreamName());
+ assertEquals(ShardIteratorType.AT_SEQUENCE_NUMBER, endpoint.getConfiguration().getIteratorType());
+ assertEquals("abc", endpoint.getConfiguration().getShardId());
+ assertEquals("123", endpoint.getConfiguration().getSequenceNumber());
}
}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java
index bc21e41..9aceaf0 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/KinesisProducerTest.java
@@ -23,20 +23,20 @@ import com.amazonaws.services.kinesis.model.PutRecordRequest;
import com.amazonaws.services.kinesis.model.PutRecordResult;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisProducerTest {
private static final String SHARD_ID = "SHARD145";
private static final String SEQUENCE_NUMBER = "SEQ123";
@@ -62,7 +62,7 @@ public class KinesisProducerTest {
private KinesisProducer kinesisProducer;
- @Before
+ @BeforeEach
public void setup() throws Exception {
when(kinesisEndpoint.getClient()).thenReturn(kinesisClient);
when(kinesisEndpoint.getConfiguration()).thenReturn(kinesisConfiguration);
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java
index 820098a..535a7cf 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/RecordStringConverterTest.java
@@ -20,10 +20,10 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import com.amazonaws.services.kinesis.model.Record;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
public class RecordStringConverterTest {
@@ -34,6 +34,6 @@ public class RecordStringConverterTest {
.withData(ByteBuffer.wrap("this is a String".getBytes(Charset.forName("UTF-8"))));
String result = RecordStringConverter.toString(record);
- assertThat(result, is("this is a String"));
+ assertEquals("this is a String", result);
}
}
diff --git a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
index 804c683..da61f68 100644
--- a/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
+++ b/components/camel-aws-kinesis/src/test/java/org/apache/camel/component/aws/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -29,11 +29,15 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.kinesis.KinesisConstants;
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;
-@Ignore("Must be manually tested.")
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested.")
public class KinesisComponentIntegrationTest extends CamelTestSupport {
@BindToRegistry("amazonKinesisClient")
diff --git a/components/camel-aws-kms/pom.xml b/components/camel-aws-kms/pom.xml
index 5565405..c0496c2 100644
--- a/components/camel-aws-kms/pom.xml
+++ b/components/camel-aws-kms/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java
index ca1434a..cac6b9b 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.kms;
-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 KMSComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class KMSComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getKmsClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalKMSClientMisconfiguration() throws Exception {
KMSComponent component = context.getComponent("aws-kms", KMSComponent.class);
- KMSEndpoint endpoint = (KMSEndpoint)component.createEndpoint("aws-kms://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-kms://TestDomain"));
}
}
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
index bded042..b2868ad 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.kms;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class KMSComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtensionTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtensionTest.java
index 7530bfb..15c8e05 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtensionTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSComponentVerifierExtensionTest.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 KMSComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class KMSComponentVerifierExtensionTest 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 KMSComponentVerifierExtensionTest 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-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
index c3affef..7d3678c 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerSpringTest.java
@@ -24,10 +24,13 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
public class KMSProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java
index 0499e73..704989f 100644
--- a/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java
+++ b/components/camel-aws-kms/src/test/java/org/apache/camel/component/aws/kms/KMSProducerTest.java
@@ -26,8 +26,11 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class KMSProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-lambda/pom.xml b/components/camel-aws-lambda/pom.xml
index cb6ac94..b8e4cfb 100644
--- a/components/camel-aws-lambda/pom.xml
+++ b/components/camel-aws-lambda/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
index 573aa3b..003dde9 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentClientRegistryTest.java
@@ -18,9 +18,11 @@ package org.apache.camel.component.aws.lambda;
import com.amazonaws.services.lambda.AWSLambdaClient;
import org.apache.camel.PropertyBindingException;
-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;
import static org.mockito.Mockito.mock;
public class LambdaComponentClientRegistryTest extends CamelTestSupport {
@@ -37,11 +39,12 @@ public class LambdaComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAwsLambdaClient());
}
- @Test(expected = PropertyBindingException.class)
+ @Test
public void createEndpointWithMinimalKMSClientMisconfiguration() throws Exception {
LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
- LambdaEndpoint endpoint = (LambdaEndpoint) component.createEndpoint(
- "aws-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy");
+ assertThrows(PropertyBindingException.class,
+ () -> component.createEndpoint(
+ "aws-lambda://myFunction?operation=getFunction&awsLambdaClient=#awsLambdaClient&accessKey=xxx&secretKey=yyy"));
}
}
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
index d903173..177c328 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurationTest.java
@@ -19,9 +19,12 @@ package org.apache.camel.component.aws.lambda;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.lambda.AWSLambdaClient;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
public class LambdaComponentConfigurationTest extends CamelTestSupport {
@@ -39,28 +42,32 @@ public class LambdaComponentConfigurationTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAwsLambdaClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutOperation() throws Exception {
LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
- component.createEndpoint("aws-lambda://myFunction");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-lambda://myFunction"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAmazonLambdaClientConfiguration() throws Exception {
LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
- component.createEndpoint("aws-lambda://myFunction?operation=getFunction");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-lambda://myFunction?operation=getFunction"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
- component.createEndpoint("aws-lambda://myFunction?operation=getFunction&secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-lambda://myFunction?operation=getFunction&secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
LambdaComponent component = context.getComponent("aws-lambda", LambdaComponent.class);
- component.createEndpoint("aws-lambda://myFunction?operation=getFunction&accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-lambda://myFunction?operation=getFunction&accessKey=xxx"));
}
@Test
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
index c560b70..ddf0a98 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentSpringTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.aws.lambda;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -42,11 +43,15 @@ import com.amazonaws.util.IOUtils;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class LambdaComponentSpringTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtensionTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtensionTest.java
index f2638ea..a369bba 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtensionTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaComponentVerifierExtensionTest.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 LambdaComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class LambdaComponentVerifierExtensionTest 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 LambdaComponentVerifierExtensionTest 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-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java
index e8e9dfa..af0a277 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaOperationsTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.aws.lambda;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LambdaOperationsTest {
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerDefaultFunctionTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerDefaultFunctionTest.java
index f5026ad..7289180 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerDefaultFunctionTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerDefaultFunctionTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.ExchangePattern;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class LambdaProducerDefaultFunctionTest extends CamelTestSupport {
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
index 250e79d..2cb430b 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/LambdaProducerTest.java
@@ -48,8 +48,12 @@ import org.apache.camel.ExchangePattern;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LambdaProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java
index 8f141e1..88039a2 100644
--- a/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java
+++ b/components/camel-aws-lambda/src/test/java/org/apache/camel/component/aws/lambda/integration/LambdaComponentIntegrationTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.aws.lambda.integration;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
import com.amazonaws.services.lambda.model.CreateFunctionResult;
import com.amazonaws.services.lambda.model.DeleteFunctionResult;
@@ -28,11 +29,14 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.lambda.LambdaConstants;
-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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class LambdaComponentIntegrationTest extends CamelTestSupport {
diff --git a/components/camel-aws-mq/pom.xml b/components/camel-aws-mq/pom.xml
index 4e5e7e9..9f65897 100644
--- a/components/camel-aws-mq/pom.xml
+++ b/components/camel-aws-mq/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java
index 80fcafd..a12ce97 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.mq;
-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 MQComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class MQComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonMqClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalMQClientMisconfiguration() throws Exception {
MQComponent component = context.getComponent("aws-mq", MQComponent.class);
- MQEndpoint endpoint = (MQEndpoint) component.createEndpoint("aws-mq://MyQueue");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-mq://MyQueue"));
}
}
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
index 490dfea..39c3b0a 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.mq;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class MQComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.java
index e832ccf..7a3acd4 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQComponentVerifierExtensionTest.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 MQComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class MQComponentVerifierExtensionTest 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 MQComponentVerifierExtensionTest 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-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
index 7a5a727..b45c3a6 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
@@ -33,10 +33,12 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MQProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
index a7cf82e..bbb7bde 100644
--- a/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
+++ b/components/camel-aws-mq/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
@@ -35,8 +35,10 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
public class MQProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-msk/pom.xml b/components/camel-aws-msk/pom.xml
index efad28c..9032a94 100644
--- a/components/camel-aws-msk/pom.xml
+++ b/components/camel-aws-msk/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentClientRegistryTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentClientRegistryTest.java
index c94a568..22bfa8e 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentClientRegistryTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.msk;
-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 MSKComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class MSKComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getMskClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalMSKClientMisconfiguration() throws Exception {
MSKComponent component = context.getComponent("aws-msk", MSKComponent.class);
- MSKEndpoint endpoint = (MSKEndpoint) component.createEndpoint("aws-msk://label");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-msk://label"));
}
}
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
index 8d02369..f2804e0 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentConfigurationTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.aws.msk;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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;
public class MSKComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java
index 2b302a8..d497744 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKComponentVerifierExtensionTest.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 MSKComponentVerifierExtensionTest extends CamelTestSupport {
@@ -50,7 +51,7 @@ public class MSKComponentVerifierExtensionTest 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 MSKComponentVerifierExtensionTest 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-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
index 6efee6b..ad11d67 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerSpringTest.java
@@ -26,10 +26,12 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MSKProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
index f08bbfa..5a94a97 100644
--- a/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
+++ b/components/camel-aws-msk/src/test/java/org/apache/camel/component/aws/msk/MSKProducerTest.java
@@ -28,8 +28,10 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
public class MSKProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/pom.xml b/components/camel-aws-s3/pom.xml
index d5ab314..afb4bc3 100644
--- a/components/camel-aws-s3/pom.xml
+++ b/components/camel-aws-s3/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java
index 154e771..2f75dca 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AWSS3ClientFactoryTest.java
@@ -20,8 +20,9 @@ import org.apache.camel.component.aws.s3.client.S3Client;
import org.apache.camel.component.aws.s3.client.S3ClientFactory;
import org.apache.camel.component.aws.s3.client.impl.S3ClientIAMOptimizedImpl;
import org.apache.camel.component.aws.s3.client.impl.S3ClientStandardImpl;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AWSS3ClientFactoryTest {
private static final int MAX_CONNECTIONS = 1;
@@ -30,7 +31,7 @@ public class AWSS3ClientFactoryTest {
public void getStandardS3ClientDefault() {
S3Configuration s3Configuration = new S3Configuration();
S3Client awss3Client = S3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
- Assert.assertTrue(awss3Client instanceof S3ClientStandardImpl);
+ assertTrue(awss3Client instanceof S3ClientStandardImpl);
}
@Test
@@ -38,7 +39,7 @@ public class AWSS3ClientFactoryTest {
S3Configuration s3Configuration = new S3Configuration();
s3Configuration.setUseIAMCredentials(false);
S3Client awss3Client = S3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
- Assert.assertTrue(awss3Client instanceof S3ClientStandardImpl);
+ assertTrue(awss3Client instanceof S3ClientStandardImpl);
}
@Test
@@ -46,6 +47,6 @@ public class AWSS3ClientFactoryTest {
S3Configuration s3Configuration = new S3Configuration();
s3Configuration.setUseIAMCredentials(true);
S3Client awss3Client = S3ClientFactory.getAWSS3Client(s3Configuration, MAX_CONNECTIONS);
- Assert.assertTrue(awss3Client instanceof S3ClientIAMOptimizedImpl);
+ assertTrue(awss3Client instanceof S3ClientIAMOptimizedImpl);
}
}
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 7e4d8c5..cc2b471 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -76,7 +76,8 @@ import com.amazonaws.services.s3.model.UploadPartRequest;
import com.amazonaws.services.s3.model.UploadPartResult;
import com.amazonaws.services.s3.model.VersionListing;
import org.apache.camel.util.ObjectHelper;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AmazonS3ClientMock extends AbstractAmazonS3 {
@@ -417,8 +418,8 @@ public class AmazonS3ClientMock extends AbstractAmazonS3 {
@Override
public void setBucketPolicy(String bucketName, String policyText) throws AmazonClientException, AmazonServiceException {
- Assert.assertEquals("nonExistingBucket", bucketName);
- Assert.assertEquals("xxx", policyText);
+ assertEquals("nonExistingBucket", bucketName);
+ assertEquals("xxx", policyText);
}
@Override
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
index 5001f57..eb98405 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/AmazonS3EncryptionClientMock.java
@@ -75,7 +75,8 @@ import com.amazonaws.services.s3.model.UploadPartRequest;
import com.amazonaws.services.s3.model.UploadPartResult;
import com.amazonaws.services.s3.model.VersionListing;
import org.apache.camel.util.ObjectHelper;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AmazonS3EncryptionClientMock extends AbstractAmazonS3 {
@@ -407,8 +408,8 @@ public class AmazonS3EncryptionClientMock extends AbstractAmazonS3 {
@Override
public void setBucketPolicy(String bucketName, String policyText) throws AmazonClientException, AmazonServiceException {
- Assert.assertEquals("nonExistingBucket", bucketName);
- Assert.assertEquals("xxx", policyText);
+ assertEquals("nonExistingBucket", bucketName);
+ assertEquals("xxx", policyText);
}
@Override
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
index f537d94..51329c0 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerMaxMessagesPerPollTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
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;
public class S3BatchConsumerMaxMessagesPerPollTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
index 91fa4a9..1f4a516 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3BatchConsumerTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
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;
public class S3BatchConsumerTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentClientRegistryTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentClientRegistryTest.java
index 913e1fe..2bf125b 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentClientRegistryTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentClientRegistryTest.java
@@ -16,8 +16,14 @@
*/
package org.apache.camel.component.aws.s3;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class S3ComponentClientRegistryTest extends CamelTestSupport {
@@ -39,10 +45,11 @@ public class S3ComponentClientRegistryTest extends CamelTestSupport {
assertTrue(endpoint.getConfiguration().isIncludeBody());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalS3ClientMisconfiguration() throws Exception {
S3Component component = context.getComponent("aws-s3", S3Component.class);
- S3Endpoint endpoint = (S3Endpoint)component.createEndpoint("aws-s3://MyBucket");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-s3://MyBucket"));
}
}
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
index ad11884..11d9c92 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentConfigurationTest.java
@@ -18,8 +18,16 @@ package org.apache.camel.component.aws.s3;
import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
import com.amazonaws.regions.Regions;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class S3ComponentConfigurationTest extends CamelTestSupport {
@@ -115,22 +123,25 @@ public class S3ComponentConfigurationTest extends CamelTestSupport {
assertFalse(endpoint.getConfiguration().isIncludeBody());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutBucketName() throws Exception {
S3Component component = context.getComponent("aws-s3", S3Component.class);
- component.createEndpoint("aws-s3:// ");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-s3:// "));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
S3Component component = context.getComponent("aws-s3", S3Component.class);
- component.createEndpoint("aws-s3://MyTopic?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-s3://MyTopic?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
S3Component component = context.getComponent("aws-s3", S3Component.class);
- component.createEndpoint("aws-s3://MyTopic?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-s3://MyTopic?accessKey=xxx"));
}
@Test
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
index eef2118..156725e 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentContentLengthFileTest.java
@@ -32,11 +32,17 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.FileUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentContentLengthFileTest extends CamelTestSupport {
@@ -58,7 +64,7 @@ public class S3ComponentContentLengthFileTest extends CamelTestSupport {
return "mycamelbucket";
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
super.setUp();
@@ -70,7 +76,7 @@ public class S3ComponentContentLengthFileTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
index 78546b7..9127719 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectEncryptionTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentCopyObjectEncryptionTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectSpringTest.java
index 57a6b96..aa72cb8 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectSpringTest.java
@@ -22,10 +22,13 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
public class S3ComponentCopyObjectSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
index d62fda4..8f71f94 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentCopyObjectTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentCopyObjectTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectSpringTest.java
index 6107509..3790207 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectSpringTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class S3ComponentDeleteObjectSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
index c7b5d51..dadf74d 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDeleteObjectTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
public class S3ComponentDeleteObjectTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkSpringTest.java
index 195cab3..bb30b87 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkSpringTest.java
@@ -23,11 +23,13 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class S3ComponentDownloadLinkSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:downloadLink")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
index d1a3559..1297f1e9 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentDownloadLinkTest.java
@@ -25,8 +25,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
public class S3ComponentDownloadLinkTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
index 5d1e5a5..df0b38a 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
@@ -31,8 +31,13 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentExistingBucketTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileDeleteTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileDeleteTest.java
index bfd1272..ad79838 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileDeleteTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileDeleteTest.java
@@ -20,7 +20,10 @@ import com.amazonaws.services.s3.model.PutObjectRequest;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class S3ComponentFileDeleteTest extends S3ComponentFileTest {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
index d4ce34b..2f6ba7e 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
@@ -31,11 +31,17 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.FileUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentFileTest extends CamelTestSupport {
@@ -57,7 +63,7 @@ public class S3ComponentFileTest extends CamelTestSupport {
return "mycamelbucket";
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
super.setUp();
@@ -69,7 +75,7 @@ public class S3ComponentFileTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectRangeTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectRangeTest.java
index 8e05691..c7448a8 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectRangeTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectRangeTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
public class S3ComponentGetObjectRangeTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
index b94a1fa..3a0887f 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentGetObjectTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
public class S3ComponentGetObjectTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
index 98cf523..96211b1 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentKeyNameFileTest.java
@@ -32,11 +32,17 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.FileUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentKeyNameFileTest extends CamelTestSupport {
@@ -58,7 +64,7 @@ public class S3ComponentKeyNameFileTest extends CamelTestSupport {
return "mycamelbucket";
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
super.setUp();
@@ -70,7 +76,7 @@ public class S3ComponentKeyNameFileTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
index 1a24f31..2ac9e0f 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsSpringTest.java
@@ -24,10 +24,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class S3ComponentListBucketsSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:listBuckets")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
index 58812c0..0e0f6d4 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListBucketsTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
public class S3ComponentListBucketsTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
index 546096e..897e190 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
public class S3ComponentListObjectTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java
index 93a2f5a..f92fbb0 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentListObjectsSpringTest.java
@@ -22,10 +22,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class S3ComponentListObjectsSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:listBuckets")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
index b1571df..d2e0d66 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentNonExistingBucketTest.java
@@ -31,8 +31,12 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentNonExistingBucketTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentSpringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentSpringTest.java
index 59fc0f8..91c5b6a 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentSpringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentSpringTest.java
@@ -25,10 +25,14 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
public class S3ComponentSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
index e3f5adc..932bc94 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentStringTest.java
@@ -28,8 +28,12 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class S3ComponentStringTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtensionTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtensionTest.java
index 0fad1d5..04d5461 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtensionTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ComponentVerifierExtensionTest.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 S3ComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class S3ComponentVerifierExtensionTest 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 S3ComponentVerifierExtensionTest 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-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
index 75c4fa4..7f16253 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerCronTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.aws.s3;
import org.apache.camel.BindToRegistry;
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 static org.junit.jupiter.api.Assertions.assertTrue;
public class S3ConsumerCronTest extends CamelTestSupport {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java
index 0cfc75b..f812ec0 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerDelimiterTest.java
@@ -31,8 +31,10 @@ import com.amazonaws.util.StringInputStream;
import org.apache.camel.BindToRegistry;
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 static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
index 43756bb..31b559b 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerIdleMessageTest.java
@@ -21,9 +21,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
index 52daf50..8ffee15 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3ConsumerPrefixTest.java
@@ -31,8 +31,10 @@ import com.amazonaws.util.StringInputStream;
import org.apache.camel.BindToRegistry;
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 static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
index 50ad0fd..2eab731 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/S3IncludeBodyTest.java
@@ -31,8 +31,11 @@ import com.amazonaws.util.StringInputStream;
import org.apache.camel.BindToRegistry;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Test to verify that the body is not retrieved when the includeBody option is
@@ -49,7 +52,7 @@ public class S3IncludeBodyTest extends CamelTestSupport {
mock.expectedMessageCount(1);
assertMockEndpointsSatisfied();
- assertNull("Expected body to be empty", mock.getExchanges().get(0).getIn().getBody(String.class));
+ assertNull(mock.getExchanges().get(0).getIn().getBody(String.class), "Expected body to be empty");
}
@Override
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
index 7c195ec..d09b670 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/IAMOptimizedAWSS3ClientImplTest.java
@@ -22,9 +22,12 @@ import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.AmazonS3EncryptionClient;
import org.apache.camel.component.aws.s3.S3Configuration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -41,27 +44,27 @@ public class IAMOptimizedAWSS3ClientImplTest {
public void iamOptimizedAWSS3ClientImplNoEncryption() {
S3ClientIAMOptimizedImpl iamOptimizedAWSS3Client = new S3ClientIAMOptimizedImpl(getS3ConfigurationNoEncryption(), MAX_CONNECTIONS);
AmazonS3 s3Client = iamOptimizedAWSS3Client.getS3Client();
- Assert.assertNotNull(s3Client);
- Assert.assertFalse(s3Client instanceof AmazonS3EncryptionClient);
+ assertNotNull(s3Client);
+ assertFalse(s3Client instanceof AmazonS3EncryptionClient);
}
@Test
public void iamOptimizedAWSS3ClientImplUseEncryption() {
S3ClientIAMOptimizedImpl iamOptimizedAWSS3Client = new S3ClientIAMOptimizedImpl(getS3ConfigurationUseEncryption(), MAX_CONNECTIONS);
AmazonS3 s3Client = iamOptimizedAWSS3Client.getS3Client();
- Assert.assertNotNull(s3Client);
- Assert.assertTrue(s3Client instanceof AmazonS3EncryptionClient);
+ assertNotNull(s3Client);
+ assertTrue(s3Client instanceof AmazonS3EncryptionClient);
}
@Test
public void iamOptimizedAWSS3ClientImplWithProxy() {
S3ClientIAMOptimizedImpl iamOptimizedAWSS3Client = new S3ClientIAMOptimizedImpl(getS3ConfigurationUseProxy(), MAX_CONNECTIONS);
AmazonS3 s3Client = iamOptimizedAWSS3Client.getS3Client();
- Assert.assertNotNull(s3Client);
- Assert.assertFalse(s3Client instanceof AmazonS3EncryptionClient);
+ assertNotNull(s3Client);
+ assertFalse(s3Client instanceof AmazonS3EncryptionClient);
ClientConfiguration configuration = ((AmazonS3Client)s3Client).getClientConfiguration();
- Assert.assertEquals(Protocol.HTTP, configuration.getProxyProtocol());
+ assertEquals(Protocol.HTTP, configuration.getProxyProtocol());
}
private S3Configuration getS3ConfigurationNoEncryption() {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
index 5ba2e7f..85cc53f 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/client/impl/StandardAWSS3ClientImplTest.java
@@ -22,9 +22,12 @@ import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.AmazonS3EncryptionClient;
import org.apache.camel.component.aws.s3.S3Configuration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -41,27 +44,27 @@ public class StandardAWSS3ClientImplTest {
public void standardAWSS3ClientImplNoEncryption() {
S3ClientStandardImpl standardAWSS3Client = new S3ClientStandardImpl(getS3ConfigurationNoEncryption(), MAX_CONNECTIONS);
AmazonS3 s3Client = standardAWSS3Client.getS3Client();
- Assert.assertNotNull(s3Client);
- Assert.assertFalse(s3Client instanceof AmazonS3EncryptionClient);
+ assertNotNull(s3Client);
+ assertFalse(s3Client instanceof AmazonS3EncryptionClient);
}
@Test
public void standardAWSS3ClientImplUseEncryption() {
S3ClientStandardImpl standardAWSS3Client = new S3ClientStandardImpl(getS3ConfigurationUseEncryption(), MAX_CONNECTIONS);
AmazonS3 s3Client = standardAWSS3Client.getS3Client();
- Assert.assertNotNull(s3Client);
- Assert.assertTrue(s3Client instanceof AmazonS3EncryptionClient);
+ assertNotNull(s3Client);
+ assertTrue(s3Client instanceof AmazonS3EncryptionClient);
}
@Test
public void standardAWSS3ClientImplWithProxy() {
S3ClientStandardImpl standardAWSS3Client = new S3ClientStandardImpl(getS3ConfigurationUseProxy(), MAX_CONNECTIONS);
AmazonS3 s3Client = standardAWSS3Client.getS3Client();
- Assert.assertNotNull(s3Client);
- Assert.assertFalse(s3Client instanceof AmazonS3EncryptionClient);
+ assertNotNull(s3Client);
+ assertFalse(s3Client instanceof AmazonS3EncryptionClient);
ClientConfiguration configuration = ((AmazonS3Client)s3Client).getClientConfiguration();
- Assert.assertEquals(Protocol.HTTP, configuration.getProxyProtocol());
+ assertEquals(Protocol.HTTP, configuration.getProxyProtocol());
}
private S3Configuration getS3ConfigurationNoEncryption() {
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java
index fbccdf2..41386f3 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ComponentIntegrationTest.java
@@ -27,11 +27,17 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.s3.S3Constants;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+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.assertTrue;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class S3ComponentIntegrationTest extends CamelTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ObjectRangeOperationIntegrationTest.java b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ObjectRangeOperationIntegrationTest.java
index 039dd55..7a29d63 100644
--- a/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ObjectRangeOperationIntegrationTest.java
+++ b/components/camel-aws-s3/src/test/java/org/apache/camel/component/aws/s3/integration/S3ObjectRangeOperationIntegrationTest.java
@@ -35,13 +35,13 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.s3.S3Constants;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class S3ObjectRangeOperationIntegrationTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(S3ObjectRangeOperationIntegrationTest.class);
diff --git a/components/camel-aws-sdb/pom.xml b/components/camel-aws-sdb/pom.xml
index c2bc542..1689853 100644
--- a/components/camel-aws-sdb/pom.xml
+++ b/components/camel-aws-sdb/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
index 203b94e..c7a4930 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/AbstractSdbCommandTest.java
@@ -21,13 +21,13 @@ import com.amazonaws.services.simpledb.model.UpdateCondition;
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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
public class AbstractSdbCommandTest {
@@ -36,7 +36,7 @@ public class AbstractSdbCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
index 21bacf8..3718415 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchDeleteAttributesCommandTest.java
@@ -23,11 +23,11 @@ import com.amazonaws.services.simpledb.model.Item;
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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class BatchDeleteAttributesCommandTest {
@@ -36,7 +36,7 @@ public class BatchDeleteAttributesCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
index b48956c..748e064 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/BatchPutAttributesCommandTest.java
@@ -23,11 +23,12 @@ import com.amazonaws.services.simpledb.model.ReplaceableItem;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
public class BatchPutAttributesCommandTest {
@@ -36,7 +37,7 @@ public class BatchPutAttributesCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
index 0af789f..984cee3 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteAttributesCommandTest.java
@@ -24,11 +24,12 @@ import com.amazonaws.services.simpledb.model.UpdateCondition;
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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class DeleteAttributesCommandTest {
@@ -37,7 +38,7 @@ public class DeleteAttributesCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
@@ -64,15 +65,16 @@ public class DeleteAttributesCommandTest {
assertEquals(attributes, sdbClient.deleteAttributesRequest.getAttributes());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void executeWithoutItemName() {
List<Attribute> attributes = new ArrayList<>();
attributes.add(new Attribute("NAME1", "VALUE1"));
exchange.getIn().setHeader(SdbConstants.ATTRIBUTES, attributes);
UpdateCondition condition = new UpdateCondition("Key1", "Value1", true);
exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, condition);
-
- command.execute();
+
+ assertThrows(IllegalArgumentException.class,
+ () -> command.execute());
}
@Test
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
index d16622f..b6d3d0f 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DeleteDomainCommandTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.aws.sdb;
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 static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DeleteDomainCommandTest {
@@ -31,7 +31,7 @@ public class DeleteDomainCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
index 2b9be94..4138036 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/DomainMetadataCommandTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.aws.sdb;
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 static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DomainMetadataCommandTest {
@@ -31,7 +31,7 @@ public class DomainMetadataCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
index 58d635d..5ff7452 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/GetAttributesCommandTest.java
@@ -23,11 +23,12 @@ import com.amazonaws.services.simpledb.model.Attribute;
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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class GetAttributesCommandTest {
@@ -36,7 +37,7 @@ public class GetAttributesCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
@@ -70,13 +71,14 @@ public class GetAttributesCommandTest {
assertEquals("Value Two", attributes.get(1).getValue());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void executeWithoutItemName() {
List<String> attributeNames = new ArrayList<>();
attributeNames.add("ATTRIBUTE1");
exchange.getIn().setHeader(SdbConstants.ATTRIBUTE_NAMES, attributeNames);
-
- command.execute();
+
+ assertThrows(IllegalArgumentException.class,
+ () -> command.execute());
}
@Test
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
index 08a3130..05ba8f6 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/ListDomainsCommandTest.java
@@ -21,11 +21,11 @@ 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 org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ListDomainsCommandTest {
@@ -34,7 +34,7 @@ public class ListDomainsCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
index 19f2a55..fb145c6 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/PutAttributesCommandTest.java
@@ -24,11 +24,12 @@ import com.amazonaws.services.simpledb.model.UpdateCondition;
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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class PutAttributesCommandTest {
@@ -37,7 +38,7 @@ public class PutAttributesCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
@@ -64,15 +65,16 @@ public class PutAttributesCommandTest {
assertEquals(replaceableAttributes, sdbClient.putAttributesRequest.getAttributes());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void executeWithoutItemName() {
List<ReplaceableAttribute> replaceableAttributes = new ArrayList<>();
replaceableAttributes.add(new ReplaceableAttribute("NAME1", "VALUE1", true));
exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, replaceableAttributes);
UpdateCondition updateCondition = new UpdateCondition("NAME1", "VALUE1", true);
exchange.getIn().setHeader(SdbConstants.UPDATE_CONDITION, updateCondition);
-
- command.execute();
+
+ assertThrows(IllegalArgumentException.class,
+ () -> command.execute());
}
@Test
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
index c50a328..0570da4 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurationTest.java
@@ -17,8 +17,16 @@
package org.apache.camel.component.aws.sdb;
import com.amazonaws.Protocol;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SdbComponentConfigurationTest extends CamelTestSupport {
@@ -95,28 +103,32 @@ public class SdbComponentConfigurationTest extends CamelTestSupport {
assertEquals(new Integer(5), endpoint.getConfiguration().getMaxNumberOfDomains());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutDomainName() throws Exception {
SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
- component.createEndpoint("aws-sdb:// ");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sdb:// "));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAmazonSDBClientConfiguration() throws Exception {
SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
- component.createEndpoint("aws-sdb://TestDomain");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sdb://TestDomain"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
- component.createEndpoint("aws-sdb://TestDomain?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sdb://TestDomain?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
SdbComponent component = context.getComponent("aws-sdb", SdbComponent.class);
- component.createEndpoint("aws-sdb://TestDomain?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sdb://TestDomain?accessKey=xxx"));
}
@Test
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
index a01e146..50f4c34 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentSpringTest.java
@@ -28,18 +28,22 @@ import com.amazonaws.services.simpledb.model.UpdateCondition;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.engine.DefaultProducerTemplate;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SdbComponentSpringTest extends CamelSpringTestSupport {
private AmazonSDBClientMock amazonSDBClient;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
index 58b92e6..6f9466a 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentTest.java
@@ -30,8 +30,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.engine.DefaultProducerTemplate;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SdbComponentTest extends CamelTestSupport {
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.java
index 8618cdc..e420db3 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbComponentVerifierExtensionTest.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 SdbComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class SdbComponentVerifierExtensionTest 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 SdbComponentVerifierExtensionTest 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-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java
index bb45410..a5eadbc 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SdbOperationsTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.camel.component.aws.sdb;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SdbOperationsTest {
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
index 69b4008..cfa92d6 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/SelectCommandTest.java
@@ -22,11 +22,11 @@ import com.amazonaws.services.simpledb.model.Item;
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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class SelectCommandTest {
@@ -35,7 +35,7 @@ public class SelectCommandTest {
private SdbConfiguration configuration;
private Exchange exchange;
- @Before
+ @BeforeEach
public void setUp() {
sdbClient = new AmazonSDBClientMock();
configuration = new SdbConfiguration();
diff --git a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
index 7af1167..1b8970f 100644
--- a/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
+++ b/components/camel-aws-sdb/src/test/java/org/apache/camel/component/aws/sdb/integration/SdbComponentIntegrationTest.java
@@ -29,11 +29,13 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.sdb.SdbConstants;
import org.apache.camel.component.aws.sdb.SdbOperations;
-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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SdbComponentIntegrationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws-ses/pom.xml b/components/camel-aws-ses/pom.xml
index 5af271d..20524d5 100644
--- a/components/camel-aws-ses/pom.xml
+++ b/components/camel-aws-ses/pom.xml
@@ -53,13 +53,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SESComponentClientRegistryTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SESComponentClientRegistryTest.java
index c81088f..e38174c 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SESComponentClientRegistryTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SESComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.ses;
-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 SESComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class SESComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonSESClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalSESClientMisconfiguration() throws Exception {
SesComponent component = new SesComponent(context);
- SesEndpoint endpoint = (SesEndpoint) component.createEndpoint("aws-ses://from@example.com");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ses://from@example.com"));
}
}
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
index b630144..11c2fb6 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentConfigurationTest.java
@@ -21,8 +21,15 @@ import java.util.List;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SesComponentConfigurationTest extends CamelTestSupport {
@@ -112,28 +119,32 @@ public class SesComponentConfigurationTest extends CamelTestSupport {
assertTrue(endpoint.getConfiguration().getReplyToAddresses().contains("replyTo2@example.com"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSourceName() throws Exception {
SesComponent component = context.getComponent("aws-ses", SesComponent.class);
- component.createEndpoint("aws-ses:// ");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ses:// "));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAmazonSESClientConfiguration() throws Exception {
SesComponent component = context.getComponent("aws-ses", SesComponent.class);
- component.createEndpoint("aws-ses://from@example.com");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ses://from@example.com"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
SesComponent component = context.getComponent("aws-ses", SesComponent.class);
- component.createEndpoint("aws-ses://from@example.com?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ses://from@example.com?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
SesComponent component = context.getComponent("aws-ses", SesComponent.class);
- component.createEndpoint("aws-ses://from@example.com?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-ses://from@example.com?accessKey=xxx"));
}
@Test
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
index 1596b17..a436e03 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentSpringTest.java
@@ -23,18 +23,21 @@ import com.amazonaws.services.simpleemail.model.SendEmailRequest;
import com.amazonaws.services.simpleemail.model.SendRawEmailRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SesComponentSpringTest extends CamelSpringTestSupport {
private AmazonSESClientMock sesClient;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
index 0fc0938..db8ca28 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.assertTrue;
public class SesComponentTest extends CamelTestSupport {
diff --git a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtensionTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtensionTest.java
index 3b184bb..e0308e3 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtensionTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/SesComponentVerifierExtensionTest.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 SesComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class SesComponentVerifierExtensionTest 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 SesComponentVerifierExtensionTest 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-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java
index d7b4681..e14fb65 100644
--- a/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java
+++ b/components/camel-aws-ses/src/test/java/org/apache/camel/component/aws/ses/integration/SesComponentIntegrationTest.java
@@ -23,11 +23,13 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.ses.SesConstants;
-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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SesComponentIntegrationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws-sns/pom.xml b/components/camel-aws-sns/pom.xml
index c94344d..c8c85bb 100644
--- a/components/camel-aws-sns/pom.xml
+++ b/components/camel-aws-sns/pom.xml
@@ -53,13 +53,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -69,7 +69,17 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
index 3053088..856fca4 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java
@@ -51,7 +51,8 @@ import com.amazonaws.services.sns.model.SubscribeResult;
import com.amazonaws.services.sns.model.Topic;
import com.amazonaws.services.sns.model.UnsubscribeRequest;
import com.amazonaws.services.sns.model.UnsubscribeResult;
-import org.junit.Assert;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AmazonSNSClientMock extends AbstractAmazonSNS {
@@ -87,9 +88,9 @@ public class AmazonSNSClientMock extends AbstractAmazonSNS {
@Override
public SetTopicAttributesResult setTopicAttributes(SetTopicAttributesRequest setTopicAttributesRequest) throws AmazonServiceException, AmazonClientException {
- Assert.assertEquals(DEFAULT_TOPIC_ARN, setTopicAttributesRequest.getTopicArn());
- Assert.assertEquals("Policy", setTopicAttributesRequest.getAttributeName());
- Assert.assertEquals("XXX", setTopicAttributesRequest.getAttributeValue());
+ assertEquals(DEFAULT_TOPIC_ARN, setTopicAttributesRequest.getTopicArn());
+ assertEquals("Policy", setTopicAttributesRequest.getAttributeName());
+ assertEquals("XXX", setTopicAttributesRequest.getAttributeValue());
return new SetTopicAttributesResult();
}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SNSComponentClientRegistryTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SNSComponentClientRegistryTest.java
index 1302b61..f4675c3 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SNSComponentClientRegistryTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SNSComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.sns;
-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 SNSComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class SNSComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonSNSClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalSNSClientMisconfiguration() throws Exception {
SnsComponent component = context.getComponent("aws-sns", SnsComponent.class);
- SnsEndpoint endpoint = (SnsEndpoint) component.createEndpoint("aws-sns://MyTopic");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sns://MyTopic"));
}
}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
index f14367f..3102eab 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentConfigurationTest.java
@@ -19,8 +19,13 @@ package org.apache.camel.component.aws.sns;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
import org.apache.camel.component.aws.sqs.AmazonSQSClientMock;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class SnsComponentConfigurationTest extends CamelTestSupport {
@@ -136,7 +141,7 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getPolicy());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithSQSSubscriptionIllegalArgument() throws Exception {
AmazonSNSClientMock mock = new AmazonSNSClientMock();
AmazonSQSClientMock mockSQS = new AmazonSQSClientMock();
@@ -156,20 +161,23 @@ public class SnsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getTopicArn());
assertNull(endpoint.getConfiguration().getSubject());
assertNull(endpoint.getConfiguration().getPolicy());
-
- endpoint.start();
+
+ assertThrows(IllegalArgumentException.class,
+ () -> endpoint.start());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
SnsComponent component = context.getComponent("aws-sns", SnsComponent.class);
- component.createEndpoint("aws-sns://MyTopic?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sns://MyTopic?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
SnsComponent component = new SnsComponent(context);
- component.createEndpoint("aws-sns://MyTopic?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sns://MyTopic?accessKey=xxx"));
}
@Test
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java
index 72a6849..bae237a 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentSpringTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.aws.sns;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
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.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SnsComponentSpringTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java
index 19438c0..9f99120 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentTest.java
@@ -21,8 +21,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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;
public class SnsComponentTest extends CamelTestSupport {
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtensionTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtensionTest.java
index 5ac182e..1dd0548 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtensionTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsComponentVerifierExtensionTest.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 SnsComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class SnsComponentVerifierExtensionTest 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 SnsComponentVerifierExtensionTest 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-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
index bb46c6e..a6d878e 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/SnsProducerTest.java
@@ -22,17 +22,16 @@ import java.util.Map;
import com.amazonaws.services.sns.model.MessageAttributeValue;
import org.apache.camel.Exchange;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class SnsProducerTest {
@Mock
@@ -41,7 +40,7 @@ public class SnsProducerTest {
private SnsEndpoint endpoint;
private SnsProducer producer;
- @Before
+ @BeforeEach
public void setUp() {
producer = new SnsProducer(endpoint);
@@ -61,13 +60,13 @@ public class SnsProducerTest {
Map<String, MessageAttributeValue> translateAttributes = producer.translateAttributes(headers, exchange);
- assertThat(translateAttributes.size(), is(5));
- assertThat(translateAttributes.get("key3").getDataType(), is("String"));
- assertThat(translateAttributes.get("key3").getStringValue(), is("value3"));
- assertThat(translateAttributes.get("key4").getDataType(), is("String.Array"));
- assertThat(translateAttributes.get("key4").getStringValue(), is("[\"Value4\", \"Value5\", \"Value6\"]"));
- assertThat(translateAttributes.get("key5").getStringValue(), is("[\"Value7\", null, \"Value9\"]"));
- assertThat(translateAttributes.get("key6").getStringValue(), is("[10, null, 12]"));
- assertThat(translateAttributes.get("key7").getStringValue(), is("[true, null, false]"));
+ assertEquals(5, translateAttributes.size());
+ assertEquals("String", translateAttributes.get("key3").getDataType());
+ assertEquals("value3", translateAttributes.get("key3").getStringValue());
+ assertEquals("String.Array", translateAttributes.get("key4").getDataType());
+ assertEquals("[\"Value4\", \"Value5\", \"Value6\"]", translateAttributes.get("key4").getStringValue());
+ assertEquals("[\"Value7\", null, \"Value9\"]", translateAttributes.get("key5").getStringValue());
+ assertEquals("[10, null, 12]", translateAttributes.get("key6").getStringValue());
+ assertEquals("[true, null, false]", translateAttributes.get("key7").getStringValue());
}
}
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
index 3082ea3..e56a2bf 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsComponentIntegrationTest.java
@@ -21,11 +21,13 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.sns.SnsConstants;
-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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SnsComponentIntegrationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
index 6fe96ae..2db3481 100644
--- a/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
+++ b/components/camel-aws-sns/src/test/java/org/apache/camel/component/aws/sns/integration/SnsTopicWithKmsEncryptionIntegrationTest.java
@@ -21,11 +21,13 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.sns.SnsConstants;
-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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SnsTopicWithKmsEncryptionIntegrationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws-sqs/pom.xml b/components/camel-aws-sqs/pom.xml
index de2e854..42faa03 100644
--- a/components/camel-aws-sqs/pom.xml
+++ b/components/camel-aws-sqs/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -64,7 +64,12 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
index 86601f7..ff247d1 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsBatchConsumerTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
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;
public class SqsBatchConsumerTest extends CamelTestSupport {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentClientRegistryTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentClientRegistryTest.java
index c87e4d2..ceb0e0b 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentClientRegistryTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.sqs;
-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 SqsComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class SqsComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonSQSClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalSQSClientMisconfiguration() throws Exception {
SqsComponent component = context.getComponent("aws-sqs", SqsComponent.class);
- SqsEndpoint endpoint = (SqsEndpoint)component.createEndpoint("aws-sqs://MyQueue");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sqs://MyQueue"));
}
}
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
index c01fb99..6a5293f 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
@@ -18,8 +18,14 @@ package org.apache.camel.component.aws.sqs;
import com.amazonaws.Protocol;
import com.amazonaws.regions.Regions;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class SqsComponentConfigurationTest extends CamelTestSupport {
@@ -191,24 +197,27 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertEquals(50, consumer.getMaxMessagesPerPoll());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutAccessKeyConfiguration() throws Exception {
SqsComponent component = context.getComponent("aws-sqs", SqsComponent.class);
- component.createEndpoint("aws-sqs://MyQueue?secretKey=yyy");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sqs://MyQueue?secretKey=yyy"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithoutSecretKeyConfiguration() throws Exception {
SqsComponent component = context.getComponent("aws-sqs", SqsComponent.class);
- component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx"));
}
// Setting extendMessageVisibility on an SQS consumer should make
// visibilityTimeout compulsory
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithExtendMessageVisibilityAndNoVisibilityTimeoutThrowsException() throws Exception {
SqsComponent component = context.getComponent("aws-sqs", SqsComponent.class);
- component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy&extendMessageVisibility=true");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-sqs://MyQueue?accessKey=xxx&secretKey=yyy&extendMessageVisibility=true"));
}
@Test
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
index 1af66e8..45216f2 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
@@ -27,10 +27,13 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class SqsComponentSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
index b5a6a27..ca12675 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SqsComponentTest extends CamelTestSupport {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtensionTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtensionTest.java
index 2e5c42a..2757542c 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtensionTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentVerifierExtensionTest.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 SqsComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class SqsComponentVerifierExtensionTest 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 SqsComponentVerifierExtensionTest 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-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
index 5fefcfae..bf895ed 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConcurrentConsumerTest.java
@@ -26,8 +26,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-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.apache.camel.test.junit5.TestSupport.isPlatform;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class SqsConcurrentConsumerTest extends CamelTestSupport {
private static final int NUM_CONCURRENT = 10;
@@ -41,7 +45,7 @@ public class SqsConcurrentConsumerTest extends CamelTestSupport {
// test
NotifyBuilder notifier = new NotifyBuilder(context).whenCompleted(NUM_MESSAGES).create();
- assertTrue("We didn't process " + NUM_MESSAGES + " messages as we expected!", notifier.matches(5, TimeUnit.SECONDS));
+ assertTrue(notifier.matches(5, TimeUnit.SECONDS), "We didn't process " + NUM_MESSAGES + " messages as we expected!");
if (isPlatform("windows")) {
// threading is different on windows
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java
index c7e9c1b..209007c 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConfigurationTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.camel.component.aws.sqs;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
public class SqsConfigurationTest {
@@ -30,7 +31,7 @@ public class SqsConfigurationTest {
sqsConfiguration.setMessageGroupIdStrategy("useUnknownStrategy");
fail("Should have thrown exception");
} catch (Exception e) {
- assertTrue("Bad error message: " + e.getMessage(), e.getMessage().startsWith("Unrecognised MessageGroupIdStrategy"));
+ assertTrue(e.getMessage().startsWith("Unrecognised MessageGroupIdStrategy"), "Bad error message: " + e.getMessage());
}
}
@@ -41,7 +42,7 @@ public class SqsConfigurationTest {
sqsConfiguration.setMessageDeduplicationIdStrategy("useUnknownStrategy");
fail("Should have thrown exception");
} catch (Exception e) {
- assertTrue("Bad error message: " + e.getMessage(), e.getMessage().startsWith("Unrecognised MessageDeduplicationIdStrategy"));
+ assertTrue(e.getMessage().startsWith("Unrecognised MessageDeduplicationIdStrategy"), "Bad error message: " + e.getMessage());
}
}
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java
index be0521b..407be19 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsConsumerIdleMessageTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.aws.sqs;
import org.apache.camel.BindToRegistry;
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 static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java
index 713cf22..8401f11 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsDoesNotExtendMessageVisibilityTest.java
@@ -23,8 +23,10 @@ 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 static org.junit.jupiter.api.Assertions.assertTrue;
public class SqsDoesNotExtendMessageVisibilityTest extends CamelTestSupport {
@@ -56,7 +58,7 @@ public class SqsDoesNotExtendMessageVisibilityTest extends CamelTestSupport {
this.client.messages.add(message);
assertMockEndpointsSatisfied(); // Wait for message to arrive.
- assertTrue("Expected no changeMessageVisibility requests.", this.client.changeMessageVisibilityRequests.size() == 0);
+ assertTrue(this.client.changeMessageVisibilityRequests.size() == 0, "Expected no changeMessageVisibility requests.");
}
@Override
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
index 59599c3..e20a3b4 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
@@ -18,18 +18,19 @@ package org.apache.camel.component.aws.sqs;
import com.amazonaws.services.sqs.AmazonSQSClient;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-public class SqsEndpointExplicitQueueUrlTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SqsEndpointExplicitQueueUrlTest {
private static final String QUEUE_URL = "http://localhost:9324/queue/default";
private SqsEndpoint endpoint;
private AmazonSQSClient amazonSQSClient;
- @Before
+ @BeforeEach
public void setUp() {
amazonSQSClient = Mockito.mock(AmazonSQSClient.class);
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
index 013780e..1d05c56 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointTest.java
@@ -24,12 +24,12 @@ import com.amazonaws.services.sqs.model.GetQueueUrlResult;
import com.amazonaws.services.sqs.model.ListQueuesResult;
import com.amazonaws.services.sqs.model.QueueAttributeName;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SqsEndpointTest {
@@ -37,7 +37,7 @@ public class SqsEndpointTest {
private AmazonSQSClient amazonSQSClient;
private SqsConfiguration config;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
amazonSQSClient = Mockito.mock(AmazonSQSClient.class);
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
index d55f6df..4883223 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointUseExistingQueueTest.java
@@ -34,8 +34,8 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
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;
public class SqsEndpointUseExistingQueueTest extends CamelTestSupport {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java
index 9da34c5..b0b3b98 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsExtendMessageVisibilityTest.java
@@ -24,8 +24,11 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SqsExtendMessageVisibilityTest extends CamelTestSupport {
@@ -58,7 +61,7 @@ public class SqsExtendMessageVisibilityTest extends CamelTestSupport {
assertMockEndpointsSatisfied(); // Wait for message to arrive.
- assertTrue("Expected at least one changeMessageVisibility request.", this.client.changeMessageVisibilityRequests.size() >= 1);
+ assertTrue(this.client.changeMessageVisibilityRequests.size() >= 1, "Expected at least one changeMessageVisibility request.");
for (ChangeMessageVisibilityRequest req : this.client.changeMessageVisibilityRequests) {
assertEquals("https://queue.amazonaws.com/541925086079/MyQueue", req.getQueueUrl());
assertEquals(RECEIPT_HANDLE, req.getReceiptHandle());
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsFilterMessagesWithNoDeleteTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsFilterMessagesWithNoDeleteTest.java
index 3e7243f..1418b96 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsFilterMessagesWithNoDeleteTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsFilterMessagesWithNoDeleteTest.java
@@ -23,14 +23,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.TestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-@Ignore("Test fails occationally on CI servers")
-public class SqsFilterMessagesWithNoDeleteTest extends TestSupport {
+@Disabled("Test fails occationally on CI servers")
+public class SqsFilterMessagesWithNoDeleteTest {
// put some test messages onto the 'queue'
private void populateMessages(AmazonSQSClientMock clientMock) {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java
index 3d22a46..922af28 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerBatchTest.java
@@ -27,8 +27,10 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
public class SqsProducerBatchTest extends CamelTestSupport {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java
index fb4168a..585e3c7 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerDeleteTest.java
@@ -24,8 +24,10 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertNotNull;
public class SqsProducerDeleteTest extends CamelTestSupport {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java
index a403f67..ab81fb8 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerListQueuesTest.java
@@ -24,8 +24,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SqsProducerListQueuesTest extends CamelTestSupport {
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
index 0e2c638..def19e6 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/SqsProducerTest.java
@@ -26,24 +26,23 @@ import com.amazonaws.services.sqs.model.SendMessageRequest;
import com.amazonaws.services.sqs.model.SendMessageResult;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class SqsProducerTest {
private static final String SAMPLE_MESSAGE_BODY = "this is a body";
private static final String MESSAGE_MD5 = "00000000000000000000000000000000";
@@ -73,21 +72,21 @@ public class SqsProducerTest {
private SqsConfiguration sqsConfiguration;
private SqsProducer underTest;
- @Before
+ @BeforeEach
public void setup() throws Exception {
sqsConfiguration = new SqsConfiguration();
sqsConfiguration.setDelaySeconds(0);
sqsConfiguration.setQueueName("queueName");
SendMessageResult sendMessageResult = new SendMessageResult().withMD5OfMessageBody(MESSAGE_MD5).withMessageId(MESSAGE_ID);
- when(amazonSQSClient.sendMessage(any(SendMessageRequest.class))).thenReturn(sendMessageResult);
- when(sqsEndpoint.getClient()).thenReturn(amazonSQSClient);
- when(sqsEndpoint.getConfiguration()).thenReturn(sqsConfiguration);
- when(sqsEndpoint.getQueueUrl()).thenReturn(QUEUE_URL);
- when(sqsEndpoint.getHeaderFilterStrategy()).thenReturn(new SqsHeaderFilterStrategy());
- when(exchange.getMessage()).thenReturn(inMessage);
- when(exchange.getIn()).thenReturn(inMessage);
- when(exchange.getExchangeId()).thenReturn(SAMPLE_EXCHANGE_ID);
- when(inMessage.getBody(String.class)).thenReturn(SAMPLE_MESSAGE_BODY);
+ lenient().when(amazonSQSClient.sendMessage(any(SendMessageRequest.class))).thenReturn(sendMessageResult);
+ lenient().when(sqsEndpoint.getClient()).thenReturn(amazonSQSClient);
+ lenient().when(sqsEndpoint.getConfiguration()).thenReturn(sqsConfiguration);
+ lenient().when(sqsEndpoint.getQueueUrl()).thenReturn(QUEUE_URL);
+ lenient().when(sqsEndpoint.getHeaderFilterStrategy()).thenReturn(new SqsHeaderFilterStrategy());
+ lenient().when(exchange.getMessage()).thenReturn(inMessage);
+ lenient().when(exchange.getIn()).thenReturn(inMessage);
+ lenient().when(exchange.getExchangeId()).thenReturn(SAMPLE_EXCHANGE_ID);
+ lenient().when(inMessage.getBody(String.class)).thenReturn(SAMPLE_MESSAGE_BODY);
underTest = new SqsProducer(sqsEndpoint);
}
@@ -100,9 +99,9 @@ public class SqsProducerTest {
Map<String, MessageAttributeValue> translateAttributes = underTest.translateAttributes(headers, exchange);
- assertThat(translateAttributes.size(), is(1));
- assertThat(translateAttributes.get("key3").getDataType(), is("String"));
- assertThat(translateAttributes.get("key3").getStringValue(), is("value3"));
+ assertEquals(1, translateAttributes.size());
+ assertEquals("String", translateAttributes.get("key3").getDataType());
+ assertEquals("value3", translateAttributes.get("key3").getStringValue());
}
@Test
@@ -135,7 +134,7 @@ public class SqsProducerTest {
@Test
public void itSetsTheDelayFromMessageHeaderOnTheRequest() throws Exception {
- when(inMessage.getHeader(SqsConstants.DELAY_HEADER, Integer.class)).thenReturn(Integer.valueOf(2000));
+ lenient().when(inMessage.getHeader(SqsConstants.DELAY_HEADER, Integer.class)).thenReturn(Integer.valueOf(2000));
underTest.process(exchange);
ArgumentCaptor<SendMessageRequest> capture = ArgumentCaptor.forClass(SendMessageRequest.class);
@@ -223,7 +222,7 @@ public class SqsProducerTest {
fail("Should have thrown an exception");
} catch (Exception e) {
- assertTrue("Bad error message: " + e.getMessage(), e.getMessage().startsWith("messageGroupIdStrategy must be set for FIFO queues"));
+ assertTrue(e.getMessage().startsWith("messageGroupIdStrategy must be set for FIFO queues"), "Bad error message: " + e.getMessage());
}
}
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
index 0067596..a3be22e 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
@@ -24,11 +24,14 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.sqs.SqsConstants;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SqsComponentIntegrationTest extends CamelTestSupport {
private String accessKey = "xxx";
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
index 93195f9..807cfc9 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsConsumerMessageIntegrationTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SqsConsumerMessageIntegrationTest extends CamelTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
index 86a1fa0..eac5733 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendFifoIntegrationTest.java
@@ -27,11 +27,11 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.sqs.SqsConstants;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SqsProducerBatchSendFifoIntegrationTest extends CamelTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
index 30f7def..a490975 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerBatchSendIntegrationTest.java
@@ -27,11 +27,11 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.sqs.SqsConstants;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SqsProducerBatchSendIntegrationTest extends CamelTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
index 39a8589..336f9b7 100644
--- a/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
+++ b/components/camel-aws-sqs/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsProducerDeleteMessageIntegrationTest.java
@@ -23,11 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey!")
public class SqsProducerDeleteMessageIntegrationTest extends CamelTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-swf/pom.xml b/components/camel-aws-swf/pom.xml
index dd32366..466934a 100644
--- a/components/camel-aws-swf/pom.xml
+++ b/components/camel-aws-swf/pom.xml
@@ -53,13 +53,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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>
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java
index fd07cb5..a8c8230 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityClientTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.aws.swf;
import com.amazonaws.services.simpleworkflow.flow.DynamicActivitiesClient;
import com.amazonaws.services.simpleworkflow.flow.core.Promise;
import com.amazonaws.services.simpleworkflow.model.ActivityType;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import static org.mockito.ArgumentMatchers.any;
@@ -32,7 +32,7 @@ public class CamelSWFActivityClientTest {
private DynamicActivitiesClient actClient;
private CamelSWFActivityClient camelSWFActivityClient;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
actClient = mock(DynamicActivitiesClient.class);
camelSWFActivityClient = new CamelSWFActivityClient(new SWFConfiguration()) {
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java
index c54b4fb..d519259 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFActivityConsumerTest.java
@@ -21,7 +21,7 @@ import com.amazonaws.services.simpleworkflow.model.PollForActivityTaskRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java
index fc7c8b5..32d4615 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFTestSupport.java
@@ -21,7 +21,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import static org.mockito.Mockito.mock;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java
index 13bdb3d..4bf27ac 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClientTest.java
@@ -28,11 +28,10 @@ import com.amazonaws.services.simpleworkflow.model.DescribeWorkflowExecutionRequ
import com.amazonaws.services.simpleworkflow.model.WorkflowExecution;
import com.amazonaws.services.simpleworkflow.model.WorkflowExecutionDetail;
import com.amazonaws.services.simpleworkflow.model.WorkflowExecutionInfo;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -46,7 +45,7 @@ public class CamelSWFWorkflowClientTest {
private CamelSWFWorkflowClient camelSWFWorkflowClient;
private DynamicWorkflowClientExternal clientExternal;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
configuration = new SWFConfiguration();
configuration.setDomainName("testDomain");
@@ -87,11 +86,11 @@ public class CamelSWFWorkflowClientTest {
verify(swClient).describeWorkflowExecution(describeRequest);
- assertThat((String) description.get("closeStatus"), is("COMPLETED"));
- assertThat((Date) description.get("closeTimestamp"), is(closeTimestamp));
- assertThat((String) description.get("executionStatus"), is("CLOSED"));
- assertThat((List<?>) description.get("tagList"), is(Collections.EMPTY_LIST));
- assertThat((WorkflowExecutionDetail) description.get("executionDetail"), is(workflowExecutionDetail));
+ assertEquals("COMPLETED", (String) description.get("closeStatus"));
+ assertEquals(closeTimestamp, (Date) description.get("closeTimestamp"));
+ assertEquals("CLOSED", (String) description.get("executionStatus"));
+ assertEquals(Collections.EMPTY_LIST, (List<?>) description.get("tagList"));
+ assertEquals(workflowExecutionDetail, (WorkflowExecutionDetail) description.get("executionDetail"));
}
@Test
@@ -109,7 +108,7 @@ public class CamelSWFWorkflowClientTest {
String state = (String) camelSWFWorkflowClient.getWorkflowExecutionState("123", "run1", stateType);
verify(clientExternal).getWorkflowExecutionState(stateType);
- assertThat(state, is("some state"));
+ assertEquals("some state", state);
}
@Test
@@ -138,7 +137,7 @@ public class CamelSWFWorkflowClientTest {
String[] ids = camelSWFWorkflowClient.startWorkflowExecution(null, null, "eventName", "version", null, Collections.singletonList("camelTest"));
verify(clientExternal).startWorkflowExecution(new Object[]{null});
- assertThat("123", is(ids[0]));
- assertThat("run1", is(ids[1]));
+ assertEquals(ids[0], "123");
+ assertEquals(ids[1], "run1");
}
}
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java
index 6cef5d4..a511539 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowConsumerTest.java
@@ -21,7 +21,7 @@ import com.amazonaws.services.simpleworkflow.model.PollForDecisionTaskRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java
index eea9eb0..cc0aae1 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowProducerTest.java
@@ -21,8 +21,9 @@ import com.amazonaws.services.simpleworkflow.model.StartWorkflowExecutionRequest
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentClientRegistryTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentClientRegistryTest.java
index 9610226..ce2dac3 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentClientRegistryTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentClientRegistryTest.java
@@ -16,8 +16,11 @@
*/
package org.apache.camel.component.aws.swf;
-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 SWFComponentClientRegistryTest extends CamelTestSupport {
@@ -32,10 +35,11 @@ public class SWFComponentClientRegistryTest extends CamelTestSupport {
assertNotNull(endpoint.getConfiguration().getAmazonSWClient());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void createEndpointWithMinimalSWFClientMisconfiguration() throws Exception {
SWFComponent component = context.getComponent("aws-swf", SWFComponent.class);
- SWFEndpoint endpoint = (SWFEndpoint) component.createEndpoint("aws-swf://workflow");
+ assertThrows(IllegalArgumentException.class,
+ () -> component.createEndpoint("aws-swf://workflow"));
}
}
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java
index 0f4b883..af6b1a9 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SWFComponentConfigurationTest.java
@@ -17,8 +17,10 @@
package org.apache.camel.component.aws.swf;
import com.amazonaws.regions.Regions;
-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;
public class SWFComponentConfigurationTest extends CamelTestSupport {
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentSpringTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentSpringTest.java
index 75d5bda..13f8d7f 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentSpringTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentSpringTest.java
@@ -21,10 +21,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
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 static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class SwfComponentSpringTest extends CamelSpringTestSupport {
@EndpointInject("direct:start")
diff --git a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtensionTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtensionTest.java
index accabac..1bb268e 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtensionTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/SwfComponentVerifierExtensionTest.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 SwfComponentVerifierExtensionTest extends CamelTestSupport {
@@ -49,7 +50,7 @@ public class SwfComponentVerifierExtensionTest 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
@@ -64,7 +65,7 @@ public class SwfComponentVerifierExtensionTest extends CamelTestSupport {
parameters.put("type", "activity");
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-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java
index 5fdcaff..9b8342a 100644
--- a/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java
+++ b/components/camel-aws-swf/src/test/java/org/apache/camel/component/aws/swf/integration/CamelSWFEndToEndTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.swf.SWFConstants;
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 static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
-@Ignore("Must be manually tested. Provide your own accessKey and secretKey and also create a SWF domain in advance")
+@Disabled("Must be manually tested. Provide your own accessKey and secretKey and also create a SWF domain in advance")
public class CamelSWFEndToEndTest extends CamelTestSupport {
protected String options =
"accessKey=XXX"
diff --git a/components/camel-aws-translate/pom.xml b/components/camel-aws-translate/pom.xml
index 4a73737..7b0e486 100644
--- a/components/camel-aws-translate/pom.xml
+++ b/components/camel-aws-translate/pom.xml
@@ -48,13 +48,13 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</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-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java
index fde08a6..9645721 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerSpringTest.java
@@ -20,10 +20,12 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
+
public class TranslateProducerSpringTest extends CamelSpringTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java
index 5a2ba1d..fd92f41 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/TranslateProducerTest.java
@@ -22,8 +22,10 @@ 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 static org.junit.jupiter.api.Assertions.assertEquals;
public class TranslateProducerTest extends CamelTestSupport {
diff --git a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java
index 74f6c42..7d0a87a 100644
--- a/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java
+++ b/components/camel-aws-translate/src/test/java/org/apache/camel/component/aws/translate/integration/TranslateProducerIntegrationTest.java
@@ -24,11 +24,13 @@ import org.apache.camel.component.aws.translate.TranslateConstants;
import org.apache.camel.component.aws.translate.TranslateLanguageEnum;
import org.apache.camel.component.aws.translate.TranslateOperations;
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;
-@Ignore("This test must be manually started, you need to specify AWS Credentials")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("This test must be manually started, you need to specify AWS Credentials")
public class TranslateProducerIntegrationTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git a/components/camel-aws-xray/pom.xml b/components/camel-aws-xray/pom.xml
index 8e0d1a2..6dbab34 100644
--- a/components/camel-aws-xray/pom.xml
+++ b/components/camel-aws-xray/pom.xml
@@ -89,7 +89,7 @@
</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-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java
index 567b510..59322d8 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ABCRouteTest.java
@@ -20,10 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ABCRouteTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java
index bb23b54..f4c7f49 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/BeanTracingTest.java
@@ -28,10 +28,11 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class BeanTracingTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
index ac7a95e..1d5f044 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CamelAwsXRayTestSupport.java
@@ -25,13 +25,13 @@ import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
import org.apache.camel.spi.InterceptStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Rule;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
public class CamelAwsXRayTestSupport extends CamelTestSupport {
- @Rule
- public FakeAWSDaemon socketListener = new FakeAWSDaemon();
+ protected FakeAWSDaemon socketListener = new FakeAWSDaemon();
private List<TestTrace> testData;
@@ -39,6 +39,18 @@ public class CamelAwsXRayTestSupport extends CamelTestSupport {
this.testData = Arrays.asList(testData);
}
+ @BeforeEach
+ public void setUp() throws Exception {
+ socketListener.before();
+ super.setUp();
+ }
+
+ @AfterEach
+ public void tearDown() throws Exception {
+ super.tearDown();
+ socketListener.after();
+ }
+
@Override
protected void postProcessTest() throws Exception {
super.postProcessTest();
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java
index edf6dbc..b5a8372 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ClientRecipientListRouteTest.java
@@ -20,10 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ClientRecipientListRouteTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ComprehensiveTrackingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ComprehensiveTrackingTest.java
index 780bf3a..ca237ec 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ComprehensiveTrackingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ComprehensiveTrackingTest.java
@@ -22,10 +22,11 @@ import org.apache.camel.Handler;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.xray.bean.SomeBean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ComprehensiveTrackingTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
index d691b73..1a58251 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/CustomComponentTest.java
@@ -24,13 +24,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.xray.bean.ProcessingCamelBean;
import org.apache.camel.component.aws.xray.component.CommonEndpoints;
import org.apache.camel.spi.InterceptStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.aws.xray.TestDataBuilder.createSegment;
import static org.apache.camel.component.aws.xray.TestDataBuilder.createSubsegment;
import static org.apache.camel.component.aws.xray.TestDataBuilder.createTrace;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
/**
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java
index c8f0a05..987b480 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/EIPTracingTest.java
@@ -28,13 +28,14 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
-@Ignore("TODO: investigate for Camel 3.0")
+@Disabled("TODO: investigate for Camel 3.0")
public class EIPTracingTest extends CamelAwsXRayTestSupport {
public EIPTracingTest() {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java
index 8605fa2..20b0d92 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorHandlingTest.java
@@ -29,12 +29,13 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ErrorHandlingTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
index f0d7c95..715ea2e 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/ErrorTest.java
@@ -28,12 +28,13 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.InterceptStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ErrorTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
index 25f3f93..3810fa0 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/FakeAWSDaemon.java
@@ -37,11 +37,10 @@ import org.apache.camel.component.aws.xray.json.JsonArray;
import org.apache.camel.component.aws.xray.json.JsonObject;
import org.apache.camel.component.aws.xray.json.JsonParser;
import org.apache.commons.lang3.StringUtils;
-import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class FakeAWSDaemon extends ExternalResource {
+public class FakeAWSDaemon {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -49,14 +48,12 @@ public class FakeAWSDaemon extends ExternalResource {
private UDPSocketListener socketListener = new UDPSocketListener(receivedTraces);
private ExecutorService executorService = Executors.newSingleThreadExecutor();
- @Override
- protected void before() throws Throwable {
+ public void before() {
LOG.info("Starting up Mock-AWS daemon");
executorService.submit(socketListener);
}
- @Override
- protected void after() {
+ public void after() {
LOG.info("Shutting down Mock-AWS daemon");
socketListener.close();
executorService.shutdown();
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
index f3323c8..91d7e66 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastParallelRouteTest.java
@@ -20,10 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class MulticastParallelRouteTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
index be9e66d..5db5e60 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/MulticastRouteTest.java
@@ -20,10 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class MulticastRouteTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
index b962826..cff28b1 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/Route2ConcurrentTest.java
@@ -20,10 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class Route2ConcurrentTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
index 955647f..2e7d962 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/RouteConcurrentTest.java
@@ -20,10 +20,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class RouteConcurrentTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
index 2ea70e3..35486a5 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/SpringAwsXRaySimpleRouteTest.java
@@ -22,25 +22,38 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.aws.xray.TestDataBuilder.TestTrace;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class SpringAwsXRaySimpleRouteTest extends CamelSpringTestSupport {
- @Rule
- public FakeAWSDaemon socketListener = new FakeAWSDaemon();
+ protected FakeAWSDaemon socketListener = new FakeAWSDaemon();
@Override
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/aws/xray/AwsXRaySimpleRouteTest.xml");
}
+ @BeforeEach
+ public void setUp() throws Exception {
+ socketListener.before();
+ super.setUp();
+ }
+
+ @AfterEach
+ public void tearDown() throws Exception {
+ super.tearDown();
+ socketListener.after();
+ }
+
@Test
public void testRoute() throws Exception {
NotifyBuilder notify = new NotifyBuilder(context).whenDone(5).create();
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java
index 348c371..910021e 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TestUtils.java
@@ -29,8 +29,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public final class TestUtils {
@@ -150,7 +150,7 @@ public final class TestUtils {
private static void verifyAnnotations(Map<String, Object> expected, Map<String, Object> actual) {
assertThat(actual.size(), is(equalTo(expected.size())));
for (String key : expected.keySet()) {
- assertTrue("Annotation " + key + " is missing", actual.containsKey(key));
+ assertTrue(actual.containsKey(key), "Annotation " + key + " is missing");
assertThat("Annotation value of " + key + " is different",
actual.get(key), is(equalTo(expected.get(key))));
}
@@ -162,11 +162,11 @@ public final class TestUtils {
assertThat("Insufficient number of metadata found",
actual.size(), is(greaterThanOrEqualTo(expected.size())));
for (String namespace : expected.keySet()) {
- assertTrue("Namespace " + namespace + " not found in metadata",
- actual.containsKey(namespace));
+ assertTrue(actual.containsKey(namespace),
+ "Namespace " + namespace + " not found in metadata");
for (String key : expected.get(namespace).keySet()) {
- assertTrue("Key " + key + " of namespace + " + namespace + " not found",
- actual.get(namespace).containsKey(key));
+ assertTrue(actual.get(namespace).containsKey(key),
+ "Key " + key + " of namespace + " + namespace + " not found");
assertThat("Incorrect value of key " + key + " in namespace " + namespace,
actual.get(namespace).get(key), is(equalTo(expected.get(namespace).get(key))));
}
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
index 465b005..0ab0e5c 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoService2Test.java
@@ -21,10 +21,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TwoService2Test extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
index 029d4c3..940514f 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceTest.java
@@ -21,10 +21,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TwoServiceTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
index 05c558d..5b9aa09 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/TwoServiceWithExcludeTest.java
@@ -23,10 +23,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TwoServiceWithExcludeTest extends CamelAwsXRayTestSupport {
diff --git a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonTest.java b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonTest.java
index a886fd2..349b278 100644
--- a/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonTest.java
+++ b/components/camel-aws-xray/src/test/java/org/apache/camel/component/aws/xray/json/JsonTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.component.aws.xray.json;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
public class JsonTest {