Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1094 refactored calls to getName() in File Channel Adapter tests and TestUtils

Browse Source
This commit is contained in:
Mark Fisher
2010-04-25 23:49:35 +00:00
parent da7b3b5260
commit 920e6d6c19
3 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.integration.test/src/main/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.integration.channel.AbstractMessageChannel;
import org.springframework.integration.channel.BeanFactoryChannelResolver;
import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.context.IntegrationContextUtils;
@@ -128,12 +129,12 @@ public abstract class TestUtils {
}
public void registerChannel(String channelName, MessageChannel channel) {
if (channel.getName() != null) {
if (channel instanceof AbstractMessageChannel && ((AbstractMessageChannel) channel).getName() != null) {
if (channelName == null) {
Assert.notNull(channel.getName(), "channel name must not be null");
channelName = channel.getName();
} else {
Assert.isTrue(channel.getName().equals(channelName),
channelName = ((AbstractMessageChannel) channel).getName();
}
else {
Assert.isTrue(((AbstractMessageChannel) channel).getName().equals(channelName),
"channel name has already been set with a conflicting value");
}
}
@@ -151,6 +152,7 @@ public abstract class TestUtils {
}
}
@SuppressWarnings("unchecked")
public static MessageHandler handlerExpecting(final Matcher<Message> messageMatcher) {
return new MessageHandler() {
public void handleMessage(Message<?> message) throws MessageRejectedException, MessageHandlingException, MessageDeliveryException {