From 1d582583a5c235d762e0e0f9d92d1b38ec4a9cbe Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 17 Dec 2010 14:23:34 -0500 Subject: [PATCH] INT-1696 updated tests for MessageProducerSupport --- .../endpoint/MessageProducerSupportTests.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java index 611bfe457a..e52342e744 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.springframework.integration.Message; import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PublishSubscribeChannel; @@ -42,6 +41,7 @@ public class MessageProducerSupportTests { @Test(expected=MessageDeliveryException.class) public void validateExceptionIfNoErrorChannel() { DirectChannel outChannel = new DirectChannel(); + outChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { throw new RuntimeException("problems"); @@ -55,7 +55,7 @@ public class MessageProducerSupportTests { mps.sendMessage(new GenericMessage("hello")); } - @Test(expected=MessageHandlingException.class) + @Test(expected=MessageDeliveryException.class) public void validateExceptionIfSendToErrorChannelFails() { DirectChannel outChannel = new DirectChannel(); outChannel.subscribe(new MessageHandler() { @@ -64,9 +64,11 @@ public class MessageProducerSupportTests { } }); PublishSubscribeChannel errorChannel = new PublishSubscribeChannel(); - ServiceActivatingHandler handler = new ServiceActivatingHandler(new FailingErrorService()); - handler.afterPropertiesSet(); - errorChannel.subscribe(handler); + errorChannel.subscribe(new MessageHandler() { + public void handleMessage(Message message) throws MessagingException { + throw new RuntimeException("ooops"); + } + }); MessageProducerSupport mps = new MessageProducerSupport() {}; mps.setOutputChannel(outChannel); mps.setErrorChannel(errorChannel); @@ -115,12 +117,4 @@ public class MessageProducerSupportTests { } } - - private static class FailingErrorService { - @SuppressWarnings("unused") - public void handleErrorMessage(Message errorMessage) { - throw new RuntimeException("ooops"); - } - } - }