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 e84b2c2d7ee0039ec7cb35196ce4175c616b0b15
Author: Otavio Rodolfo Piske <opi...@redhat.com>
AuthorDate: Fri Nov 27 17:01:12 2020 +0100
Rework the AWS v1 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
- Removes potentially slow annotation
---
.../aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java | 12 +++++++-----
.../aws/v1/s3/source/CamelSourceAWSS3ITCase.java | 10 ++++++----
.../aws/v1/sns/sink/CamelSinkAWSSNSITCase.java | 10 +++++++---
.../aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java | 10 +++++++---
.../aws/v1/sqs/source/CamelSourceAWSSQSITCase.java | 10 +++++++---
.../camel/kafkaconnector/common/AbstractKafkaTest.java | 2 --
6 files changed, 34 insertions(+), 20 deletions(-)
diff --git
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
index ecfa674..de778bc 100644
---
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
+++
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java
@@ -44,7 +44,9 @@ 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;
@@ -52,16 +54,16 @@ import org.slf4j.LoggerFactory;
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 CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
- @RegisterExtension
- public static AWSService<AmazonKinesis> service =
AWSServiceFactory.createKinesisService();
-
private static final Logger LOG =
LoggerFactory.getLogger(CamelSourceAWSKinesisITCase.class);
- private String streamName;
+ @RegisterExtension
+ AWSService<AmazonKinesis> service =
AWSServiceFactory.createKinesisService();
+ private String streamName;
private AmazonKinesis awsKinesisClient;
-
private volatile int received;
private final int expect = 10;
diff --git
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
index 92b58f5..61ae46e 100644
---
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
+++
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java
@@ -36,7 +36,9 @@ 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;
@@ -44,15 +46,15 @@ import org.slf4j.LoggerFactory;
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 CamelSourceAWSS3ITCase extends AbstractKafkaTest {
+ private static final Logger LOG =
LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class);
@RegisterExtension
- public static AWSService<AmazonS3> service =
AWSServiceFactory.createS3Service();
- private static final Logger LOG =
LoggerFactory.getLogger(CamelSourceAWSS3ITCase.class);
+ AWSService<AmazonS3> service = AWSServiceFactory.createS3Service();
private AmazonS3 awsS3Client;
-
private volatile int received;
private final int expect = 10;
diff --git
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
index e739e3a..d8d959f 100644
---
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
+++
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java
@@ -40,7 +40,9 @@ import
org.apache.camel.test.infra.aws.services.AWSServiceFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
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;
@@ -48,12 +50,14 @@ import org.slf4j.LoggerFactory;
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 CamelSinkAWSSNSITCase extends AbstractKafkaTest {
- @RegisterExtension
- public static AWSService<AmazonSQS> service =
AWSServiceFactory.createSNSService();
-
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSSNSITCase.class);
+ @RegisterExtension
+ AWSService<AmazonSQS> service = AWSServiceFactory.createSNSService();
+
private AWSSQSClient awsSqsClient;
private String sqsQueueUrl;
private String queueName;
diff --git
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
index 9e9d598..188751b 100644
---
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
+++
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java
@@ -40,8 +40,10 @@ 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;
@@ -49,12 +51,14 @@ import org.slf4j.LoggerFactory;
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 CamelSinkAWSSQSITCase extends AbstractKafkaTest {
- @RegisterExtension
- public static AWSService<AmazonSQS> awsService =
AWSServiceFactory.createSQSService();
-
private static final Logger LOG =
LoggerFactory.getLogger(CamelSinkAWSSQSITCase.class);
+ @RegisterExtension
+ AWSService<AmazonSQS> awsService = AWSServiceFactory.createSQSService();
+
private AWSSQSClient awssqsClient;
private String queueName;
private String queueUrl;
diff --git
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
index 7e40b9b..a7d767f 100644
---
a/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
+++
b/tests/itests-aws-v1/src/test/java/org/apache/camel/kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java
@@ -35,8 +35,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 org.slf4j.LoggerFactory;
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<AmazonSQS> service =
AWSServiceFactory.createSQSService();
-
private static final Logger LOG =
LoggerFactory.getLogger(CamelSourceAWSSQSITCase.class);
+ @RegisterExtension
+ AWSService<AmazonSQS> service = AWSServiceFactory.createSQSService();
+
private AWSSQSClient awssqsClient;
private String queueName;
private String queueUrl;
diff --git
a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
index e876b8d..f51e4d0 100644
---
a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
+++
b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/AbstractKafkaTest.java
@@ -23,9 +23,7 @@ import
org.apache.camel.kafkaconnector.common.services.kafkaconnect.KafkaConnect
import org.apache.camel.kafkaconnector.common.utils.PropertyUtils;
import org.apache.camel.test.infra.kafka.services.KafkaService;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.testcontainers.junit.jupiter.Testcontainers;
-@Testcontainers
public abstract class AbstractKafkaTest {
@RegisterExtension
public final KafkaService kafkaService;
