From 3d785ffd992a32942f0d0927c79433bc0e947cab Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Wed, 20 Oct 2021 14:04:47 -0400 Subject: [PATCH] Updated versions and re-enabled kafka test --- spring-cloud-starter-single-step-batch-job/pom.xml | 13 ++----------- .../KafkaItemReaderAutoConfigurationTests.java | 13 ++++++++----- .../autoconfigure/kafka/KafkaItemWriterTests.java | 9 ++++++--- spring-cloud-task-integration-tests/pom.xml | 4 ++-- spring-cloud-task-samples/batch-events/pom.xml | 4 ++-- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index d003ba54..553b65a1 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -10,11 +10,9 @@ spring-cloud-starter-single-step-batch-job - 1.15.3 - 1.15.3 + 1.16.0 + 1.16.0 1.0.8 - 2.8.0-RC1 - 3.2.0-SNAPSHOT @@ -83,11 +81,6 @@ com.fasterxml.jackson.core jackson-annotations - - org.springframework.cloud - spring-cloud-stream-binder-kafka - ${spring-cloud-stream.version} - org.junit.jupiter junit-jupiter @@ -106,13 +99,11 @@ org.springframework.kafka spring-kafka-test - ${spring-kafka-version} test org.springframework.kafka spring-kafka - ${spring-kafka-version} org.junit.jupiter diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java index 70b38a48..900d7033 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java @@ -26,6 +26,8 @@ import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.common.serialization.StringSerializer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -45,16 +47,17 @@ import org.springframework.kafka.core.DefaultKafkaProducerFactory; import org.springframework.kafka.support.serializer.JsonDeserializer; import org.springframework.kafka.support.serializer.JsonSerializer; import org.springframework.kafka.test.EmbeddedKafkaBroker; +import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.kafka.test.utils.KafkaTestUtils; import static org.assertj.core.api.Assertions.assertThat; -//@EmbeddedKafka(partitions = 1, topics = { "test" }) +@EmbeddedKafka(partitions = 1, topics = { "test" }) public class KafkaItemReaderAutoConfigurationTests { private static EmbeddedKafkaBroker embeddedKafkaBroker; -// @BeforeAll + @BeforeAll public static void setupTest(EmbeddedKafkaBroker embeddedKafka) { embeddedKafkaBroker = embeddedKafka; embeddedKafka.addTopics(new NewTopic("topic1", 1, (short) 1), @@ -62,7 +65,7 @@ public class KafkaItemReaderAutoConfigurationTests { new NewTopic("topic3", 1, (short) 1)); } -// @Test + @Test public void testBaseKafkaItemReader() { final String topicName = "topic1"; populateSingleTopic(topicName); @@ -109,7 +112,7 @@ public class KafkaItemReaderAutoConfigurationTests { }); } -// @Test + @Test public void testBaseKafkaItemReaderMultiplePartitions() { final String topicName = "topic2"; populateSingleTopic(topicName); @@ -151,7 +154,7 @@ public class KafkaItemReaderAutoConfigurationTests { }); } -// @Test + @Test public void testBaseKafkaItemReaderPollTimeoutDefault() { final String topicName = "topic3"; populateSingleTopic(topicName); diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java index 38ff53cf..102e36b2 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java @@ -24,6 +24,8 @@ import java.util.Map; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.common.serialization.StringDeserializer; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -43,23 +45,24 @@ import org.springframework.context.annotation.Configuration; import org.springframework.kafka.core.DefaultKafkaConsumerFactory; import org.springframework.kafka.support.serializer.JsonDeserializer; import org.springframework.kafka.test.EmbeddedKafkaBroker; +import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.kafka.test.utils.KafkaTestUtils; import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThat; -// @EmbeddedKafka(partitions = 1, topics = { "topic1" }) +@EmbeddedKafka(partitions = 1, topics = { "topic1" }) public class KafkaItemWriterTests { private static EmbeddedKafkaBroker embeddedKafkaBroker; -// @BeforeAll + @BeforeAll public static void setupTest(EmbeddedKafkaBroker embeddedKafka) { embeddedKafkaBroker = embeddedKafka; embeddedKafka.addTopics("topic2"); } -// @Test + @Test public void testBaseKafkaItemWriter() { final String topicName = "topic1"; ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner() diff --git a/spring-cloud-task-integration-tests/pom.xml b/spring-cloud-task-integration-tests/pom.xml index 8e76c78b..e4a776a0 100644 --- a/spring-cloud-task-integration-tests/pom.xml +++ b/spring-cloud-task-integration-tests/pom.xml @@ -13,8 +13,8 @@ spring-cloud-task-integration-tests - 1.15.3 - 1.15.3 + 1.16.0 + 1.16.0 1.0.8 diff --git a/spring-cloud-task-samples/batch-events/pom.xml b/spring-cloud-task-samples/batch-events/pom.xml index bf301a0b..eba5077f 100644 --- a/spring-cloud-task-samples/batch-events/pom.xml +++ b/spring-cloud-task-samples/batch-events/pom.xml @@ -20,8 +20,8 @@ UTF-8 1.8 - 1.15.3 - 1.15.3 + 1.16.0 + 1.16.0 1.0.8 3.2.0-SNAPSHOT