Browse Source

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

See gh-47263
pull/47626/head
Moritz Halbritter 2 months ago
parent
commit
9217ad48bc
  1. 8
      module/spring-boot-neo4j/build.gradle
  2. 4
      module/spring-boot-neo4j/src/test/java/org/springframework/boot/neo4j/autoconfigure/Neo4jPropertiesTests.java
  3. 1
      module/spring-boot-neo4j/src/test/java/org/springframework/boot/neo4j/autoconfigure/health/Neo4jHealthContributorAutoConfigurationTests.java
  4. 3
      module/spring-boot-neo4j/src/test/java/org/springframework/boot/neo4j/health/ResultSummaryMock.java

8
module/spring-boot-neo4j/build.gradle

@ -55,3 +55,11 @@ dependencies { @@ -55,3 +55,11 @@ dependencies {
testRuntimeOnly("ch.qos.logback:logback-classic")
}
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
tasks.named("compileDockerTestJava") {
options.nullability.checking = "tests"
}

4
module/spring-boot-neo4j/src/test/java/org/springframework/boot/neo4j/autoconfigure/Neo4jPropertiesTests.java

@ -18,6 +18,7 @@ package org.springframework.boot.neo4j.autoconfigure; @@ -18,6 +18,7 @@ package org.springframework.boot.neo4j.autoconfigure;
import java.time.Duration;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.neo4j.driver.Config;
import org.neo4j.driver.internal.retry.RetrySettings;
@ -64,11 +65,12 @@ class Neo4jPropertiesTests { @@ -64,11 +65,12 @@ class Neo4jPropertiesTests {
assertDuration(properties.getMaxTransactionRetryTime(), RetrySettings.DEFAULT.maxRetryTimeMs());
}
private static void assertDuration(Duration duration, long expectedValueInMillis) {
private static void assertDuration(@Nullable Duration duration, long expectedValueInMillis) {
if (expectedValueInMillis == -1) {
assertThat(duration).isNull();
}
else {
assertThat(duration).isNotNull();
assertThat(duration.toMillis()).isEqualTo(expectedValueInMillis);
}
}

1
module/spring-boot-neo4j/src/test/java/org/springframework/boot/neo4j/autoconfigure/health/Neo4jHealthContributorAutoConfigurationTests.java

@ -78,6 +78,7 @@ class Neo4jHealthContributorAutoConfigurationTests { @@ -78,6 +78,7 @@ class Neo4jHealthContributorAutoConfigurationTests {
.run((context) -> {
assertThat(context).hasBean("neo4jHealthIndicator");
Health health = context.getBean("neo4jHealthIndicator", HealthIndicator.class).health();
assertThat(health).isNotNull();
assertThat(health.getDetails()).containsOnly(entry("test", true));
});
}

3
module/spring-boot-neo4j/src/test/java/org/springframework/boot/neo4j/health/ResultSummaryMock.java

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
package org.springframework.boot.neo4j.health;
import org.jspecify.annotations.Nullable;
import org.neo4j.driver.summary.DatabaseInfo;
import org.neo4j.driver.summary.ResultSummary;
import org.neo4j.driver.summary.ServerInfo;
@ -33,7 +34,7 @@ final class ResultSummaryMock { @@ -33,7 +34,7 @@ final class ResultSummaryMock {
private ResultSummaryMock() {
}
static ResultSummary createResultSummary(String serverAddress, String databaseName) {
static ResultSummary createResultSummary(String serverAddress, @Nullable String databaseName) {
ServerInfo serverInfo = mock(ServerInfo.class);
given(serverInfo.address()).willReturn(serverAddress);
DatabaseInfo databaseInfo = mock(DatabaseInfo.class);

Loading…
Cancel
Save