Close volatile resource in some Kafka tests

spring-projects · Sep 7, 2022 · 47cfae9 · 47cfae9
1 parent 96d3b00
commit 47cfae9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...afka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java b/...afka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java
@@ -189,6 +189,8 @@ public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowle
 		assertThat(gateway.isPaused()).isFalse();
 
 		gateway.stop();
+		consumer.close();
+		pf.reset();
 	}
 
 	@Test
@@ -268,6 +270,8 @@ public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowle
 		assertThat(record).has(value("ERROR"));
 
 		gateway.stop();
+		consumer.close();
+		pf.reset();
 	}
 
 	@Test
@@ -352,6 +356,8 @@ public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowle
 		assertThat(record).has(value("ERROR"));
 
 		gateway.stop();
+		consumer.close();
+		pf.reset();
 	}
 
 	@Test
@@ -409,6 +415,7 @@ public <T, E extends Throwable> void onError(RetryContext context, RetryCallback
 
 		gateway.stop();
 		consumer.close();
+		pf.reset();
 	}
 
 }
diff --git a/...rc/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java b/...rc/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java
@@ -215,6 +215,7 @@ public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowle
 		assertThat(((ConversionException) error.getPayload()).getRecord()).isNotNull();
 
 		adapter.stop();
+		pf.reset();
 	}
 
 	@Test
@@ -277,6 +278,7 @@ protected boolean doSend(Message<?> message, long timeout) {
 		assertThat(receivedMessageHistory.get().toString()).isEqualTo("myNullChannel");
 
 		adapter.stop();
+		pf.reset();
 	}
 
 
@@ -387,6 +389,7 @@ protected boolean doSend(Message<?> message, long timeout) {
 		assertThat(StaticMessageHeaderAccessor.getDeliveryAttempt(originalMessage).get()).isEqualTo(1);
 
 		adapter.stop();
+		pf.reset();
 	}
 
 	@Test
@@ -474,7 +477,9 @@ public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, Acknowledgment a
 		assertThat(((ConversionException) error.getPayload()).getMessage())
 				.contains("Failed to convert to message");
 		assertThat(((ConversionException) error.getPayload()).getRecords()).hasSize(2);
+
 		adapter.stop();
+		pf.reset();
 	}
 
 	@Test
@@ -517,6 +522,7 @@ void testInboundJson() {
 		assertThat(received.getPayload()).isInstanceOf(Map.class);
 
 		adapter.stop();
+		pf.reset();
 	}
 
 	@Test
@@ -564,6 +570,7 @@ void testInboundJsonWithPayload() {
 		assertThat(received.getPayload()).isEqualTo(new Foo("baz"));
 
 		adapter.stop();
+		pf.reset();
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })

diff --git a/...est/java/org/springframework/integration/kafka/inbound/MessageSourceIntegrationTests.java b/...est/java/org/springframework/integration/kafka/inbound/MessageSourceIntegrationTests.java
@@ -119,7 +119,7 @@ public void onPartitionsAssigned(Collection<TopicPartition> partitions) {
 		assertThat(received).isNull();
 		assertThat(KafkaTestUtils.getPropertyValue(source, "consumer.fetcher.minBytes")).isEqualTo(2);
 		source.destroy();
-		producerFactory.destroy();
+		template.destroy();
 	}
 
 }