From d96b8e0c852c07a6aa8644befff8720dccaed2fa Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 25 Nov 2016 10:34:03 -0500 Subject: [PATCH] Fix Tests for Shared DefaultConversionService JIRA: https://jira.spring.io/browse/SPR-14948 The `StandardTypeConverter` no longer has a `defaultConversionService` field, it uses a static instance from `DefaultConversionService`.` --- .../integration/expression/ExpressionUtilsTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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..1bca90c83b 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; @@ -67,7 +68,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 +82,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 +94,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")); } }