root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-11-11 17:41:28 +00:00
parent 6770960737 a832944c05
commit ff6a146c24
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot/src/main/java/org/springframework/boot/test/TestRestTemplate.java
View File

@ -55,7 +55,7 @@ public class TestRestTemplate extends RestTemplate {
* Create a new {@link TestRestTemplate} instance. * Create a new {@link TestRestTemplate} instance.
* @param httpClientOptions client options to use if the Apache HTTP Client is used * @param httpClientOptions client options to use if the Apache HTTP Client is used
*/ */
public TestRestTemplate(HtppClientOption... httpClientOptions) { public TestRestTemplate(HttpClientOption... httpClientOptions) {
this(null, null, httpClientOptions); this(null, null, httpClientOptions);
} }
@ -66,7 +66,7 @@ public class TestRestTemplate extends RestTemplate {
* @param httpClientOptions client options to use if the Apache HTTP Client is used * @param httpClientOptions client options to use if the Apache HTTP Client is used
*/ */
public TestRestTemplate(String username, String password, public TestRestTemplate(String username, String password,
HtppClientOption... httpClientOptions) { HttpClientOption... httpClientOptions) {
if (ClassUtils.isPresent("org.apache.http.client.config.RequestConfig", null)) { if (ClassUtils.isPresent("org.apache.http.client.config.RequestConfig", null)) {
setRequestFactory(new CustomHttpComponentsClientHttpRequestFactory( setRequestFactory(new CustomHttpComponentsClientHttpRequestFactory(
httpClientOptions)); httpClientOptions));
@ -94,7 +94,7 @@ public class TestRestTemplate extends RestTemplate {
/** /**
* Options used to customize the Apache Http Client if it is used. * Options used to customize the Apache Http Client if it is used.
*/ */
public static enum HtppClientOption { public static enum HttpClientOption {
/** /**
* Enable cookies. * Enable cookies.
@ -139,12 +139,12 @@ public class TestRestTemplate extends RestTemplate {
private final boolean enableRedirects; private final boolean enableRedirects;
public CustomHttpComponentsClientHttpRequestFactory( public CustomHttpComponentsClientHttpRequestFactory(
HtppClientOption[] httpClientOptions) { HttpClientOption[] httpClientOptions) {
Set<HtppClientOption> options = new HashSet<TestRestTemplate.HtppClientOption>( Set<HttpClientOption> options = new HashSet<TestRestTemplate.HttpClientOption>(
Arrays.asList(httpClientOptions)); Arrays.asList(httpClientOptions));
this.cookieSpec = (options.contains(HtppClientOption.ENABLE_COOKIES) ? CookieSpecs.STANDARD this.cookieSpec = (options.contains(HttpClientOption.ENABLE_COOKIES) ? CookieSpecs.STANDARD
: CookieSpecs.IGNORE_COOKIES); : CookieSpecs.IGNORE_COOKIES);
this.enableRedirects = options.contains(HtppClientOption.ENABLE_REDIRECTS); this.enableRedirects = options.contains(HttpClientOption.ENABLE_REDIRECTS);
} }
@Override @Override
@ -162,4 +162,5 @@ public class TestRestTemplate extends RestTemplate {
} }
} }
} }

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

@ -19,7 +19,7 @@ package org.springframework.boot.test;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.test.TestRestTemplate.CustomHttpComponentsClientHttpRequestFactory; import org.springframework.boot.test.TestRestTemplate.CustomHttpComponentsClientHttpRequestFactory;
import org.springframework.boot.test.TestRestTemplate.HtppClientOption; import org.springframework.boot.test.TestRestTemplate.HttpClientOption;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.client.InterceptingClientHttpRequestFactory; import org.springframework.http.client.InterceptingClientHttpRequestFactory;
@ -49,10 +49,11 @@ public class TestRestTemplateTests {
@Test @Test
public void options() throws Exception { public void options() throws Exception {
TestRestTemplate template = new TestRestTemplate( TestRestTemplate template = new TestRestTemplate(
HtppClientOption.ENABLE_REDIRECTS); HttpClientOption.ENABLE_REDIRECTS);
CustomHttpComponentsClientHttpRequestFactory factory = (CustomHttpComponentsClientHttpRequestFactory) template CustomHttpComponentsClientHttpRequestFactory factory = (CustomHttpComponentsClientHttpRequestFactory) template
.getRequestFactory(); .getRequestFactory();
RequestConfig config = factory.getRequestConfig(); RequestConfig config = factory.getRequestConfig();
assertThat(config.isRedirectsEnabled(), equalTo(true)); assertThat(config.isRedirectsEnabled(), equalTo(true));
} }
} }