This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit d83202f1ef0d79e3739795632402903417e09635 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Fri Nov 27 17:07:02 2020 +0100 Rework the AWS v2 tests to fix tests performance issues - Do not run unless enabled by slow tests flag - Prevent creating multiple instances of the service object - Do not instantiate the service object when disabled - Remove an unused annotation that (apparently) slows down the tests a little bit --- .../aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java | 12 +++++++----- .../aws/v2/s3/source/CamelSourceAWSS3ITCase.java | 10 ++++++---- .../aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java | 12 +++++++----- .../aws/v2/sqs/source/CamelSourceAWSSQSITCase.java | 10 +++++++--- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java index b5cca54..f4e1960 100644 --- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java +++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/kinesis/source/CamelSourceAWSKinesisITCase.java @@ -33,11 +33,12 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.junit.jupiter.Testcontainers; import software.amazon.awssdk.awscore.exception.AwsServiceException; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.services.kinesis.KinesisClient; @@ -57,13 +58,14 @@ import software.amazon.awssdk.services.kinesis.model.ResourceNotFoundException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -@Testcontainers +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true") public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest { - @RegisterExtension - public static AWSService<KinesisClient> awsService = AWSServiceFactory.createKinesisService(); - private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSKinesisITCase.class); + @RegisterExtension + AWSService<KinesisClient> awsService = AWSServiceFactory.createKinesisService(); + private String streamName; private KinesisClient kinesisClient; diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java index 43f1222..6ad128b 100644 --- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java +++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/s3/source/CamelSourceAWSS3ITCase.java @@ -35,11 +35,12 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.Timeout; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.junit.jupiter.Testcontainers; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.CreateBucketRequest; @@ -48,12 +49,13 @@ import software.amazon.awssdk.services.s3.model.PutObjectRequest; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -@Testcontainers +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true") public class CamelSourceAWSS3ITCase extends AbstractKafkaTest { + private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class); @RegisterExtension - public static AWSService<S3Client> service = AWSServiceFactory.createS3Service(); - private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class); + AWSService<S3Client> service = AWSServiceFactory.createS3Service(); private S3Client awsS3Client; private String bucketName; diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java index 13daee7..d3d75cf 100644 --- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java +++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/sink/CamelSinkAWSSQSITCase.java @@ -37,12 +37,13 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.junit.jupiter.Testcontainers; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.model.Message; @@ -50,13 +51,14 @@ import software.amazon.awssdk.services.sqs.model.Message; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -@Testcontainers +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true") public class CamelSinkAWSSQSITCase extends AbstractKafkaTest { - @RegisterExtension - public static AWSService<SqsClient> awsService = AWSServiceFactory.createSQSService(); - private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class); + @RegisterExtension + AWSService<SqsClient> awsService = AWSServiceFactory.createSQSService(); + private AWSSQSClient awssqsClient; private String queueName; diff --git a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java index c2e6539..624d578 100644 --- a/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java +++ b/tests/itests-aws-v2/src/test/java/org/apache/camel/kafkaconnector/aws/v2/sqs/source/CamelSourceAWSSQSITCase.java @@ -33,8 +33,10 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,12 +46,14 @@ import software.amazon.awssdk.services.sqs.SqsClient; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@EnabledIfSystemProperty(named = "enable.slow.tests", matches = "true") public class CamelSourceAWSSQSITCase extends AbstractKafkaTest { - @RegisterExtension - public static AWSService<SqsClient> service = AWSServiceFactory.createSQSService(); - private static final Logger LOG = LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class); + @RegisterExtension + AWSService<SqsClient> service = AWSServiceFactory.createSQSService(); + private AWSSQSClient awssqsClient; private String queueName;
