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

Make TestRestTemplate withBasicAuth fault tolerant

Browse Source 
It's part of TestRestTemplate's contract that it's fault tolerant. This
commit aligns the behavior of `withBasicAuth` with that expectation.

Closes gh-15780
This commit is contained in:
Madhura Bhave
2019-03-13 11:40:00 -07:00
parent 0872eb0dd9
commit 2cdc93cf19
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View File

@@ -1034,11 +1034,8 @@ public class TestRestTemplate {
.messageConverters(getRestTemplate().getMessageConverters())
.interceptors(getRestTemplate().getInterceptors())
.uriTemplateHandler(getRestTemplate().getUriTemplateHandler()).build();
TestRestTemplate testRestTemplate = new TestRestTemplate(restTemplate, username,
password, this.httpClientOptions);
testRestTemplate.getRestTemplate()
.setErrorHandler(getRestTemplate().getErrorHandler());
return testRestTemplate;
return new TestRestTemplate(restTemplate, username, password,
this.httpClientOptions);
}
@SuppressWarnings({ "rawtypes", "unchecked" })

5
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
View File

@@ -237,14 +237,15 @@ public class TestRestTemplateTests {
}
@Test
public void withBasicAuthDoesNotResetErrorHandler() {
public void withBasicAuthShouldUseNoOpErrorHandler() throws Exception {
TestRestTemplate originalTemplate = new TestRestTemplate("foo", "bar");
ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
originalTemplate.getRestTemplate().setErrorHandler(errorHandler);
TestRestTemplate basicAuthTemplate = originalTemplate.withBasicAuth("user",
"password");
assertThat(basicAuthTemplate.getRestTemplate().getErrorHandler())
.isSameAs(errorHandler);
.isInstanceOf(Class.forName(
"org.springframework.boot.test.web.client.TestRestTemplate$NoOpResponseErrorHandler"));
}
@Test