Browse Source

Polish “Add constructor to TestRestTemplate that takes a RestTemplateBuilder”

Closes gh-6702
pull/6728/head
Andy Wilkinson 9 years ago
parent
commit
f117b93d49
  1. 15
      spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
  2. 3
      spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

15
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java

@ -84,17 +84,14 @@ public class TestRestTemplate { @@ -84,17 +84,14 @@ public class TestRestTemplate {
/**
* Create a new {@link TestRestTemplate} instance.
* @param restTemplateBuilder builder used to configure underlying {@link RestTemplate}
* @param restTemplateBuilder builder used to configure underlying
* {@link RestTemplate}
* @since 1.4.1
*/
public TestRestTemplate(RestTemplateBuilder restTemplateBuilder) {
this(buildRestTemplate(restTemplateBuilder));
}
private static RestTemplate buildRestTemplate(RestTemplateBuilder restTemplateBuilder) {
Assert.notNull(restTemplateBuilder, "RestTemplateBuilder must not be null");
return restTemplateBuilder.build();
}
/**
* Create a new {@link TestRestTemplate} instance.
* @param httpClientOptions client options to use if the Apache HTTP Client is used
@ -130,6 +127,12 @@ public class TestRestTemplate { @@ -130,6 +127,12 @@ public class TestRestTemplate {
this.restTemplate = restTemplate;
}
private static RestTemplate buildRestTemplate(
RestTemplateBuilder restTemplateBuilder) {
Assert.notNull(restTemplateBuilder, "RestTemplateBuilder must not be null");
return restTemplateBuilder.build();
}
private void addAuthentication(RestTemplate restTemplate, String username,
String password) {
if (username == null) {

3
spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

@ -50,8 +50,7 @@ public class TestRestTemplateTests { @@ -50,8 +50,7 @@ public class TestRestTemplateTests {
RestTemplateBuilder builder = mock(RestTemplateBuilder.class);
RestTemplate delegate = new RestTemplate();
given(builder.build()).willReturn(delegate);
assertThat(new TestRestTemplate(builder).getRestTemplate())
.isEqualTo(delegate);
assertThat(new TestRestTemplate(builder).getRestTemplate()).isEqualTo(delegate);
}
@Test

Loading…
Cancel
Save