You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/11/28 12:34:30 UTC
[camel-kafka-connector] branch master updated (2303669 -> d83202f)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from 2303669 Updated CHANGELOG.md
new 2f48ec1 Remove an unused annotation that (apparently) slows down the tests a little bit
new 0f94c14 Do not nullify the cluster reference on the embedded kafka service.
new e84b2c2 Rework the AWS v1 tests to fix tests performance issues
new d83202f Rework the AWS v2 tests to fix tests performance issues
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java | 14 +++++++-------
.../aws/v1/s3/source/CamelSourceAWSS3ITCase.java | 11 ++++++-----
.../aws/v1/sns/sink/CamelSinkAWSSNSITCase.java | 12 +++++++-----
.../aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java | 12 +++++++-----
.../aws/v1/sqs/source/CamelSourceAWSSQSITCase.java | 12 +++++++-----
.../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 +++++++---
.../camel/kafkaconnector/common/AbstractKafkaTest.java | 2 --
.../common/services/kafka/EmbeddedKafkaService.java | 1 -
11 files changed, 61 insertions(+), 47 deletions(-)
[camel-kafka-connector] 02/04: Do not nullify the cluster reference
on the embedded kafka service.
Posted by or...@apache.org.
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 0f94c14995fc0733f4a77e1f7fbdcdbb5dee091c
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Nov 27 17:00:54 2020 +0100
Do not nullify the cluster reference on the embedded kafka service.
This ensures that the embedded kafka service is compatible with JUnit's 5 class life cycle
---
.../camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
index caffbf1..3ef2c06 100644
--- a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
+++ b/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/kafka/EmbeddedKafkaService.java
@@ -94,7 +94,6 @@ public class EmbeddedKafkaService implements KafkaService {
if (started) {
cluster.stop();
- cluster = null;
started = false;
}
}
[camel-kafka-connector] 01/04: Remove an unused annotation that
(apparently) slows down the tests a little bit
Posted by or...@apache.org.
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 2f48ec1777eb95e8b0e2cf2aaa4a8dad99b35609
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Fri Nov 27 12:27:13 2020 +0100
Remove an unused annotation that (apparently) slows down the tests a little bit
---
.../aws/v1/kinesis/source/CamelSourceAWSKinesisITCase.java | 2 --
.../camel/kafkaconnector/aws/v1/s3/source/CamelSourceAWSS3ITCase.java | 3 +--
.../camel/kafkaconnector/aws/v1/sns/sink/CamelSinkAWSSNSITCase.java | 2 --
.../camel/kafkaconnector/aws/v1/sqs/sink/CamelSinkAWSSQSITCase.java | 2 --
.../kafkaconnector/aws/v1/sqs/source/CamelSourceAWSSQSITCase.java | 2 --
5 files changed, 1 insertion(+), 10 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 0dad306..ecfa674 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
@@ -48,12 +48,10 @@ import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.junit.jupiter.Testcontainers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-@Testcontainers
public class CamelSourceAWSKinesisITCase extends AbstractKafkaTest {
@RegisterExtension
public static AWSService<AmazonKinesis> service = AWSServiceFactory.createKinesisService();
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 05e2319..92b58f5 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
@@ -40,12 +40,11 @@ import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.junit.jupiter.Testcontainers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-@Testcontainers
+
public class CamelSourceAWSS3ITCase extends AbstractKafkaTest {
@RegisterExtension
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 93a709c..e739e3a 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
@@ -44,12 +44,10 @@ import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.junit.jupiter.Testcontainers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-@Testcontainers
public class CamelSinkAWSSNSITCase extends AbstractKafkaTest {
@RegisterExtension
public static AWSService<AmazonSQS> service = AWSServiceFactory.createSNSService();
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 c595c67..9e9d598 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
@@ -45,12 +45,10 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.junit.jupiter.Testcontainers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-@Testcontainers
public class CamelSinkAWSSQSITCase extends AbstractKafkaTest {
@RegisterExtension
public static AWSService<AmazonSQS> awsService = AWSServiceFactory.createSQSService();
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 786042b..7e40b9b 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
@@ -40,12 +40,10 @@ import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.junit.jupiter.Testcontainers;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-@Testcontainers
public class CamelSourceAWSSQSITCase extends AbstractKafkaTest {
@RegisterExtension
public static AWSService<AmazonSQS> service = AWSServiceFactory.createSQSService();
[camel-kafka-connector] 03/04: Rework the AWS v1 tests to fix tests
performance issues
Posted by or...@apache.org.
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 <op...@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;
[camel-kafka-connector] 04/04: Rework the AWS v2 tests to fix tests
performance issues
Posted by or...@apache.org.
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 <op...@redhat.com>
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;