You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/09 11:10:00 UTC
[camel] 01/02: Camel-AWS2-Kinesis: Migrated tests to Junit5
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4895d79e9bca4429e2c6636b22e6834a0aa7b5ac
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 9 12:03:12 2020 +0100
Camel-AWS2-Kinesis: Migrated tests to Junit5
---
components/camel-aws2-kinesis/pom.xml | 24 +++++++----
.../KinesisFirehoseComponentConfigurationTest.java | 6 ++-
...esisFirehoseComponentVerifierExtensionTest.java | 11 ++---
.../aws2/firehose/KinesisFirehoseEndpointTest.java | 14 +++----
.../KinesisFirehoseComponentIntegrationTest.java | 10 +++--
.../kinesis/KinesisComponentConfigurationTest.java | 7 +++-
.../KinesisComponentVerifierExtensionTest.java | 11 ++---
.../KinesisConsumerClosedShardWithFailTest.java | 19 ++++-----
.../KinesisConsumerClosedShardWithSilentTest.java | 47 ++++------------------
.../aws2/kinesis/KinesisEndpointTest.java | 13 +++---
.../aws2/kinesis/RecordStringConverterTest.java | 5 ++-
.../KinesisComponentIntegrationTest.java | 13 +++---
pom.xml | 2 +-
13 files changed, 88 insertions(+), 94 deletions(-)
diff --git a/components/camel-aws2-kinesis/pom.xml b/components/camel-aws2-kinesis/pom.xml
index 6245cae..24f1c09 100644
--- a/components/camel-aws2-kinesis/pom.xml
+++ b/components/camel-aws2-kinesis/pom.xml
@@ -58,13 +58,8 @@
<!-- for testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -83,8 +78,23 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java
index 231a3f1..5beddfc 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentConfigurationTest.java
@@ -16,11 +16,13 @@
*/
package org.apache.camel.component.aws2.firehose;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class KinesisFirehoseComponentConfigurationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentVerifierExtensionTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentVerifierExtensionTest.java
index 5b216c2..1ca2364 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseComponentVerifierExtensionTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/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-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseEndpointTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseEndpointTest.java
index 950fd56..5bab849 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseEndpointTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/KinesisFirehoseEndpointTest.java
@@ -19,18 +19,18 @@ package org.apache.camel.component.aws2.firehose;
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 software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.firehose.FirehoseClient;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisFirehoseEndpointTest {
@Mock
@@ -38,7 +38,7 @@ public class KinesisFirehoseEndpointTest {
private CamelContext camelContext;
- @Before
+ @BeforeEach
public void setup() throws Exception {
SimpleRegistry registry = new SimpleRegistry();
registry.bind("firehoseClient", amazonKinesisFirehoseClient);
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentIntegrationTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
index e591f64..80e349d 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/firehose/integration/KinesisFirehoseComponentIntegrationTest.java
@@ -22,12 +22,14 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.firehose.KinesisFirehose2Constants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.firehose.FirehoseClient;
-@Ignore("Must be manually tested.")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+@Disabled("Must be manually tested.")
public class KinesisFirehoseComponentIntegrationTest extends CamelTestSupport {
@BindToRegistry("FirehoseClient")
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
index 86db5f6..4285a41 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentConfigurationTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.camel.component.aws2.kinesis;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import software.amazon.awssdk.core.Protocol;
import software.amazon.awssdk.regions.Region;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class KinesisComponentConfigurationTest extends CamelTestSupport {
@Test
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentVerifierExtensionTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentVerifierExtensionTest.java
index c109cdf..6425178 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentVerifierExtensionTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisComponentVerifierExtensionTest.java
@@ -19,11 +19,12 @@ package org.apache.camel.component.aws2.kinesis;
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
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 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-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithFailTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithFailTest.java
index 344ec60..75aad18 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithFailTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithFailTest.java
@@ -21,12 +21,11 @@ import java.util.ArrayList;
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.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import software.amazon.awssdk.services.kinesis.KinesisClient;
import software.amazon.awssdk.services.kinesis.model.DescribeStreamRequest;
import software.amazon.awssdk.services.kinesis.model.DescribeStreamResponse;
@@ -40,12 +39,13 @@ import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
import software.amazon.awssdk.services.kinesis.model.StreamDescription;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisConsumerClosedShardWithFailTest {
@Mock
@@ -58,7 +58,7 @@ public class KinesisConsumerClosedShardWithFailTest {
private Kinesis2Consumer undertest;
- @Before
+ @BeforeEach
public void setup() throws Exception {
Kinesis2Configuration configuration = new Kinesis2Configuration();
configuration.setAmazonKinesisClient(kinesisClient);
@@ -80,9 +80,10 @@ public class KinesisConsumerClosedShardWithFailTest {
when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class))).thenReturn(GetShardIteratorResponse.builder().shardIterator("shardIterator").build());
}
- @Test(expected = ReachedClosedStatusException.class)
public void itObtainsAShardIteratorOnFirstPoll() throws Exception {
- undertest.poll();
+ assertThrows(ReachedClosedStatusException.class, () -> {
+ undertest.poll();
+ });
final ArgumentCaptor<DescribeStreamRequest> describeStreamReqCap = ArgumentCaptor.forClass(DescribeStreamRequest.class);
final ArgumentCaptor<GetShardIteratorRequest> getShardIteratorReqCap = ArgumentCaptor.forClass(GetShardIteratorRequest.class);
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java
index eae321c..cb8600c 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisConsumerClosedShardWithSilentTest.java
@@ -24,12 +24,12 @@ 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.junit.jupiter.MockitoExtension;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
import software.amazon.awssdk.services.kinesis.KinesisClient;
import software.amazon.awssdk.services.kinesis.model.DescribeStreamRequest;
import software.amazon.awssdk.services.kinesis.model.DescribeStreamResponse;
@@ -44,13 +44,13 @@ import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
import software.amazon.awssdk.services.kinesis.model.StreamDescription;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.hamcrest.MatcherAssert.assertThat;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisConsumerClosedShardWithSilentTest {
@Mock
@@ -63,7 +63,7 @@ public class KinesisConsumerClosedShardWithSilentTest {
private Kinesis2Consumer undertest;
- @Before
+ @BeforeEach
public void setup() throws Exception {
Kinesis2Configuration configuration = new Kinesis2Configuration();
configuration.setAmazonKinesisClient(kinesisClient);
@@ -79,7 +79,7 @@ public class KinesisConsumerClosedShardWithSilentTest {
ArrayList<Shard> shardList = new ArrayList<>();
shardList.add(shard);
- when(kinesisClient.getRecords(any(GetRecordsRequest.class))).thenReturn(GetRecordsResponse.builder().nextShardIterator("nextShardIterator").build());
+ when(kinesisClient.getRecords(any(GetRecordsRequest.class))).thenReturn(GetRecordsResponse.builder().nextShardIterator("nextShardIterator").records(Record.builder().sequenceNumber("1").build(), Record.builder().sequenceNumber("2").build()).build());;
when(kinesisClient.describeStream(any(DescribeStreamRequest.class)))
.thenReturn(DescribeStreamResponse.builder().streamDescription(StreamDescription.builder().shards(shardList).build()).build());
when(kinesisClient.getShardIterator(any(GetShardIteratorRequest.class))).thenReturn(GetShardIteratorResponse.builder().shardIterator("shardIterator").build());
@@ -159,35 +159,4 @@ public class KinesisConsumerClosedShardWithSilentTest {
assertThat(getRecordsReqCap.getAllValues().get(0).shardIterator(), is("shardIterator"));
assertThat(getRecordsReqCap.getAllValues().get(1).shardIterator(), is("nextShardIterator"));
}
-
- @Test
- public void recordsAreSentToTheProcessor() throws Exception {
- when(kinesisClient.getRecords(any(GetRecordsRequest.class))).thenReturn(GetRecordsResponse.builder().nextShardIterator("nextShardIterator")
- .records(Record.builder().sequenceNumber("1").build(), Record.builder().sequenceNumber("2").build()).build());
-
- int messageCount = undertest.poll();
-
- assertThat(messageCount, is(2));
- 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).sequenceNumber(), is("1"));
- assertThat(exchangeCaptor.getAllValues().get(1).getIn().getBody(Record.class).sequenceNumber(), is("2"));
- }
-
- @Test
- public void exchangePropertiesAreSet() throws Exception {
- String partitionKey = "partitionKey";
- String sequenceNumber = "1";
- when(kinesisClient.getRecords(any(GetRecordsRequest.class))).thenReturn(GetRecordsResponse.builder().nextShardIterator("nextShardIterator")
- .records(Record.builder().sequenceNumber(sequenceNumber).approximateArrivalTimestamp(Instant.now()).partitionKey(partitionKey).build()).build());
-
- undertest.poll();
-
- final ArgumentCaptor<Exchange> exchangeCaptor = ArgumentCaptor.forClass(Exchange.class);
-
- verify(processor).process(exchangeCaptor.capture(), any(AsyncCallback.class));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(Kinesis2Constants.PARTITION_KEY, String.class), is(partitionKey));
- assertThat(exchangeCaptor.getValue().getIn().getHeader(Kinesis2Constants.SEQUENCE_NUMBER, String.class), is(sequenceNumber));
- }
}
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisEndpointTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisEndpointTest.java
index 9f0790b..11406370 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisEndpointTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/KinesisEndpointTest.java
@@ -19,18 +19,19 @@ package org.apache.camel.component.aws2.kinesis;
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.jupiter.MockitoExtension;
import org.mockito.junit.MockitoJUnitRunner;
import software.amazon.awssdk.services.kinesis.KinesisClient;
import software.amazon.awssdk.services.kinesis.model.ShardIteratorType;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KinesisEndpointTest {
@Mock
@@ -38,7 +39,7 @@ public class KinesisEndpointTest {
private CamelContext camelContext;
- @Before
+ @BeforeEach
public void setup() throws Exception {
SimpleRegistry registry = new SimpleRegistry();
registry.bind("kinesisClient", amazonKinesisClient);
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/RecordStringConverterTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/RecordStringConverterTest.java
index 3321ad0..cc0614b 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/RecordStringConverterTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/RecordStringConverterTest.java
@@ -19,12 +19,13 @@ package org.apache.camel.component.aws2.kinesis;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
import software.amazon.awssdk.core.SdkBytes;
import software.amazon.awssdk.services.kinesis.model.Record;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class RecordStringConverterTest {
diff --git a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisComponentIntegrationTest.java b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisComponentIntegrationTest.java
index 15d4562..27de85c 100644
--- a/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisComponentIntegrationTest.java
+++ b/components/camel-aws2-kinesis/src/test/java/org/apache/camel/component/aws2/kinesis/integration/KinesisComponentIntegrationTest.java
@@ -25,13 +25,17 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.kinesis.Kinesis2Constants;
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 software.amazon.awssdk.services.kinesis.KinesisClient;
import software.amazon.awssdk.services.kinesis.model.Record;
-@Ignore("Must be manually tested.")
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("Must be manually tested.")
public class KinesisComponentIntegrationTest extends CamelTestSupport {
@BindToRegistry("amazonKinesisClient")
@@ -68,7 +72,6 @@ public class KinesisComponentIntegrationTest extends CamelTestSupport {
}
private void assertResultExchange(Exchange resultExchange, String data, String partition) {
- assertIsInstanceOf(Record.class, resultExchange.getIn().getBody());
Record record = resultExchange.getIn().getBody(Record.class);
assertEquals(data, new String(record.data().asByteArray()));
assertEquals(partition, resultExchange.getIn().getHeader(Kinesis2Constants.PARTITION_KEY));
diff --git a/pom.xml b/pom.xml
index c61b582..3e2c17f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<errorprone-version>2.5</errorprone-version>
<mycila-license-version>3.0</mycila-license-version>
<gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
- <groovy-version>3.0.1</groovy-version>
+ <groovy-version>3.0.2</groovy-version>
</properties>
<!-- Comment out the snapshot repositories as we don't need them now -->