migrate to Junit Jupiter.

including: `spring-integration-http`, `spring-integration-jdbc`, `spring-integration-jms`

Signed-off-by: Jiandong Ma <[email protected]>

Author: mjd507

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java

@@ -47,15 +47,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.springframework.integration.amqp.inbound.ManualAckTests.ManualAckConfig;
 
 /**
  * @author Gary Russell
  * @since 4.0
  *
  */
 @RabbitAvailable
-@SpringJUnitConfig(ManualAckConfig.class)
+@SpringJUnitConfig(ManualAckTests.ManualAckConfig.class)
 @DirtiesContext
 public class ManualAckTests {
 

spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java

@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanFactory;
@@ -53,7 +52,6 @@
  *
  * @since 3.0
  */
-@ExtendWith(TailCondition.class)
 public class FileTailingMessageProducerTests {
 
 	private static final String TAIL_OPTIONS_FOLLOW_NAME_ALL_LINES = "-F -n +0";

spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailAvailable.java

@@ -21,11 +21,14 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.extension.ExtendWith;
+
 /**
  * @author Gary Russell
  * @since 3.0
  *
  */
+@ExtendWith(TailCondition.class)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD})
 public @interface TailAvailable {

spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 the original author or authors.
+ * Copyright 2002-2025 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.

spring-integration-http/src/test/java/org/springframework/integration/http/config/ChainElementsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -19,7 +19,7 @@
 import java.io.ByteArrayInputStream;
 import java.util.Properties;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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,9 +16,8 @@
 
 package org.springframework.integration.http.config;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -30,12 +29,12 @@
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
 import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
@@ -44,8 +43,7 @@
  * @author Oleg Zhurakousky
  * @author Artem Bilan
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@SpringJUnitConfig
 @DirtiesContext
 public class HttpOutboundGatewayWithMethodExpressionTests {
 
@@ -63,7 +61,7 @@ public class HttpOutboundGatewayWithMethodExpressionTests {
 
 	private MockRestServiceServer mockServer;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.mockServer = MockRestServiceServer.createServer(this.restTemplate);
 	}
@@ -96,11 +94,11 @@ public void testExplicitlySetMethod() {
 		this.mockServer.verify();
 	}
 
-	@Test(expected = BeanDefinitionParsingException.class)
+	@Test
 	public void testMutuallyExclusivityInMethodAndMethodExpression() {
-		new ClassPathXmlApplicationContext(
-				"http-outbound-gateway-with-httpmethod-expression-fail.xml", getClass())
-				.close();
+		assertThatExceptionOfType(BeanDefinitionParsingException.class)
+				.isThrownBy(() -> new ClassPathXmlApplicationContext(
+						"http-outbound-gateway-with-httpmethod-expression-fail.xml", getClass()));
 	}
 
 }

spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;

spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -29,8 +29,8 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -42,6 +42,8 @@
 import org.springframework.util.StopWatch;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 /**
  * @author Oleg Zhurakousky
@@ -55,14 +57,16 @@
 public class DefaultHttpHeaderMapperFromMessageOutboundTests {
 
 	// ACCEPT tests
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void validateAcceptHeaderWithNoSlash() {
 		HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
 		Map<String, Object> messageHeaders = new HashMap<>();
 		messageHeaders.put("Accept", "bar");
 		HttpHeaders headers = new HttpHeaders();
 
-		mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
+		MessageHeaders messageHeadersObj = new MessageHeaders(messageHeaders);
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> mapper.fromHeaders(messageHeadersObj, headers));
 	}
 
 	@Test
@@ -158,13 +162,15 @@ public void validateAcceptHeaderMultipleAsMediaTypeCollection() {
 
 	// ACCEPT_CHARSET tests
 
-	@Test(expected = UnsupportedCharsetException.class)
+	@Test
 	public void validateAcceptCharsetHeaderWithWrongCharset() {
 		HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
 		Map<String, Object> messageHeaders = new HashMap<>();
 		messageHeaders.put("Accept-Charset", "foo");
 		HttpHeaders headers = new HttpHeaders();
-		mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
+		MessageHeaders messageHeadersObj = new MessageHeaders(messageHeaders);
+		assertThatExceptionOfType(UnsupportedCharsetException.class)
+				.isThrownBy(() -> mapper.fromHeaders(messageHeadersObj, headers));
 	}
 
 	@Test
@@ -298,26 +304,30 @@ public void validateContentLengthAsNumber() {
 		assertThat(headers.getContentLength()).isEqualTo(1);
 	}
 
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void validateContentLengthAsNonNumericString() {
 		HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
 		Map<String, Object> messageHeaders = new HashMap<>();
 		messageHeaders.put("Content-Length", "foo");
 		HttpHeaders headers = new HttpHeaders();
 
-		mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
+		MessageHeaders messageHeadersObj = new MessageHeaders(messageHeaders);
+		assertThatExceptionOfType(NumberFormatException.class)
+				.isThrownBy(() -> mapper.fromHeaders(messageHeadersObj, headers));
 	}
 
 	// Content-Type test
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void validateContentTypeWrongValue() {
 		HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
 		Map<String, Object> messageHeaders = new HashMap<>();
 		messageHeaders.put(MessageHeaders.CONTENT_TYPE, "foo");
 		HttpHeaders headers = new HttpHeaders();
 
-		mapper.fromHeaders(new MessageHeaders(messageHeaders), headers);
+		MessageHeaders messageHeadersObj = new MessageHeaders(messageHeaders);
+		assertThatIllegalArgumentException()
+				.isThrownBy(() -> mapper.fromHeaders(messageHeadersObj, headers));
 	}
 
 	@Test
@@ -542,7 +552,7 @@ public void validateTransferEncodingToHeaders() {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void perf() {
 		HeaderMapper<HttpHeaders> mapper = DefaultHttpHeaderMapper.outboundMapper();
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcOutboundGatewayTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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,9 +16,9 @@
 
 package org.springframework.integration.jdbc;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.jdbc.core.JdbcOperations;
@@ -42,12 +42,12 @@ public class JdbcOutboundGatewayTests {
 
 	private static EmbeddedDatabase dataSource;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setup() {
 		dataSource = new EmbeddedDatabaseBuilder().build();
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void teardown() {
 		dataSource.shutdown();
 	}

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -22,10 +22,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -50,7 +50,7 @@ public class JdbcPollingChannelAdapterIntegrationTests {
 
 	private static JdbcTemplate jdbcTemplate;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setUp() {
 		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
 		builder.setType(EmbeddedDatabaseType.DERBY)
@@ -59,12 +59,12 @@ public static void setUp() {
 		jdbcTemplate = new JdbcTemplate(embeddedDatabase);
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void tearDown() {
 		embeddedDatabase.shutdown();
 	}
 
-	@After
+	@AfterEach
 	public void cleanup() {
 		jdbcTemplate.execute("DELETE FROM item");
 		jdbcTemplate.execute("DELETE FROM copy");

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -20,15 +20,14 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.logging.LogFactory;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import org.springframework.integration.store.MessageGroup;
 import org.springframework.integration.store.MessageGroupQueue;
 import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.integration.store.SimpleMessageStore;
-import org.springframework.integration.test.support.LongRunningIntegrationTest;
+import org.springframework.integration.test.condition.LongRunningTest;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.GenericMessage;
 
@@ -38,11 +37,9 @@
  * @author Oleg Zhurakousky
  * @author Artem Bilan
  */
+@LongRunningTest
 public class MessageGroupQueueTests {
 
-	@ClassRule
-	public static LongRunningIntegrationTest longTests = new LongRunningIntegrationTest();
-
 	@Test
 	public void validateMgqInterruption() throws Exception {
 

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2025 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,7 +23,7 @@
 
 import javax.sql.DataSource;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanFactory;