More @DirtiesContext for tests in core

An attempt to mitigate a memory impact on limited CI/CD runners

(cherry picked from commit b5ec098)

Author: artembilan

spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java

@@ -16,38 +16,53 @@
 
 package org.springframework.integration.config.xml;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
+
 /**
  *
  * @author Oleg Zhurakousky
  * @author Gary Russell
+ * @author Artem Bilan
  *
  */
 public class ChannelAutoCreationTests {
 
-	@Test // no assertions since it validates that no exception is thrown
+	@Test
 	public void testEnablingAutoChannelCreationBeforeWithCustom() {
-		new ClassPathXmlApplicationContext("TestEnableChannelAutoCreation-before-context.xml", this.getClass()).close();
+		assertThatNoException()
+				.isThrownBy(() ->
+						new ClassPathXmlApplicationContext(
+								"TestEnableChannelAutoCreation-before-context.xml", this.getClass()));
 	}
 
-	@Test // no assertions since it validates that no exception is thrown
+	@Test
 	public void testEnablingAutoChannelCreationAfterWithCustom() {
-		new ClassPathXmlApplicationContext("TestEnableChannelAutoCreation-after-context.xml", this.getClass()).close();
+		assertThatNoException()
+				.isThrownBy(() ->
+						new ClassPathXmlApplicationContext(
+								"TestEnableChannelAutoCreation-after-context.xml", this.getClass()));
 	}
 
-	@Test(expected = BeanCreationException.class)
+	@Test
 	public void testDisablingAutoChannelCreationAfter() {
-		new ClassPathXmlApplicationContext("TestDisableChannelAutoCreation-after-context.xml", this.getClass()).close();
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(() ->
+						new ClassPathXmlApplicationContext(
+								"TestDisableChannelAutoCreation-after-context.xml", getClass()));
 	}
 
-	@Test(expected = BeanCreationException.class)
+	@Test
 	public void testDisablingAutoChannelCreationBefore() {
-		new ClassPathXmlApplicationContext("TestDisableChannelAutoCreation-before-context.xml", this.getClass())
-				.close();
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(() ->
+						new ClassPathXmlApplicationContext(
+								"TestDisableChannelAutoCreation-before-context.xml", this.getClass()));
 	}
 
 }

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests-context.xml

@@ -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,14 +16,13 @@
 
 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;
 import org.springframework.integration.test.util.TestUtils;
-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 static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,22 +33,20 @@
  *
  * @since 2.1
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class EnricherParserTests2 {
+@SpringJUnitConfig
+@DirtiesContext
+public class EnricherParser2Tests {
 
 	@Autowired
 	private ApplicationContext context;
 
 	@Test
 	public void configurationCheckRequiresReply() {
-
 		Object endpoint = context.getBean("enricher");
 
 		boolean requiresReply = TestUtils.getPropertyValue(endpoint, "handler.requiresReply", Boolean.class);
 
 		assertThat(requiresReply).as("Was expecting requiresReply to be 'false'").isFalse();
-
 	}
 
 }

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests.java

@@ -17,7 +17,7 @@
 		<property name="nested.value" expression="@someBean.someOtherProperty" />
 	</enricher>
 
-	<beans:bean id="someBean" class="org.springframework.integration.config.xml.EnricherParserTests3$SomeBean">
+	<beans:bean id="someBean" class="org.springframework.integration.config.xml.EnricherParser3Tests$SomeBean">
 		<beans:constructor-arg value="baz" />
 	</beans:bean>
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-context.xml

@@ -17,7 +17,7 @@
 		<property name="@someBean.nested.value" value="qux" />
 	</enricher>
 
-	<beans:bean id="someBean" class="org.springframework.integration.config.xml.EnricherParserTests3$SomeBean">
+	<beans:bean id="someBean" class="org.springframework.integration.config.xml.EnricherParser3Tests$SomeBean">
 		<beans:constructor-arg value="baz" />
 	</beans:bean>
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-fail-context.xml

@@ -27,14 +27,14 @@
 import org.springframework.messaging.support.GenericMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Gary Russell
  *
  * @since 2.1.1
  */
-public class EnricherParserTests3 {
+public class EnricherParser3Tests {
 
 	@Test
 	public void testSourceBeanResolver() {
@@ -44,7 +44,7 @@ public void testSourceBeanResolver() {
 		PollableChannel beanResolveOut = context.getBean("beanResolveOut", PollableChannel.class);
 		SomeBean payload = new SomeBean("foo");
 		assertThat(payload.getNested().getValue()).isEqualTo("foo");
-		beanResolveIn.send(new GenericMessage<SomeBean>(payload));
+		beanResolveIn.send(new GenericMessage<>(payload));
 		@SuppressWarnings("unchecked")
 		Message<SomeBean> out = (Message<SomeBean>) beanResolveOut.receive();
 		assertThat(out.getPayload()).isSameAs(payload);
@@ -59,13 +59,9 @@ public void testTargetBeanResolver() {
 		MessageChannel beanResolveIn = context.getBean("beanResolveIn", MessageChannel.class);
 		SomeBean payload = new SomeBean("foo");
 		assertThat(payload.getNested().getValue()).isEqualTo("foo");
-		try {
-			beanResolveIn.send(new GenericMessage<SomeBean>(payload));
-			fail("Expected SpEL Exception");
-		}
-		catch (MessageHandlingException e) {
-			assertThat(e.getCause() instanceof SpelEvaluationException).isTrue();
-		}
+		assertThatExceptionOfType(MessageHandlingException.class)
+				.isThrownBy(() -> beanResolveIn.send(new GenericMessage<>(payload)))
+				.withCauseInstanceOf(SpelEvaluationException.class);
 		context.close();
 	}
 
@@ -85,7 +81,7 @@ public String getSomeOtherProperty() {
 			return "bar";
 		}
 
-		public class Nested {
+		public static class Nested {
 
 			private String value;
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests.java

@@ -40,10 +40,10 @@
 				null-result-expression="'Could not determine the notOverwrite'"/>
 
 		<request-handler-advice-chain>
-			<beans:bean class="org.springframework.integration.config.xml.EnricherParserTests4$FooAdvice" />
+			<beans:bean class="org.springframework.integration.config.xml.EnricherParser4Tests$FooAdvice" />
 		</request-handler-advice-chain>
 	</enricher>
 
-	<util:constant id="testBean" static-field="org.springframework.integration.config.xml.EnricherParserTests4$Gender.MALE"/>
+	<util:constant id="testBean" static-field="org.springframework.integration.config.xml.EnricherParser4Tests$Gender.MALE"/>
 
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests-context.xml

@@ -16,8 +16,7 @@
 
 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;
@@ -29,19 +28,20 @@
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.SubscribableChannel;
-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 static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Liujiong
+ * @author Artem Bilan
  *
  * @since 4.1
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class EnricherParserTests4 {
+@SpringJUnitConfig
+@DirtiesContext
+public class EnricherParser4Tests {
 
 	@Autowired
 	private ApplicationContext context;

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java renamed to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests.java

@@ -16,8 +16,7 @@
 
 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;
@@ -26,8 +25,8 @@
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
-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 static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,11 +35,13 @@
  * a default object in case of downstream failure.
  *
  * @author Kris Jacyna
+ * @author Artem Bilan
+ *
  * @since 4.1
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class EnricherParserTests5 {
+@SpringJUnitConfig
+@DirtiesContext
+public class EnricherParser5Tests {
 
 	@Autowired
 	private ApplicationContext context;