Close TaskScheduler in tests

* Add `@DirtiesContext` to some tests where `TaskScheduler` is used
spring-projects · Jan 30, 2024 · 0ba60bc · 0ba60bc
1 parent 62fd3e6
commit 0ba60bc
Show file tree

Hide file tree

Showing 15 changed files with 153 additions and 194 deletions.
diff --git a/...ation-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java b/...ation-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -363,6 +363,8 @@ public void testTimeoutDefaultExpiry() {
 		this.resequencer.handleMessage(message1);
 		Message<?> out3 = discardChannel.receive(0);
 		assertThat(out3).isNotNull();
+
+		taskScheduler.destroy();
 	}
 
 	@Test
@@ -393,6 +395,8 @@ public void testTimeoutDontExpire() {
 		assertThat(out3).isNull();
 		out3 = discardChannel.receive(10_000);
 		assertThat(out3).isNotNull();
+
+		taskScheduler.destroy();
 	}
 
 	private static Message<?> createMessage(String payload, Object correlationId, int sequenceSize, int sequenceNumber,

diff --git a/...tion-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/...tion-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,7 @@
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.SubscribableChannel;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -66,6 +67,7 @@
  * @author Gary Russell
  */
 @SpringJUnitConfig
+@DirtiesContext
 public class AggregatorParserTests {
 
 	@Autowired

diff --git a/...a/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java b/...a/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -263,6 +263,8 @@ public void testZeroForMaxMessagesPerPoll() throws InterruptedException {
 		assertThat(receive).isNotNull();
 		assertThat(receive.getPayload()).isEqualTo("test");
 		pollingChannelAdapter.stop();
+
+		taskScheduler.destroy();
 	}
 
 

diff --git a/...work/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorHierarchyTests.java b/...work/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorHierarchyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.config.xml;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,6 +28,7 @@
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class DefaultConfiguringBeanFactoryPostProcessorHierarchyTests {
 
@@ -47,6 +48,9 @@ public void verifySinglePostProcessor() {
 				.isSameAs(parent.getBean(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME));
 		assertThat(child.getBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME))
 				.isSameAs(parent.getBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME));
+
+		child.close();
+		parent.close();
 	}
 
 }
diff --git a/...ringframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests.java b/...ringframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.integration.config.xml;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -30,8 +30,8 @@
 import org.springframework.messaging.MessageChannel;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.util.ErrorHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,9 +40,10 @@
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @author Gary Russell
+ * @author Artem Bilan
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@SpringJUnitConfig
+@DirtiesContext
 public class DefaultConfiguringBeanFactoryPostProcessorTests {
 
 	@Autowired

diff --git a/...ion-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java b/...ion-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.interceptor.MatchAlwaysTransactionAttributeSource;
@@ -50,6 +51,7 @@
  * @since 1.0.3
  */
 @SpringJUnitConfig
+@DirtiesContext
 public class DelayerParserTests {
 
 	@Autowired

diff --git a/...n-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java b/...n-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,6 +34,7 @@
  * @since 3.0
  */
 @SpringJUnitConfig
+@DirtiesContext
 public class IntegrationContextTests {
 
 	@Autowired