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

Upgrade to R2DBC 1.0

Browse Source 
Includes Reactor 2022.0.0-M4, Netty 4.1.79, Jetty 11.0.11, Undertow 2.2.18, Hibernate ORM 5.6.10, Checkstyle 10.3.1

Closes gh-28787
This commit is contained in:
Juergen Hoeller
2022-07-13 10:23:51 +02:00
parent b135cbe7c8
commit 7055ddb489
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-r2dbc/src/test/java/org/springframework/r2dbc/core/DefaultDatabaseClientUnitTests.java
View File

@@ -72,6 +72,7 @@ class DefaultDatabaseClientUnitTests {
private DatabaseClient.Builder databaseClientBuilder;
@BeforeEach
@SuppressWarnings({ "rawtypes", "unchecked" })
void before() {
@@ -84,6 +85,7 @@ class DefaultDatabaseClientUnitTests {
connectionFactory).bindMarkers(BindMarkersFactory.indexed("$", 1));
}
@Test
void connectionFactoryIsExposed() {
ConnectionFactory connectionFactory = mock(ConnectionFactory.class);
@@ -96,7 +98,6 @@ class DefaultDatabaseClientUnitTests {
@Test
void shouldCloseConnectionOnlyOnce() {
DefaultDatabaseClient databaseClient = (DefaultDatabaseClient) databaseClientBuilder.build();
Flux<Object> flux = databaseClient.inConnectionMany(connection -> Flux.empty());
flux.subscribe(new CoreSubscriber<Object>() {
@@ -147,7 +148,6 @@ class DefaultDatabaseClientUnitTests {
@SuppressWarnings("deprecation")
void executeShouldBindSettableValues() {
Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
DatabaseClient databaseClient = databaseClientBuilder.namedParameters(false).build();
databaseClient.sql("SELECT * FROM table WHERE key = $1").bind(0,
@@ -165,7 +165,6 @@ class DefaultDatabaseClientUnitTests {
@Test
void executeShouldBindNamedNullValues() {
Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -198,7 +197,6 @@ class DefaultDatabaseClientUnitTests {
@SuppressWarnings("deprecation")
void executeShouldBindValues() {
Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
DatabaseClient databaseClient = databaseClientBuilder.build();
databaseClient.sql("SELECT * FROM table WHERE key = $1").bind(0,
@@ -214,7 +212,6 @@ class DefaultDatabaseClientUnitTests {
@Test
void executeShouldBindNamedValuesByIndex() {
Statement statement = mockStatementFor("SELECT * FROM table WHERE key = $1");
DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -227,9 +224,8 @@ class DefaultDatabaseClientUnitTests {
@Test
@SuppressWarnings("unchecked")
void rowsUpdatedShouldEmitSingleValue() {
Result result = mock(Result.class);
when(result.getRowsUpdated()).thenReturn(Mono.empty(), Mono.just(2), Flux.just(1, 2, 3));
when(result.getRowsUpdated()).thenReturn(Mono.empty(), Mono.just(2L), Flux.just(1L, 2L, 3L));
mockStatementFor("DROP TABLE tab;", result);
DatabaseClient databaseClient = databaseClientBuilder.build();
@@ -355,9 +351,7 @@ class DefaultDatabaseClientUnitTests {
@Test
void shouldApplyStatementFilterFunctions() {
MockResult result = MockResult.builder().build();
Statement statement = mockStatement(result);
DatabaseClient databaseClient = databaseClientBuilder.build();
databaseClient.sql("SELECT").filter(
@@ -376,9 +370,7 @@ class DefaultDatabaseClientUnitTests {
@Test
void shouldApplySimpleStatementFilterFunctions() {
MockResult result = mockSingleColumnEmptyResult();
Statement statement = mockStatement(result);
DatabaseClient databaseClient = databaseClientBuilder.build();
databaseClient.sql("SELECT").filter(
@@ -393,6 +385,7 @@ class DefaultDatabaseClientUnitTests {
inOrder.verifyNoMoreInteractions();
}
private Statement mockStatement() {
return mockStatementFor(null, null);
}
@@ -407,14 +400,10 @@ class DefaultDatabaseClientUnitTests {
private Statement mockStatementFor(@Nullable String sql, @Nullable Result result) {
Statement statement = mock(Statement.class);
when(connection.createStatement(sql == null ? anyString() : eq(sql))).thenReturn(
statement);
when(connection.createStatement(sql == null ? anyString() : eq(sql))).thenReturn(statement);
when(statement.returnGeneratedValues(anyString())).thenReturn(statement);
when(statement.returnGeneratedValues()).thenReturn(statement);
doReturn(result == null ? Mono.empty() : Flux.just(result)).when(
statement).execute();
doReturn(result == null ? Mono.empty() : Flux.just(result)).when(statement).execute();
return statement;
}