GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-03 03:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Add missing HttpClientSettingsPropertyMapper tests

Browse Source 
See gh-48145

Signed-off-by: Steve Armstrong <stevearmstrong-dev@users.noreply.github.com>
This commit is contained in:
Steve Armstrong
2025-11-16 19:29:15 +00:00
committed by Stéphane Nicoll
parent 2e4566bd3d
commit 82fe577596
1 changed files with 107 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsPropertyMapperTests.java
+107 -3
View File
@@ -16,19 +16,123 @@
package org.springframework.boot.http.client.autoconfigure;
import org.junit.jupiter.api.Disabled;
import java.time.Duration;
import org.junit.jupiter.api.Test;
import org.springframework.boot.http.client.HttpClientSettings;
import org.springframework.boot.http.client.HttpRedirects;
import org.springframework.boot.ssl.SslBundle;
import org.springframework.boot.ssl.SslBundles;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
/**
* Tests for {@link HttpClientSettingsPropertyMapper}.
*
* @author Phillip Webb
*/
@Disabled("TODO")
class HttpClientSettingsPropertyMapperTests {
@Test
void mapMapsProperties() {
void mapWhenPropertiesIsNullReturnsBaseSettings() {
HttpClientSettings baseSettings = HttpClientSettings.defaults()
.withConnectTimeout(Duration.ofSeconds(10));
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, baseSettings);
HttpClientSettings result = mapper.map(null);
assertThat(result).isEqualTo(baseSettings);
}
@Test
void mapWhenPropertiesIsNullAndBaseSettingsIsNullReturnsDefaults() {
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, null);
HttpClientSettings result = mapper.map(null);
assertThat(result).isEqualTo(HttpClientSettings.defaults());
}
@Test
void mapMapsRedirects() {
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, null);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.setRedirects(HttpRedirects.DONT_FOLLOW);
HttpClientSettings result = mapper.map(properties);
assertThat(result.redirects()).isEqualTo(HttpRedirects.DONT_FOLLOW);
}
@Test
void mapMapsConnectTimeout() {
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, null);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.setConnectTimeout(Duration.ofSeconds(5));
HttpClientSettings result = mapper.map(properties);
assertThat(result.connectTimeout()).isEqualTo(Duration.ofSeconds(5));
}
@Test
void mapMapsReadTimeout() {
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, null);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.setReadTimeout(Duration.ofSeconds(30));
HttpClientSettings result = mapper.map(properties);
assertThat(result.readTimeout()).isEqualTo(Duration.ofSeconds(30));
}
@Test
void mapMapsSslBundle() {
SslBundle sslBundle = mock(SslBundle.class);
SslBundles sslBundles = mock(SslBundles.class);
given(sslBundles.getBundle("test-bundle")).willReturn(sslBundle);
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(sslBundles, null);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.getSsl().setBundle("test-bundle");
HttpClientSettings result = mapper.map(properties);
assertThat(result.sslBundle()).isSameAs(sslBundle);
}
@Test
void mapMapsAllProperties() {
SslBundle sslBundle = mock(SslBundle.class);
SslBundles sslBundles = mock(SslBundles.class);
given(sslBundles.getBundle("my-bundle")).willReturn(sslBundle);
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(sslBundles, null);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.setRedirects(HttpRedirects.FOLLOW);
properties.setConnectTimeout(Duration.ofSeconds(10));
properties.setReadTimeout(Duration.ofSeconds(20));
properties.getSsl().setBundle("my-bundle");
HttpClientSettings result = mapper.map(properties);
assertThat(result.redirects()).isEqualTo(HttpRedirects.FOLLOW);
assertThat(result.connectTimeout()).isEqualTo(Duration.ofSeconds(10));
assertThat(result.readTimeout()).isEqualTo(Duration.ofSeconds(20));
assertThat(result.sslBundle()).isSameAs(sslBundle);
}
@Test
void mapUsesBaseSettingsForMissingProperties() {
HttpClientSettings baseSettings = new HttpClientSettings(HttpRedirects.FOLLOW_WHEN_POSSIBLE,
Duration.ofSeconds(15), Duration.ofSeconds(25), null);
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, baseSettings);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.setConnectTimeout(Duration.ofSeconds(5));
HttpClientSettings result = mapper.map(properties);
assertThat(result.redirects()).isEqualTo(HttpRedirects.FOLLOW_WHEN_POSSIBLE);
assertThat(result.connectTimeout()).isEqualTo(Duration.ofSeconds(5));
assertThat(result.readTimeout()).isEqualTo(Duration.ofSeconds(25));
}
@Test
void mapWhenSslBundleRequestedButSslBundlesIsNullThrowsException() {
HttpClientSettingsPropertyMapper mapper = new HttpClientSettingsPropertyMapper(null, null);
TestHttpClientSettingsProperties properties = new TestHttpClientSettingsProperties();
properties.getSsl().setBundle("test-bundle");
assertThatIllegalStateException().isThrownBy(() -> mapper.map(properties))
.withMessage("No 'sslBundles' available");
}
static class TestHttpClientSettingsProperties extends HttpClientSettingsProperties {
}