diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java index 11763d3f49..569f4292ef 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java +++ b/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())); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests-context.xml similarity index 100% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests-context.xml diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests.java similarity index 79% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests.java index 8456e23e3e..6d26276b8c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser2Tests.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,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 @@ import static org.assertj.core.api.Assertions.assertThat; * * @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(); - } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-context.xml similarity index 95% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-context.xml index 24372067f3..ab21f11679 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-context.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-fail-context.xml similarity index 95% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-fail-context.xml index f419e79e02..8183a2dd16 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3-fail-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests-fail-context.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests.java similarity index 87% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests.java index 63ed99c62b..0e7bde2a54 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser3Tests.java @@ -27,14 +27,14 @@ import org.springframework.messaging.PollableChannel; 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 class EnricherParserTests3 { PollableChannel beanResolveOut = context.getBean("beanResolveOut", PollableChannel.class); SomeBean payload = new SomeBean("foo"); assertThat(payload.getNested().getValue()).isEqualTo("foo"); - beanResolveIn.send(new GenericMessage(payload)); + beanResolveIn.send(new GenericMessage<>(payload)); @SuppressWarnings("unchecked") Message out = (Message) beanResolveOut.receive(); assertThat(out.getPayload()).isSameAs(payload); @@ -59,13 +59,9 @@ public class EnricherParserTests3 { MessageChannel beanResolveIn = context.getBean("beanResolveIn", MessageChannel.class); SomeBean payload = new SomeBean("foo"); assertThat(payload.getNested().getValue()).isEqualTo("foo"); - try { - beanResolveIn.send(new GenericMessage(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 class EnricherParserTests3 { return "bar"; } - public class Nested { + public static class Nested { private String value; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests-context.xml similarity index 95% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests-context.xml index a21f083900..b7ebcc83f6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests-context.xml @@ -40,10 +40,10 @@ null-result-expression="'Could not determine the notOverwrite'"/> - + - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests.java similarity index 93% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser4Tests.java index a47ad9d913..a8ebaaf998 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java +++ b/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; @@ -29,19 +28,20 @@ import org.springframework.messaging.MessageChannel; 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; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser5Tests-context.xml similarity index 100% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5-context.xml rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser5Tests-context.xml diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser5Tests.java similarity index 90% rename from spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java rename to spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser5Tests.java index 8a5c1accac..eead53b248 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParser5Tests.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.handler.AbstractReplyProducingMessageHand 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 @@ import static org.assertj.core.api.Assertions.assertThat; * 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; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml index 05269420ad..413959efff 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests-context.xml @@ -43,10 +43,6 @@ - -
- - diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java index 0a4c3eb9df..41bd673850 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.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. @@ -18,11 +18,9 @@ package org.springframework.integration.config.xml; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.expression.Expression; @@ -35,12 +33,10 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transformer.ContentEnricher; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.SubscribableChannel; -import org.springframework.messaging.support.GenericMessage; -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; @@ -52,8 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @since 2.1 */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@SpringJUnitConfig +@DirtiesContext public class EnricherParserTests { @Autowired @@ -101,7 +97,6 @@ public class EnricherParserTests { @Test public void configurationCheckTimeoutParameters() { - Object endpoint = context.getBean("enricher"); Long requestTimeout = TestUtils.getPropertyValue(endpoint, "handler.requestTimeout", Long.class); @@ -109,18 +104,15 @@ public class EnricherParserTests { assertThat(requestTimeout).isEqualTo(Long.valueOf(1234L)); assertThat(replyTimeout).isEqualTo(Long.valueOf(9876L)); - } @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'").isTrue(); - } @Test @@ -167,32 +159,7 @@ public class EnricherParserTests { adviceCalled--; } - @Test - public void testInt3027WrongHeaderType() { - MessageChannel input = context.getBean("input2", MessageChannel.class); - try { - input.send(new GenericMessage("test")); - } - catch (Exception e) { - assertThat(e).isInstanceOf(MessageHandlingException.class); - assertThat(e.getCause()).isInstanceOf(TypeMismatchException.class); - assertThat(e.getCause().getMessage()) - .startsWith("Failed to convert value of type 'java.util.Date' to required type 'int'"); - } - } - - private static class Source { - - private final String sourceName; - - Source(String sourceName) { - this.sourceName = sourceName; - } - - @SuppressWarnings("unused") - public String getSourceName() { - return sourceName; - } + private record Source(String sourceName) { } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java index 596254cd03..b528d727ed 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java @@ -18,8 +18,7 @@ package org.springframework.integration.config.xml; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; @@ -32,8 +31,8 @@ import org.springframework.integration.transformer.ContentEnricher; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; 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; @@ -43,8 +42,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @since 2.1 */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@SpringJUnitConfig +@DirtiesContext public class EnricherParserTestsWithoutRequestChannel { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java index 4b2d450c72..2271f8f3ba 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java @@ -18,8 +18,7 @@ package org.springframework.integration.config.xml; import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +33,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; 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; @@ -45,8 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @since 2.1 */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@SpringJUnitConfig +@DirtiesContext public class EnricherParserWithRequestPayloadExpressionTests { @Autowired @@ -114,18 +113,7 @@ public class EnricherParserWithRequestPayloadExpressionTests { assertThat(enriched).isSameAs(original); } - private static class Source { - - private final String sourceName; - - Source(String sourceName) { - this.sourceName = sourceName; - } - - @SuppressWarnings("unused") - public String getSourceName() { - return sourceName; - } + private record Source(String sourceName) { } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java index 7ebd0c8738..52b6fb1261 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.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. @@ -27,6 +27,7 @@ import org.springframework.integration.handler.LoggingHandler; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Artem Bilan */ @SpringJUnitConfig +@DirtiesContext public class ErrorChannelAutoCreationTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java index 313e2f144f..fc30947b58 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.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,15 +16,14 @@ 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.integration.channel.QueueChannel; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ErrorMessage; -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; @@ -33,8 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Gunnar Hillert * @author Artem Bilan */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@SpringJUnitConfig +@DirtiesContext public class ErrorMessageExceptionTypeRouterParserTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java index 0eca379443..b5de2fbed7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java @@ -19,8 +19,7 @@ package org.springframework.integration.config.xml; import java.util.HashMap; import java.util.Map; -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; @@ -28,8 +27,8 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -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; @@ -39,8 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @since 2.0 */ -@ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig +@DirtiesContext public class HeaderEnricherMethodInvokingTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java index e713e94b3c..d946044b77 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.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; @@ -29,8 +28,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; -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; @@ -40,8 +39,8 @@ import static org.assertj.core.api.Assertions.assertThat; * * @since 2.0 */ -@ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig +@DirtiesContext public class HeaderEnricherOverwriteTests { @Autowired @@ -156,7 +155,7 @@ public class HeaderEnricherOverwriteTests { MessageChannel channel = this.context.getBean("priorityExplicitOverwriteTrueInput", MessageChannel.class); MessagingTemplate template = new MessagingTemplate(); template.setDefaultDestination(channel); - Message result = template.sendAndReceive(new GenericMessage("test")); + Message result = template.sendAndReceive(new GenericMessage<>("test")); assertThat(result).isNotNull(); assertThat(new IntegrationMessageHeaderAccessor(result).getPriority()).isEqualTo(42); } @@ -312,17 +311,7 @@ public class HeaderEnricherOverwriteTests { assertThat(result.getHeaders().get("foo")).isEqualTo("ABC"); } - public static class TestBean { - - private final String text; - - public TestBean(String text) { - this.text = text; - } - - public String text() { - return this.text; - } + public record TestBean(String text) { } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java index d142b077d6..079ab824c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java @@ -27,6 +27,7 @@ import org.springframework.integration.transformer.MessageTransformationExceptio import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; @@ -39,6 +40,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @since 2.0 */ @SpringJUnitConfig +@DirtiesContext class HeaderEnricherParserTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java index ebfad485a1..275d5758c9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java @@ -37,6 +37,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; @@ -49,6 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @since 2.0 */ @SpringJUnitConfig +@DirtiesContext public class HeaderEnricherTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java index 9c5d9216cb..f19314c961 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java @@ -16,24 +16,25 @@ 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.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.integration.endpoint.EventDrivenConsumer; 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; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Mark Fisher + * @author Artem Bilan */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@SpringJUnitConfig +@DirtiesContext public class InnerBeanConfigTests { @Autowired @@ -42,12 +43,12 @@ public class InnerBeanConfigTests { @Autowired private ApplicationContext context; - // INT-1528: the inner bean should not be registered in the context - @Test(expected = NoSuchBeanDefinitionException.class) + @Test public void checkInnerBean() { Object innerBean = TestUtils.getPropertyValue(testEndpoint, "handler.processor.delegate.targetObject"); assertThat(innerBean).isNotNull(); - context.getBean(TestBean.class); + assertThatExceptionOfType(NoSuchBeanDefinitionException.class) + .isThrownBy(() -> context.getBean(TestBean.class)); } public static class TestBean { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java index a8e837b9f8..cdd9604f4c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java @@ -16,24 +16,25 @@ 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.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.Ordered; -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 Mark Fisher + * @author Artem Bilan + * * @since 1.0.3 */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@SpringJUnitConfig +@DirtiesContext public class OrderedHandlersTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java index 1cbe6662e8..3edb8d0741 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java @@ -18,16 +18,15 @@ package org.springframework.integration.config.xml; import java.util.List; -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.beans.factory.annotation.Qualifier; import org.springframework.integration.aggregator.AggregatingMessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; 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; @@ -37,8 +36,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Oleg Zhurakousky * @author Artem Bilan */ -@ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig +@DirtiesContext public class PNamespaceTests { @Autowired diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java index 62937b065d..8d91b7a793 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java @@ -37,6 +37,7 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; @@ -48,6 +49,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @author Artem Bilan */ @SpringJUnitConfig +@DirtiesContext public class PayloadDeserializingTransformerParserTests { @Autowired @@ -69,7 +71,7 @@ public class PayloadDeserializingTransformerParserTests { @Test public void directChannelWithSerializedStringMessage() throws Exception { byte[] bytes = serialize("foo"); - directInput.send(new GenericMessage(bytes)); + directInput.send(new GenericMessage<>(bytes)); Message result = output.receive(10000); assertThat(result).isNotNull(); assertThat(result.getPayload() instanceof String).isTrue();