From 7eeb4e35350835a8f0bcbd925574104673127021 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 20 Dec 2016 09:19:26 -0500 Subject: [PATCH] Fix SF 4.3.5 Test Compatibility Default Conversion Service. https://github.com/spring-projects/spring-framework/commit/a7ba63d4255b8adb39bd4011daf4f9407095d6c5#diff-d5e8c3a85a50c6752bd812dea2b6d26a --- build.gradle | 2 +- .../expression/ExpressionUtilsTests.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 872d05e9ad..3ba1b38f72 100644 --- a/build.gradle +++ b/build.gradle @@ -135,7 +135,7 @@ subprojects { subproject -> springSecurityVersion = '4.1.0.RELEASE' springSocialTwitterVersion = '1.1.2.RELEASE' springRetryVersion = '1.1.3.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.4.RELEASE' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.5.BUILD-SNAPSHOT' springWsVersion = '2.3.0.RELEASE' xmlUnitVersion = '1.6' xstreamVersion = '1.4.7' diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java index 757007affb..aa6b2eea83 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.ConversionServiceFactoryBean; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.expression.TypeConverter; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; @@ -35,8 +36,8 @@ import org.springframework.integration.test.util.TestUtils; /** * @author Gary Russell - * @since 3.0 * + * @since 3.0 */ public class ExpressionUtilsTests { @@ -51,8 +52,9 @@ public class ExpressionUtilsTests { StandardEvaluationContext evalContext = ExpressionUtils.createStandardEvaluationContext(context); assertNotNull(evalContext.getBeanResolver()); assertNotNull(evalContext.getTypeConverter()); - IntegrationEvaluationContextFactoryBean factory = context.getBean("&" + IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, - IntegrationEvaluationContextFactoryBean.class); + IntegrationEvaluationContextFactoryBean factory = + context.getBean("&" + IntegrationContextUtils.INTEGRATION_EVALUATION_CONTEXT_BEAN_NAME, + IntegrationEvaluationContextFactoryBean.class); assertSame(evalContext.getTypeConverter(), TestUtils.getPropertyValue(factory, "typeConverter")); } @@ -67,7 +69,8 @@ public class ExpressionUtilsTests { assertNotNull(evalContext.getBeanResolver()); TypeConverter typeConverter = evalContext.getTypeConverter(); assertNotNull(typeConverter); - assertSame(TestUtils.getPropertyValue(typeConverter, "defaultConversionService"), TestUtils.getPropertyValue(typeConverter, "conversionService")); + assertSame(DefaultConversionService.getSharedInstance(), + TestUtils.getPropertyValue(typeConverter, "conversionService")); } @Test @@ -80,7 +83,7 @@ public class ExpressionUtilsTests { assertNotNull(evalContext.getBeanResolver()); TypeConverter typeConverter = evalContext.getTypeConverter(); assertNotNull(typeConverter); - assertNotSame(TestUtils.getPropertyValue(typeConverter, "defaultConversionService"), + assertNotSame(DefaultConversionService.getSharedInstance(), TestUtils.getPropertyValue(typeConverter, "conversionService")); assertSame(context.getBean(IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME), TestUtils.getPropertyValue(typeConverter, "conversionService")); @@ -92,7 +95,7 @@ public class ExpressionUtilsTests { assertNull(evalContext.getBeanResolver()); TypeConverter typeConverter = evalContext.getTypeConverter(); assertNotNull(typeConverter); - assertSame(TestUtils.getPropertyValue(typeConverter, "defaultConversionService"), + assertSame(DefaultConversionService.getSharedInstance(), TestUtils.getPropertyValue(typeConverter, "conversionService")); } }