Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-36043
This commit is contained in:
Andy Wilkinson
2023-06-23 15:50:02 +01:00
parent de9f249ef9 7b0aa7dcbb
commit 2fae5de245
24 changed files with 159 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,8 +79,12 @@ class DataNeo4jTestReactiveIntegrationTests {
.flatMap(this.exampleRepository::save)
.as(StepVerifier::create)
.expectNextCount(1)
.verifyComplete();
StepVerifier.create(this.neo4jTemplate.count(ExampleGraph.class)).expectNext(1L).verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(30));
StepVerifier.create(this.neo4jTemplate.count(ExampleGraph.class))
.expectNext(1L)
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.boot.test.autoconfigure.data.r2dbc;
import java.time.Duration;
import java.util.Map;
import io.r2dbc.spi.ConnectionFactory;
@@ -50,7 +51,7 @@ class DataR2dbcTestIntegrationTests {
@Test
void testDatabaseClient() {
Flux<Map<String, Object>> all = this.databaseClient.sql("SELECT * FROM example").fetch().all();
StepVerifier.create(all).expectNextCount(1).verifyComplete();
StepVerifier.create(all).expectNextCount(1).expectComplete().verify(Duration.ofSeconds(30));
}
@Test

12
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestReactiveIntegrationTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.boot.test.autoconfigure.data.redis;
import java.time.Duration;
import java.util.UUID;
import org.junit.jupiter.api.Test;
@@ -62,11 +63,16 @@ class DataRedisTestReactiveIntegrationTests {
String id = UUID.randomUUID().toString();
StepVerifier.create(this.operations.opsForValue().set(id, "Hello World"))
.expectNext(Boolean.TRUE)
.verifyComplete();
StepVerifier.create(this.operations.opsForValue().get(id)).expectNext("Hello World").verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(30));
StepVerifier.create(this.operations.opsForValue().get(id))
.expectNext("Hello World")
.expectComplete()
.verify(Duration.ofSeconds(30));
StepVerifier.create(this.operations.execute((action) -> action.serverCommands().flushDb()))
.expectNext("OK")
.verifyComplete();
.expectComplete()
.verify(Duration.ofSeconds(30));
}
@Test