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

Fix ExpressionUtilsTests according SF changes

Browse Source 
Related to: https://github.com/spring-projects/spring-framework/issues/27446
This commit is contained in:
Artem Bilan
2021-10-19 09:46:35 -04:00
parent 1341a457f0
commit 6c47593aef
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2019 the original author or authors.
* Copyright 2013-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@ package org.springframework.integration.expression;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import java.util.function.Supplier;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.ConversionServiceFactoryBean;
@@ -33,6 +35,7 @@ import org.springframework.integration.test.util.TestUtils;
/**
* @author Gary Russell
* @author Artem Bilan
*
* @since 3.0
*/
@@ -66,7 +69,7 @@ public class ExpressionUtilsTests {
assertThat(evalContext.getBeanResolver()).isNotNull();
TypeConverter typeConverter = evalContext.getTypeConverter();
assertThat(typeConverter).isNotNull();
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService"))
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService", Supplier.class).get())
.isSameAs(DefaultConversionService.getSharedInstance());
}
@@ -80,9 +83,9 @@ public class ExpressionUtilsTests {
assertThat(evalContext.getBeanResolver()).isNotNull();
TypeConverter typeConverter = evalContext.getTypeConverter();
assertThat(typeConverter).isNotNull();
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService"))
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService", Supplier.class).get())
.isNotSameAs(DefaultConversionService.getSharedInstance());
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService"))
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService", Supplier.class).get())
.isSameAs(context.getBean(IntegrationUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME));
}
@@ -92,7 +95,8 @@ public class ExpressionUtilsTests {
assertThat(evalContext.getBeanResolver()).isNull();
TypeConverter typeConverter = evalContext.getTypeConverter();
assertThat(typeConverter).isNotNull();
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService"))
assertThat(TestUtils.getPropertyValue(typeConverter, "conversionService", Supplier.class).get())
.isSameAs(DefaultConversionService.getSharedInstance());
}
}