Migrate spring-integration-core tests from Junit 4 to Junit Jupiter

spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.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.
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanFactory;
@@ -52,7 +52,7 @@ public class AggregatingMessageGroupProcessorHeaderTests {
 	private final MethodInvokingMessageGroupProcessor methodInvokingProcessor =
 			new MethodInvokingMessageGroupProcessor(new TestAggregatorBean(), "aggregate");
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.defaultProcessor.setBeanFactory(mock(BeanFactory.class));
 		this.methodInvokingProcessor.setBeanFactory(mock(BeanFactory.class));

spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.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.
@@ -22,12 +22,11 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import org.springframework.integration.store.MessageGroup;
 import org.springframework.integration.support.MessageBuilder;
@@ -36,25 +35,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
  * @author Iwein Fuld
  * @author Gary Russell
  */
-@RunWith(MockitoJUnitRunner.class)
 public class CorrelatingMessageBarrierTests {
 
 	private CorrelatingMessageBarrier barrier;
 
-	@Mock
-	private CorrelationStrategy correlationStrategy;
+	private final CorrelationStrategy correlationStrategy = mock();
 
-	@Mock
-	private ReleaseStrategy releaseStrategy;
+	private final ReleaseStrategy releaseStrategy = mock();
 
-	@Before
+	@BeforeEach
 	public void initializeBarrier() {
 		barrier = new CorrelatingMessageBarrier();
 		barrier.setCorrelationStrategy(correlationStrategy);
@@ -83,7 +80,8 @@ public void shouldRemoveKeyWithoutLockingOnEmptyQueue() throws InterruptedExcept
 		assertThat(barrier.receive()).isNull();
 	}
 
-	@Test(timeout = 10000)
+	@Test
+	@Timeout(value = 10000, unit = TimeUnit.MILLISECONDS)
 	public void shouldNotDropMessageOrBlockSendingThread() {
 		OneMessagePerKeyReleaseStrategy trackingReleaseStrategy = new OneMessagePerKeyReleaseStrategy();
 		barrier.setReleaseStrategy(trackingReleaseStrategy);

spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.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.
@@ -16,8 +16,8 @@
 
 package org.springframework.integration.aggregator;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.store.MessageGroupStore;
@@ -49,7 +49,7 @@ public class CorrelatingMessageHandlerIntegrationTests {
 
 	private final AggregatingMessageHandler defaultHandler = new AggregatingMessageHandler(processor, store);
 
-	@Before
+	@BeforeEach
 	public void setupHandler() {
 		when(outputChannel.send(isA(Message.class))).thenReturn(true);
 		defaultHandler.setOutputChannel(outputChannel);

spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.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,8 +16,8 @@
 
 package org.springframework.integration.aggregator;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.support.MessageBuilder;
@@ -37,7 +37,7 @@ public class CorrelationStrategyAdapterTests {
 
 	private Message<?> message;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		message = MessageBuilder.withPayload("foo").setHeader("a", "b").setHeader("c", "d").build();
 	}

spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.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.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.aggregator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -31,6 +31,7 @@
 import org.springframework.messaging.support.GenericMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -43,15 +44,17 @@ public class ExpressionEvaluatingCorrelationStrategyTests {
 
 	private ExpressionEvaluatingCorrelationStrategy strategy;
 
-	@Test(expected = IllegalArgumentException.class)
-	public void testCreateInstanceWithEmptyExpressionFails() throws Exception {
-		strategy = new ExpressionEvaluatingCorrelationStrategy("");
+	@Test
+	public void testCreateInstanceWithEmptyExpressionFails() {
+		assertThatThrownBy(() -> strategy = new ExpressionEvaluatingCorrelationStrategy(""))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void testCreateInstanceWithNullExpressionFails() throws Exception {
+	@Test
+	public void testCreateInstanceWithNullExpressionFails() {
 		Expression nullExpression = null;
-		strategy = new ExpressionEvaluatingCorrelationStrategy(nullExpression);
+		assertThatThrownBy(() -> strategy = new ExpressionEvaluatingCorrelationStrategy(nullExpression))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test

spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.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.
@@ -20,11 +20,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.store.MessageGroup;
@@ -42,17 +39,15 @@
  * @author Gary Russell
  * @author Artem Bilan
  */
-@RunWith(MockitoJUnitRunner.class)
 public class ExpressionEvaluatingMessageGroupProcessorTests {
 
 	private ExpressionEvaluatingMessageGroupProcessor processor;
 
-	@Mock
-	private MessageGroup group;
+	private final MessageGroup group = mock();
 
 	private final List<Message<?>> messages = new ArrayList<>();
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		messages.clear();
 		for (int i = 0; i < 5; i++) {

spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.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,8 +16,8 @@
 
 package org.springframework.integration.aggregator;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.store.SimpleMessageGroup;
@@ -39,7 +39,7 @@ public class ExpressionEvaluatingReleaseStrategyTests {
 
 	private final SimpleMessageGroup messages = new SimpleMessageGroup("foo");
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public void setup() {
 		for (int i = 0; i < 5; i++) {

spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.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,7 +16,7 @@
 
 package org.springframework.integration.aggregator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;

spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.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.
@@ -18,7 +18,7 @@
 
 import java.util.Comparator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;

spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.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.
@@ -23,11 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.BeanFactory;
@@ -49,6 +46,7 @@
 import org.springframework.messaging.support.GenericMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -62,15 +60,13 @@
  * @author Gary Russell
  * @author Artem Bilan
  */
-@RunWith(MockitoJUnitRunner.class)
 public class MethodInvokingMessageGroupProcessorTests {
 
 	private final List<Message<?>> messagesUpForProcessing = new ArrayList<>(3);
 
-	@Mock
-	private MessageGroup messageGroupMock;
+	private final MessageGroup messageGroupMock = mock();
 
-	@Before
+	@BeforeEach
 	public void initializeMessagesUpForProcessing() {
 		this.messagesUpForProcessing.add(MessageBuilder.withPayload(1).build());
 		this.messagesUpForProcessing.add(MessageBuilder.withPayload(2).build());
@@ -488,7 +484,7 @@ public String method1(List<String> input, @Headers Map<String, ?> map) {
 		assertThat(aggregator.aggregatePayloads(group, aggregator.aggregateHeaders(group))).isEqualTo("foobar");
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void multipleAnnotations() {
 
 		class MultipleAnnotationTestBean {
@@ -506,7 +502,8 @@ public String method2(List<String> input) {
 		}
 
 		MultipleAnnotationTestBean bean = new MultipleAnnotationTestBean();
-		new MethodInvokingMessageGroupProcessor(bean);
+		assertThatThrownBy(() -> new MethodInvokingMessageGroupProcessor(bean))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 
 	@Test
@@ -534,7 +531,7 @@ String method2(List<String> input) {
 		assertThat(aggregator.aggregatePayloads(group, null)).isEqualTo("foo");
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void multiplePublicMethods() {
 
 		@SuppressWarnings("unused")
@@ -551,10 +548,11 @@ public String lowerCase(String s) {
 		}
 
 		MultiplePublicMethodTestBean bean = new MultiplePublicMethodTestBean();
-		new MethodInvokingMessageGroupProcessor(bean);
+		assertThatThrownBy(() -> new MethodInvokingMessageGroupProcessor(bean))
+				.isInstanceOf(IllegalArgumentException.class);
 	}
 
-	@Test(expected = IllegalStateException.class)
+	@Test
 	public void noPublicMethods() {
 
 		@SuppressWarnings("unused")
@@ -567,7 +565,8 @@ String lowerCase(String s) {
 		}
 
 		NoPublicMethodTestBean bean = new NoPublicMethodTestBean();
-		new MethodInvokingMessageGroupProcessor(bean);
+		assertThatThrownBy(() -> new MethodInvokingMessageGroupProcessor(bean))
+				.isInstanceOf(IllegalStateException.class);
 	}
 
 	@Test