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

Fixed remoting gateway adapter tests by removing RequestReplyTemplate dependency (replaced with MessageExchangeTemplate).

Browse Source
This commit is contained in:
Mark Fisher
2008-07-30 03:41:10 +00:00
parent 60cdfe4ffe
commit a2d43b1d80
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/HttpInvokerGatewayTests.java
View File

@@ -32,6 +32,7 @@ import org.junit.Test;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageTarget;
import org.springframework.integration.message.StringMessage;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -64,8 +65,8 @@ public class HttpInvokerGatewayTests {
Executors.newSingleThreadExecutor().execute(new Runnable() {
public void run() {
Message<?> message = channel.receive();
MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReturnAddress();
replyChannel.send(new StringMessage(message.getPayload().toString().toUpperCase()));
MessageTarget replyTarget = (MessageTarget) message.getHeaders().getReturnAddress();
replyTarget.send(new StringMessage(message.getPayload().toString().toUpperCase()));
}
});
HttpInvokerGateway gateway = new HttpInvokerGateway(channel);

32
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/httpinvoker/config/HttpInvokerGatewayParserTests.java
View File

@@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.adapter.httpinvoker.HttpInvokerGateway;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.gateway.RequestReplyTemplate;
import org.springframework.integration.message.MessageExchangeTemplate;
/**
* @author Mark Fisher
@@ -40,12 +40,12 @@ public class HttpInvokerGatewayParserTests {
HttpInvokerGateway gateway = (HttpInvokerGateway) context.getBean("gatewayWithDefaults");
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(true, accessor.getPropertyValue("expectReply"));
RequestReplyTemplate template = (RequestReplyTemplate)
accessor.getPropertyValue("requestReplyTemplate");
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
MessageExchangeTemplate template = (MessageExchangeTemplate)
accessor.getPropertyValue("messageExchangeTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
assertEquals(-1L, templateAccessor.getPropertyValue("requestTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("replyTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout"));
}
@Test
@@ -56,12 +56,12 @@ public class HttpInvokerGatewayParserTests {
HttpInvokerGateway gateway = (HttpInvokerGateway) context.getBean("/gateway/with/name");
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(true, accessor.getPropertyValue("expectReply"));
RequestReplyTemplate template = (RequestReplyTemplate)
accessor.getPropertyValue("requestReplyTemplate");
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
MessageExchangeTemplate template = (MessageExchangeTemplate)
accessor.getPropertyValue("messageExchangeTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
assertEquals(-1L, templateAccessor.getPropertyValue("requestTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("replyTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout"));
}
@Test
@@ -72,12 +72,12 @@ public class HttpInvokerGatewayParserTests {
HttpInvokerGateway gateway = (HttpInvokerGateway) context.getBean("gatewayWithCustomProperties");
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(false, accessor.getPropertyValue("expectReply"));
RequestReplyTemplate template = (RequestReplyTemplate)
accessor.getPropertyValue("requestReplyTemplate");
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
MessageExchangeTemplate template = (MessageExchangeTemplate)
accessor.getPropertyValue("messageExchangeTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
assertEquals(123L, templateAccessor.getPropertyValue("requestTimeout"));
assertEquals(456L, templateAccessor.getPropertyValue("replyTimeout"));
assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout"));
assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout"));
}
}

22
org.springframework.integration.adapter/src/test/java/org/springframework/integration/adapter/rmi/config/RmiGatewayParserTests.java
View File

@@ -26,7 +26,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.adapter.rmi.RmiGateway;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.gateway.RequestReplyTemplate;
import org.springframework.integration.message.MessageExchangeTemplate;
/**
* @author Mark Fisher
@@ -41,12 +41,12 @@ public class RmiGatewayParserTests {
RmiGateway gateway = (RmiGateway) context.getBean("gatewayWithDefaults");
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(true, accessor.getPropertyValue("expectReply"));
RequestReplyTemplate template = (RequestReplyTemplate)
accessor.getPropertyValue("requestReplyTemplate");
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
MessageExchangeTemplate template = (MessageExchangeTemplate)
accessor.getPropertyValue("messageExchangeTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
assertEquals(-1L, templateAccessor.getPropertyValue("requestTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("replyTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("sendTimeout"));
assertEquals(-1L, templateAccessor.getPropertyValue("receiveTimeout"));
}
@Test
@@ -57,12 +57,12 @@ public class RmiGatewayParserTests {
RmiGateway gateway = (RmiGateway) context.getBean("gatewayWithCustomProperties");
DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
assertEquals(false, accessor.getPropertyValue("expectReply"));
RequestReplyTemplate template = (RequestReplyTemplate)
accessor.getPropertyValue("requestReplyTemplate");
assertEquals(channel, accessor.getPropertyValue("requestChannel"));
MessageExchangeTemplate template = (MessageExchangeTemplate)
accessor.getPropertyValue("messageExchangeTemplate");
DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template);
assertEquals(channel, templateAccessor.getPropertyValue("requestChannel"));
assertEquals(123L, templateAccessor.getPropertyValue("requestTimeout"));
assertEquals(456L, templateAccessor.getPropertyValue("replyTimeout"));
assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout"));
assertEquals(456L, templateAccessor.getPropertyValue("receiveTimeout"));
}
@Test