INT-1271, removed DefaultMessageConverter and tests related to it

This commit is contained in:
Oleg Zhurakousky
2010-09-01 03:06:35 +00:00
parent 53bc3ebf18
commit c504e4dcd8
6 changed files with 47 additions and 208 deletions

View File

@@ -16,15 +16,11 @@
package org.springframework.integration.jms;
import static org.junit.Assert.assertEquals;
import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
import javax.jms.Session;
import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
@@ -33,7 +29,6 @@ import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.message.GenericMessage;
import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.MessageConverter;
import org.springframework.jms.support.converter.SimpleMessageConverter;
/**
* @author Mark Fisher
@@ -56,28 +51,6 @@ public class ChannelPublishingJmsMessageListenerTests {
listener.onMessage(jmsMessage, session);
}
@Test
public void defaultHeaderMappingMessageConverter() {
ChannelPublishingJmsMessageListener listener = new ChannelPublishingJmsMessageListener();
listener.afterPropertiesSet();
Object converter = new DirectFieldAccessor(listener).getPropertyValue("messageConverter");
assertEquals(DefaultMessageConverter.class, converter.getClass());
Object wrappedConverter = new DirectFieldAccessor(converter).getPropertyValue("converter");
assertEquals(SimpleMessageConverter.class, wrappedConverter.getClass());
}
@Test
public void customMessageConverterDecoratedForHeaderMapping() {
ChannelPublishingJmsMessageListener listener = new ChannelPublishingJmsMessageListener();
MessageConverter originalConverter = new TestMessageConverter();
listener.setMessageConverter(originalConverter);
listener.afterPropertiesSet();
Object converter = new DirectFieldAccessor(listener).getPropertyValue("messageConverter");
assertEquals(DefaultMessageConverter.class, converter.getClass());
Object wrappedConverter = new DirectFieldAccessor(converter).getPropertyValue("converter");
assertEquals(originalConverter, wrappedConverter);
}
private void startBackgroundReplier(final PollableChannel channel) {
new SimpleAsyncTaskExecutor().execute(new Runnable() {
public void run() {
@@ -88,7 +61,6 @@ public class ChannelPublishingJmsMessageListenerTests {
});
}
private static class TestMessageConverter implements MessageConverter {
public Object fromMessage(javax.jms.Message message) throws JMSException, MessageConversionException {