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/07/27 15:39:27 UTC
[camel] 40/43: [CAMEL-11807] Upgrade camel-kafka 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 e83ec8418f09cc127da8c1fa6c5c572314f037b8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 16:12:57 2020 +0200
[CAMEL-11807] Upgrade camel-kafka to junit5
---
.../camel/component/kafka/KafkaEndpointTest.java | 10 ++++----
.../camel/component/kafka/KafkaProducerTest.java | 30 +++++++++++-----------
.../serde/DefaultKafkaHeaderDeserializerTest.java | 4 +--
.../serde/DefaultKafkaHeaderSerializerTest.java | 2 +-
.../kafka/clients/consumer/KafkaConsumerTest.java | 2 +-
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
index 7bfb0df..fdad9a9 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
@@ -24,14 +24,14 @@ 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.jupiter.MockitoSettings;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
-@ExtendWith(MockitoExtension.class)
+@MockitoSettings
public class KafkaEndpointTest {
private KafkaEndpoint endpoint;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index be5df93..9c45eea 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -47,11 +47,11 @@ import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+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;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isA;
@@ -401,15 +401,15 @@ public class KafkaProducerTest {
private void assertRecordMetadataExists() {
List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>)in.getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData1 != null);
- assertEquals("Expected one recordMetaData", recordMetaData1.size(), 1);
- assertTrue(recordMetaData1.get(0) != null);
+ assertNotNull(recordMetaData1);
+ assertEquals(recordMetaData1.size(), 1, "Expected one recordMetaData");
+ assertNotNull(recordMetaData1.get(0));
}
private void assertRecordMetadataExists(final int numMetadata) {
List<RecordMetadata> recordMetaData1 = (List<RecordMetadata>)in.getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData1 != null);
- assertEquals("Expected one recordMetaData", recordMetaData1.size(), numMetadata);
+ assertNotNull(recordMetaData1);
+ assertEquals(recordMetaData1.size(), numMetadata, "Expected one recordMetaData");
assertTrue(recordMetaData1.get(0) != null);
}
@@ -417,9 +417,9 @@ public class KafkaProducerTest {
List<Exchange> exchanges = (List<Exchange>)in.getBody();
for (Exchange ex : exchanges) {
List<RecordMetadata> recordMetaData = (List<RecordMetadata>)ex.getMessage().getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData != null);
- assertEquals("Expected one recordMetaData", recordMetaData.size(), 1);
- assertTrue(recordMetaData.get(0) != null);
+ assertNotNull(recordMetaData);
+ assertEquals(recordMetaData.size(), 1, "Expected one recordMetaData");
+ assertNotNull(recordMetaData.get(0));
}
}
@@ -427,9 +427,9 @@ public class KafkaProducerTest {
List<Message> messages = (List<Message>)in.getBody();
for (Message msg : messages) {
List<RecordMetadata> recordMetaData = (List<RecordMetadata>)msg.getHeader(KafkaConstants.KAFKA_RECORDMETA);
- assertTrue(recordMetaData != null);
- assertEquals("Expected one recordMetaData", recordMetaData.size(), 1);
- assertTrue(recordMetaData.get(0) != null);
+ assertNotNull(recordMetaData);
+ assertEquals(recordMetaData.size(), 1, "Expected one recordMetaData");
+ assertNotNull(recordMetaData.get(0));
}
}
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java
index b54959d..9ed4e60 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderDeserializerTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.kafka.serde;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class DefaultKafkaHeaderDeserializerTest {
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java
index 9962302..2865c00 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/serde/DefaultKafkaHeaderSerializerTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class DefaultKafkaHeaderSerializerTest {
diff --git a/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
index 41c42b8..00b252f 100644
--- a/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)