Browse Source

Add nullability annotations to tests in module/spring-boot-webservices

See gh-47263
pull/47665/head
Moritz Halbritter 2 months ago
parent
commit
ff83723d99
  1. 4
      module/spring-boot-webservices/build.gradle
  2. 9
      module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/autoconfigure/WebServicesPropertiesTests.java
  3. 4
      module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java
  4. 18
      module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java

4
module/spring-boot-webservices/build.gradle

@ -41,3 +41,7 @@ dependencies { @@ -41,3 +41,7 @@ dependencies {
testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
}
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}

9
module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/autoconfigure/WebServicesPropertiesTests.java

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
package org.springframework.boot.webservices.autoconfigure;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@ -29,23 +30,25 @@ class WebServicesPropertiesTests { @@ -29,23 +30,25 @@ class WebServicesPropertiesTests {
private WebServicesProperties properties;
@BeforeEach
void setUp() {
this.properties = new WebServicesProperties();
}
@Test
void pathMustNotBeEmpty() {
this.properties = new WebServicesProperties();
assertThatIllegalArgumentException().isThrownBy(() -> this.properties.setPath(""))
.withMessageContaining("'path' must have length greater than 1");
}
@Test
void pathMustHaveLengthGreaterThanOne() {
this.properties = new WebServicesProperties();
assertThatIllegalArgumentException().isThrownBy(() -> this.properties.setPath("/"))
.withMessageContaining("'path' must have length greater than 1");
}
@Test
void customPathMustBeginWithASlash() {
this.properties = new WebServicesProperties();
assertThatIllegalArgumentException().isThrownBy(() -> this.properties.setPath("custom"))
.withMessageContaining("'path' must start with '/'");
}

4
module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java

@ -94,6 +94,7 @@ class WebServiceMessageSenderFactoryTests { @@ -94,6 +94,7 @@ class WebServiceMessageSenderFactoryTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void httpWithFactoryAndSettingsWhenFactoryIsNullThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> WebServiceMessageSenderFactory.http(null, null))
.withMessage("'requestFactoryBuilder' must not be null");
@ -113,8 +114,7 @@ class WebServiceMessageSenderFactoryTests { @@ -113,8 +114,7 @@ class WebServiceMessageSenderFactoryTests {
private ClientHttpRequestFactory getRequestFactory(WebServiceMessageSender sender) {
assertThat(sender).isInstanceOf(ClientHttpRequestMessageSender.class);
ClientHttpRequestFactory requestFactory = ((ClientHttpRequestMessageSender) sender).getRequestFactory();
return requestFactory;
return ((ClientHttpRequestMessageSender) sender).getRequestFactory();
}
}

18
module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java

@ -62,9 +62,11 @@ class WebServiceTemplateBuilderTests { @@ -62,9 +62,11 @@ class WebServiceTemplateBuilderTests {
private final WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
@Mock
@SuppressWarnings("NullAway.Init")
private WebServiceMessageSender messageSender;
@Mock
@SuppressWarnings("NullAway.Init")
private ClientInterceptor interceptor;
@Test
@ -100,6 +102,7 @@ class WebServiceTemplateBuilderTests { @@ -100,6 +102,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void messageSendersWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.messageSenders((WebServiceMessageSender[]) null))
@ -107,6 +110,7 @@ class WebServiceTemplateBuilderTests { @@ -107,6 +110,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void messageSendersCollectionWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.messageSenders((Collection<? extends WebServiceMessageSender>) null))
@ -128,6 +132,7 @@ class WebServiceTemplateBuilderTests { @@ -128,6 +132,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalMessageSendersWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalMessageSenders((WebServiceMessageSender[]) null))
@ -135,6 +140,7 @@ class WebServiceTemplateBuilderTests { @@ -135,6 +140,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalMessageSendersCollectionWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(
@ -159,12 +165,14 @@ class WebServiceTemplateBuilderTests { @@ -159,12 +165,14 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void interceptorsWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException().isThrownBy(() -> this.builder.interceptors((ClientInterceptor[]) null))
.withMessageContaining("'interceptors' must not be null");
}
@Test
@SuppressWarnings("NullAway") // Test null check
void interceptorsCollectionWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.interceptors((Collection<? extends ClientInterceptor>) null))
@ -186,6 +194,7 @@ class WebServiceTemplateBuilderTests { @@ -186,6 +194,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalInterceptorsWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalInterceptors((ClientInterceptor[]) null))
@ -193,6 +202,7 @@ class WebServiceTemplateBuilderTests { @@ -193,6 +202,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalInterceptorsCollectionWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalInterceptors((Set<ClientInterceptor>) null))
@ -219,6 +229,7 @@ class WebServiceTemplateBuilderTests { @@ -219,6 +229,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void customizersWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.customizers((WebServiceTemplateCustomizer[]) null))
@ -226,6 +237,7 @@ class WebServiceTemplateBuilderTests { @@ -226,6 +237,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void customizersCollectionWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.customizers((Collection<? extends WebServiceTemplateCustomizer>) null))
@ -259,6 +271,7 @@ class WebServiceTemplateBuilderTests { @@ -259,6 +271,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalCustomizersWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalCustomizers((WebServiceTemplateCustomizer[]) null))
@ -266,6 +279,7 @@ class WebServiceTemplateBuilderTests { @@ -266,6 +279,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalCustomizersCollectionWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(
@ -336,7 +350,9 @@ class WebServiceTemplateBuilderTests { @@ -336,7 +350,9 @@ class WebServiceTemplateBuilderTests {
void setDefaultUri() {
URI uri = URI.create("http://localhost:8080");
WebServiceTemplate webServiceTemplate = this.builder.setDefaultUri(uri.toString()).build();
assertThat(webServiceTemplate.getDestinationProvider().getDestination()).isEqualTo(uri);
DestinationProvider destinationProvider = webServiceTemplate.getDestinationProvider();
assertThat(destinationProvider).isNotNull();
assertThat(destinationProvider.getDestination()).isEqualTo(uri);
}
@Test

Loading…
Cancel
Save