From a4eb5a981b7ac8a0386bbe7f121290cf68971fad Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 25 May 2012 12:22:52 -0400 Subject: [PATCH] INT-2570 Fix Failing Tests Renamed field from uri to uriExpression and it now contains an expression. DirectFieldAccessor in tests failed. --- .../config/HttpOutboundChannelAdapterParserTests.java | 9 ++++++--- .../http/config/HttpOutboundGatewayParserTests.java | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java index 5a2c8b5947..04e5e23c25 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java @@ -96,7 +96,8 @@ public class HttpOutboundChannelAdapterParserTests { ClientHttpRequestFactory requestFactory = (ClientHttpRequestFactory) templateAccessor.getPropertyValue("requestFactory"); assertTrue(requestFactory instanceof SimpleClientHttpRequestFactory); - assertEquals("http://localhost/test1", handlerAccessor.getPropertyValue("uri")); + Expression uriExpression = (Expression) handlerAccessor.getPropertyValue("uriExpression"); + assertEquals("http://localhost/test1", uriExpression.getValue()); assertEquals(HttpMethod.POST, handlerAccessor.getPropertyValue("httpMethod")); assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset")); assertEquals(true, handlerAccessor.getPropertyValue("extractPayload")); @@ -124,7 +125,8 @@ public class HttpOutboundChannelAdapterParserTests { assertEquals(requestFactoryBean, requestFactory); Object errorHandlerBean = this.applicationContext.getBean("testErrorHandler"); assertEquals(errorHandlerBean, templateAccessor.getPropertyValue("errorHandler")); - assertEquals("http://localhost/test2/{foo}", handlerAccessor.getPropertyValue("uri")); + Expression uriExpression = (Expression) handlerAccessor.getPropertyValue("uriExpression"); + assertEquals("http://localhost/test2/{foo}", uriExpression.getValue()); assertEquals(HttpMethod.GET, handlerAccessor.getPropertyValue("httpMethod")); assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset")); assertEquals(false, handlerAccessor.getPropertyValue("extractPayload")); @@ -168,7 +170,8 @@ public class HttpOutboundChannelAdapterParserTests { ClientHttpRequestFactory requestFactory = (ClientHttpRequestFactory) templateAccessor.getPropertyValue("requestFactory"); assertTrue(requestFactory instanceof SimpleClientHttpRequestFactory); - assertEquals("http://localhost/test1", handlerAccessor.getPropertyValue("uri")); + Expression uriExpression = (Expression) handlerAccessor.getPropertyValue("uriExpression"); + assertEquals("http://localhost/test1", uriExpression.getValue()); assertEquals(HttpMethod.POST, handlerAccessor.getPropertyValue("httpMethod")); assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset")); assertEquals(true, handlerAccessor.getPropertyValue("extractPayload")); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java index ef17ea5e2e..18f6b68c1e 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java @@ -78,7 +78,8 @@ public class HttpOutboundGatewayParserTests { ClientHttpRequestFactory requestFactory = (ClientHttpRequestFactory) templateAccessor.getPropertyValue("requestFactory"); assertTrue(requestFactory instanceof SimpleClientHttpRequestFactory); - assertEquals("http://localhost/test1", handlerAccessor.getPropertyValue("uri")); + Expression uriExpression = (Expression) handlerAccessor.getPropertyValue("uriExpression"); + assertEquals("http://localhost/test1", uriExpression.getValue()); assertEquals(HttpMethod.POST, handlerAccessor.getPropertyValue("httpMethod")); assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset")); assertEquals(true, handlerAccessor.getPropertyValue("extractPayload")); @@ -106,7 +107,8 @@ public class HttpOutboundGatewayParserTests { Object converterListBean = this.applicationContext.getBean("converterList"); assertEquals(converterListBean, templateAccessor.getPropertyValue("messageConverters")); assertEquals(String.class, handlerAccessor.getPropertyValue("expectedResponseType")); - assertEquals("http://localhost/test2", handlerAccessor.getPropertyValue("uri")); + Expression uriExpression = (Expression) handlerAccessor.getPropertyValue("uriExpression"); + assertEquals("http://localhost/test2", uriExpression.getValue()); assertEquals(HttpMethod.PUT, handlerAccessor.getPropertyValue("httpMethod")); assertEquals("UTF-8", handlerAccessor.getPropertyValue("charset")); assertEquals(false, handlerAccessor.getPropertyValue("extractPayload"));