From 928df41f611453ef78eb9efeb00d8c0db8c1d540 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 7 Dec 2022 14:45:42 +0100 Subject: [PATCH] Start building against Reactor 2022.0.1 SNAPSHOTs See gh-33475 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../data/r2dbc/DataR2dbcTestIntegrationTests.java | 6 +++++- .../boot/test/autoconfigure/data/r2dbc/schema.sql | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index bff51fb577..a444acaf98 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1157,7 +1157,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.0") { + library("Reactor Bom", "2022.0.1-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom" diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java index 2a6d9f9aed..6a5c418f07 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/r2dbc/DataR2dbcTestIntegrationTests.java @@ -16,8 +16,11 @@ package org.springframework.boot.test.autoconfigure.data.r2dbc; +import java.util.Map; + import io.r2dbc.spi.ConnectionFactory; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; @@ -46,7 +49,8 @@ class DataR2dbcTestIntegrationTests { @Test void testDatabaseClient() { - this.databaseClient.sql("SELECT * FROM example").fetch().all().as(StepVerifier::create).verifyComplete(); + Flux> all = this.databaseClient.sql("SELECT * FROM example").fetch().all(); + StepVerifier.create(all).expectNextCount(1).verifyComplete(); } @Test diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql b/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql index 0d4a802b6b..525ef71bb4 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/data/r2dbc/schema.sql @@ -1,2 +1,3 @@ drop table if exists example; create table example (id int, name varchar); +insert into example VALUES (1, 'Spring Boot');