From a1b51c9f47d158d4faf2739ca9b2a27c217f586c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 14 Jun 2019 17:35:37 -0400 Subject: [PATCH] Fix tests for SK 2.3.0.M3 --- .../kafka/config/xml/KafkaOutboundAdapterParserTests.java | 8 +++++++- .../kafka/outbound/KafkaProducerMessageHandlerTests.java | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java index eba9b8a06f..598c42ff7a 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java @@ -18,6 +18,8 @@ package org.springframework.integration.kafka.config.xml; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import java.util.concurrent.Executors; @@ -38,6 +40,7 @@ import org.springframework.integration.kafka.outbound.KafkaProducerMessageHandle import org.springframework.integration.test.util.TestUtils; import org.springframework.kafka.core.KafkaProducerException; import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.kafka.core.ProducerFactory; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; @@ -102,7 +105,10 @@ public class KafkaOutboundAdapterParserTests { } }; - KafkaTemplate template = new KafkaTemplate<>(() -> mockProducer); + @SuppressWarnings("unchecked") + ProducerFactory pf = mock(ProducerFactory.class); + given(pf.createProducer(isNull())).willReturn(mockProducer); + KafkaTemplate template = new KafkaTemplate<>(pf); KafkaProducerMessageHandler handler = new KafkaProducerMessageHandler<>(template); handler.setBeanFactory(mock(BeanFactory.class)); handler.afterPropertiesSet(); diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java index f04b93e930..c6a7427072 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java @@ -19,6 +19,7 @@ package org.springframework.integration.kafka.outbound; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willAnswer; import static org.mockito.BDDMockito.willReturn; @@ -427,7 +428,7 @@ public class KafkaProducerMessageHandlerTests { ProducerFactory pf = mock(ProducerFactory.class); given(pf.transactionCapable()).willReturn(true); Producer producer = mock(Producer.class); - given(pf.createProducer()).willReturn(producer); + given(pf.createProducer(isNull())).willReturn(producer); ListenableFuture future = mock(ListenableFuture.class); willReturn(future).given(producer).send(any(ProducerRecord.class), any(Callback.class)); KafkaTemplate template = new KafkaTemplate(pf); @@ -481,7 +482,7 @@ public class KafkaProducerMessageHandlerTests { willAnswer(i -> { transactionalIds.add(TransactionSupport.getTransactionIdSuffix()); return producer; - }).given(pf).createProducer(); + }).given(pf).createProducer(isNull()); KafkaTransactionManager tm = new KafkaTransactionManager(pf); PlatformTransactionManager ptm = tm; ContainerProperties props = new ContainerProperties("foo"); @@ -515,7 +516,7 @@ public class KafkaProducerMessageHandlerTests { inOrder.verify(producer).commitTransaction(); inOrder.verify(producer).close(); container.stop(); - verify(pf, times(2)).createProducer(); + verify(pf, times(2)).createProducer(isNull()); verifyNoMoreInteractions(producer); assertThat(transactionalIds.get(0)).isEqualTo("group.foo.0"); assertThat(transactionalIds.get(0)).isEqualTo("group.foo.0");