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

Merge branch '2.4.x' 

Closes gh-25521
This commit is contained in:
Andy Wilkinson 2021-03-05 15:37:47 +00:00
parent 074744aee7 3c84ea9350
commit 6b1bb225b6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.data.neo4j; package org.springframework.boot.autoconfigure.data.neo4j;
import java.time.Duration;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.containers.Neo4jContainer;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
@ -44,7 +46,8 @@ import static org.assertj.core.api.Assertions.assertThat;
public class Neo4jRepositoriesAutoConfigurationIntegrationTests { public class Neo4jRepositoriesAutoConfigurationIntegrationTests {
@Container @Container
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j()); private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j())
.withStartupTimeout(Duration.ofMinutes(10));
@DynamicPropertySource @DynamicPropertySource
static void neo4jProperties(DynamicPropertyRegistry registry) { static void neo4jProperties(DynamicPropertyRegistry registry) {

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.neo4j; package org.springframework.boot.autoconfigure.neo4j;
import java.time.Duration;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.neo4j.driver.Driver; import org.neo4j.driver.Driver;
import org.neo4j.driver.Result; import org.neo4j.driver.Result;
@ -46,7 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat;
class Neo4jAutoConfigurationIntegrationTests { class Neo4jAutoConfigurationIntegrationTests {
@Container @Container
private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j()); private static final Neo4jContainer<?> neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j())
.withStartupTimeout(Duration.ofMinutes(10));
@DynamicPropertySource @DynamicPropertySource
static void neo4jProperties(DynamicPropertyRegistry registry) { static void neo4jProperties(DynamicPropertyRegistry registry) {