Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start building against Spring Framework 6.1.0-M3 snapshots

Browse Source 
See gh-36443
This commit is contained in:
Stephane Nicoll 2023-07-18 15:04:42 +02:00
parent 71406977c2
commit 289d458a60
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.8.22
nativeBuildToolsVersion=0.9.23
springFrameworkVersion=6.1.0-M2
springFrameworkVersion=6.1.0-SNAPSHOT
tomcatVersion=10.1.11
kotlin.stdlib.default.dependency=false

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/convert/ConversionServiceParameterValueMapperTests.java
View File

@ -30,6 +30,7 @@ import org.springframework.format.support.DefaultFormattingConversionService;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.mock;
@ -55,7 +56,7 @@ class ConversionServiceParameterValueMapperTests {
void mapParameterWhenConversionServiceFailsShouldThrowParameterMappingException() {
ConversionService conversionService = mock(ConversionService.class);
RuntimeException error = new RuntimeException();
given(conversionService.convert(any(), any())).willThrow(error);
given(conversionService.convert(any(Object.class), eq(Integer.class))).willThrow(error);
ConversionServiceParameterValueMapper mapper = new ConversionServiceParameterValueMapper(conversionService);
assertThatExceptionOfType(ParameterMappingException.class)
.isThrownBy(() -> mapper.mapParameterValue(new TestOperationParameter(Integer.class), "123"))