Skip to content

Commit 4da260e

Browse files
mp911demp911de
committed
Upgrade tests to use R2DBC 0.9.
See #710
1 parent 211a087 commit 4da260e

12 files changed

+105
-75
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<degraph-check.version>0.1.4</degraph-check.version>
3131
<postgresql.version>42.2.5</postgresql.version>
3232
<mysql.version>8.0.21</mysql.version>
33-
<r2dbc-spi-test.version>0.8.5.RELEASE</r2dbc-spi-test.version>
33+
<r2dbc-spi-test.version>0.9.1.RELEASE</r2dbc-spi-test.version>
3434
<mssql-jdbc.version>7.1.2.jre8-preview</mssql-jdbc.version>
3535
<mariadb-jdbc.version>2.5.4</mariadb-jdbc.version>
3636
<r2dbc-releasetrain.version>Borca-RELEASE</r2dbc-releasetrain.version>

‎src/test/java/org/springframework/data/r2dbc/convert/EntityRowMapperUnitTests.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.assertj.core.api.Assertions.*;
44
import static org.mockito.Mockito.*;
55

6+
import io.r2dbc.spi.R2dbcType;
67
import io.r2dbc.spi.Row;
78
import io.r2dbc.spi.RowMetadata;
89
import io.r2dbc.spi.test.MockColumnMetadata;
@@ -33,14 +34,14 @@ class EntityRowMapperUnitTests {
3334

3435
private Row rowMock = mock(Row.class);
3536
private RowMetadata metadata = MockRowMetadata.builder()
36-
.columnMetadata(MockColumnMetadata.builder().name("integer_set").build())
37-
.columnMetadata(MockColumnMetadata.builder().name("boxed_integers").build())
38-
.columnMetadata(MockColumnMetadata.builder().name("primitive_integers").build())
39-
.columnMetadata(MockColumnMetadata.builder().name("enum_array").build())
40-
.columnMetadata(MockColumnMetadata.builder().name("set_of_enum").build())
41-
.columnMetadata(MockColumnMetadata.builder().name("enum_set").build())
42-
.columnMetadata(MockColumnMetadata.builder().name("id").build())
43-
.columnMetadata(MockColumnMetadata.builder().name("ids").build()).build();
37+
.columnMetadata(MockColumnMetadata.builder().name("integer_set").type(R2dbcType.COLLECTION).build())
38+
.columnMetadata(MockColumnMetadata.builder().name("boxed_integers").type(R2dbcType.COLLECTION).build())
39+
.columnMetadata(MockColumnMetadata.builder().name("primitive_integers").type(R2dbcType.COLLECTION).build())
40+
.columnMetadata(MockColumnMetadata.builder().name("enum_array").type(R2dbcType.COLLECTION).build())
41+
.columnMetadata(MockColumnMetadata.builder().name("set_of_enum").type(R2dbcType.COLLECTION).build())
42+
.columnMetadata(MockColumnMetadata.builder().name("enum_set").type(R2dbcType.COLLECTION).build())
43+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
44+
.columnMetadata(MockColumnMetadata.builder().name("ids").type(R2dbcType.COLLECTION).build()).build();
4445

4546
@Test // gh-22
4647
void shouldMapSimpleEntity() {

‎src/test/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverterUnitTests.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

21+
import io.r2dbc.spi.R2dbcType;
2122
import io.r2dbc.spi.Row;
2223
import io.r2dbc.spi.test.MockColumnMetadata;
2324
import io.r2dbc.spi.test.MockRow;
@@ -228,8 +229,9 @@ void shouldEvaluateSpelExpression() {
228229

229230
MockRow row = MockRow.builder().identified("id", Object.class, 42).identified("world", Object.class, "No, universe")
230231
.build();
231-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
232-
.columnMetadata(MockColumnMetadata.builder().name("world").build()).build();
232+
MockRowMetadata metadata = MockRowMetadata.builder()
233+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
234+
.columnMetadata(MockColumnMetadata.builder().name("world").type(R2dbcType.VARCHAR).build()).build();
233235

234236
WithSpelExpression result = converter.read(WithSpelExpression.class, row, metadata);
235237

@@ -242,8 +244,9 @@ void shouldEvaluateSpelExpression() {
242244
void considersConverterBeforeEntityConstruction() {
243245

244246
MockRow row = MockRow.builder().identified("id", Object.class, 42).identified("person", Object.class, null).build();
245-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
246-
.columnMetadata(MockColumnMetadata.builder().name("person").build()).build();
247+
MockRowMetadata metadata = MockRowMetadata.builder()
248+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
249+
.columnMetadata(MockColumnMetadata.builder().name("person").type(R2dbcType.VARCHAR).build()).build();
247250

248251
WithSimplePersonConstructor result = converter.read(WithSimplePersonConstructor.class, row, metadata);
249252

‎src/test/java/org/springframework/data/r2dbc/convert/MySqlMappingR2dbcConverterUnitTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20+
import io.r2dbc.spi.R2dbcType;
2021
import io.r2dbc.spi.test.MockColumnMetadata;
2122
import io.r2dbc.spi.test.MockRow;
2223
import io.r2dbc.spi.test.MockRowMetadata;
@@ -80,8 +81,8 @@ void shouldReadByteToBoolean() {
8081
.identified("flag2", Object.class, (byte) 0).build();
8182

8283
MockRowMetadata metadata = MockRowMetadata.builder()
83-
.columnMetadata(MockColumnMetadata.builder().name("flag1").build())
84-
.columnMetadata(MockColumnMetadata.builder().name("flag2").build()).build();
84+
.columnMetadata(MockColumnMetadata.builder().name("flag1").type(R2dbcType.SMALLINT).build())
85+
.columnMetadata(MockColumnMetadata.builder().name("flag2").type(R2dbcType.SMALLINT).build()).build();
8586

8687
BooleanMapping mapped = converter.read(BooleanMapping.class, row, metadata);
8788

‎src/test/java/org/springframework/data/r2dbc/convert/PostgresMappingR2dbcConverterUnitTests.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static org.assertj.core.api.Assertions.*;
1919

2020
import io.r2dbc.postgresql.codec.Json;
21+
import io.r2dbc.spi.R2dbcType;
2122
import io.r2dbc.spi.test.MockColumnMetadata;
2223
import io.r2dbc.spi.test.MockRow;
2324
import io.r2dbc.spi.test.MockRowMetadata;
@@ -89,7 +90,7 @@ void shouldConvertJsonToString() {
8990
MockRow row = MockRow.builder().identified("json_string", Object.class, Json.of("{\"hello\":\"world\"}")).build();
9091

9192
MockRowMetadata metadata = MockRowMetadata.builder()
92-
.columnMetadata(MockColumnMetadata.builder().name("json_string").build()).build();
93+
.columnMetadata(MockColumnMetadata.builder().name("json_string").type(R2dbcType.VARCHAR).build()).build();
9394

9495
ConvertedJson result = converter.read(ConvertedJson.class, row, metadata);
9596
assertThat(result.jsonString).isEqualTo("{\"hello\":\"world\"}");
@@ -101,7 +102,7 @@ void shouldConvertJsonToByteArray() {
101102
MockRow row = MockRow.builder().identified("json_bytes", Object.class, Json.of("{\"hello\":\"world\"}")).build();
102103

103104
MockRowMetadata metadata = MockRowMetadata.builder()
104-
.columnMetadata(MockColumnMetadata.builder().name("json_bytes").build()).build();
105+
.columnMetadata(MockColumnMetadata.builder().name("json_bytes").type(R2dbcType.VARCHAR).build()).build();
105106

106107
ConvertedJson result = converter.read(ConvertedJson.class, row, metadata);
107108
assertThat(result.jsonBytes).isEqualTo("{\"hello\":\"world\"}".getBytes());
@@ -113,7 +114,7 @@ void shouldApplyCustomReadingConverter() {
113114
MockRow row = MockRow.builder().identified("holder", Object.class, Json.of("{\"hello\":\"world\"}")).build();
114115

115116
MockRowMetadata metadata = MockRowMetadata.builder()
116-
.columnMetadata(MockColumnMetadata.builder().name("holder").build()).build();
117+
.columnMetadata(MockColumnMetadata.builder().name("holder").type(R2dbcType.VARCHAR).build()).build();
117118

118119
WithJsonHolder result = converter.read(WithJsonHolder.class, row, metadata);
119120
assertThat(result.holder).isNotNull();

‎src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import io.r2dbc.spi.Connection;
2323
import io.r2dbc.spi.ConnectionFactory;
24+
import io.r2dbc.spi.R2dbcType;
2425
import io.r2dbc.spi.Result;
2526
import io.r2dbc.spi.Statement;
2627
import io.r2dbc.spi.test.MockColumnMetadata;
@@ -435,9 +436,7 @@ void shouldApplyExecuteFunction() {
435436
@Test // gh-189
436437
void shouldApplyStatementFilterFunctions() {
437438

438-
MockRowMetadata metadata = MockRowMetadata.builder()
439-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
440-
MockResult result = MockResult.builder().rowMetadata(metadata).build();
439+
MockResult result = MockResult.builder().build();
441440

442441
Statement statement = mockStatement(result);
443442

@@ -460,9 +459,7 @@ void shouldApplyStatementFilterFunctions() {
460459
@Test // gh-189
461460
void shouldApplyStatementFilterFunctionsToTypedExecute() {
462461

463-
MockRowMetadata metadata = MockRowMetadata.builder()
464-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
465-
MockResult result = MockResult.builder().rowMetadata(metadata).build();
462+
MockResult result = MockResult.builder().build();
466463

467464
Statement statement = mockStatement(result);
468465

@@ -538,11 +535,11 @@ private MockResult mockSingleColumnEmptyResult() {
538535
private MockResult mockSingleColumnResult(@Nullable MockRow.Builder row) {
539536

540537
MockRowMetadata metadata = MockRowMetadata.builder()
541-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
538+
.columnMetadata(MockColumnMetadata.builder().name("name").type(R2dbcType.VARCHAR).build()).build();
542539

543-
MockResult.Builder resultBuilder = MockResult.builder().rowMetadata(metadata);
540+
MockResult.Builder resultBuilder = MockResult.builder();
544541
if (row != null) {
545-
resultBuilder = resultBuilder.row(row.build());
542+
resultBuilder = resultBuilder.row(row.metadata(metadata).build());
546543
}
547544
return resultBuilder.build();
548545
}

‎src/test/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplateUnitTests.java

+16-14
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

21+
import io.r2dbc.spi.R2dbcType;
2122
import io.r2dbc.spi.test.MockColumnMetadata;
2223
import io.r2dbc.spi.test.MockResult;
2324
import io.r2dbc.spi.test.MockRow;
@@ -87,8 +88,8 @@ void before() {
8788
void shouldCountBy() {
8889

8990
MockRowMetadata metadata = MockRowMetadata.builder()
90-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
91-
MockResult result = MockResult.builder().rowMetadata(metadata)
91+
.columnMetadata(MockColumnMetadata.builder().name("name").type(R2dbcType.VARCHAR).build()).build();
92+
MockResult result = MockResult.builder()
9293
.row(MockRow.builder().identified(0, Long.class, 1L).build()).build();
9394

9495
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
@@ -108,8 +109,8 @@ void shouldCountBy() {
108109
void shouldProjectExistsResult() {
109110

110111
MockRowMetadata metadata = MockRowMetadata.builder()
111-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
112-
MockResult result = MockResult.builder().rowMetadata(metadata)
112+
.columnMetadata(MockColumnMetadata.builder().name("name").type(R2dbcType.VARCHAR).build()).build();
113+
MockResult result = MockResult.builder()
113114
.row(MockRow.builder().identified(0, Object.class, null).build()).build();
114115

115116
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
@@ -126,8 +127,8 @@ void shouldProjectExistsResult() {
126127
void shouldExistsByCriteria() {
127128

128129
MockRowMetadata metadata = MockRowMetadata.builder()
129-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
130-
MockResult result = MockResult.builder().rowMetadata(metadata)
130+
.columnMetadata(MockColumnMetadata.builder().name("name").type(R2dbcType.VARCHAR).build()).build();
131+
MockResult result = MockResult.builder()
131132
.row(MockRow.builder().identified(0, Long.class, 1L).build()).build();
132133

133134
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
@@ -162,10 +163,11 @@ void shouldSelectByCriteria() {
162163
@Test // gh-215
163164
void selectShouldInvokeCallback() {
164165

165-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
166-
.columnMetadata(MockColumnMetadata.builder().name("THE_NAME").build()).build();
167-
MockResult result = MockResult.builder().rowMetadata(metadata).row(MockRow.builder()
168-
.identified("id", Object.class, "Walter").identified("THE_NAME", Object.class, "some-name").build()).build();
166+
MockRowMetadata metadata = MockRowMetadata.builder()
167+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
168+
.columnMetadata(MockColumnMetadata.builder().name("THE_NAME").type(R2dbcType.VARCHAR).build()).build();
169+
MockResult result = MockResult.builder().row(MockRow.builder().identified("id", Object.class, "Walter")
170+
.identified("THE_NAME", Object.class, "some-name").metadata(metadata).build()).build();
169171

170172
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
171173

@@ -204,8 +206,8 @@ void shouldSelectOne() {
204206
void shouldUpdateByQuery() {
205207

206208
MockRowMetadata metadata = MockRowMetadata.builder()
207-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
208-
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
209+
.columnMetadata(MockColumnMetadata.builder().name("name").type(R2dbcType.VARCHAR).build()).build();
210+
MockResult result = MockResult.builder().rowsUpdated(1).build();
209211

210212
recorder.addStubbing(s -> s.startsWith("UPDATE"), result);
211213

@@ -226,8 +228,8 @@ void shouldUpdateByQuery() {
226228
void shouldDeleteByQuery() {
227229

228230
MockRowMetadata metadata = MockRowMetadata.builder()
229-
.columnMetadata(MockColumnMetadata.builder().name("name").build()).build();
230-
MockResult result = MockResult.builder().rowMetadata(metadata).rowsUpdated(1).build();
231+
.columnMetadata(MockColumnMetadata.builder().name("name").type(R2dbcType.VARCHAR).build()).build();
232+
MockResult result = MockResult.builder().rowsUpdated(1).build();
231233

232234
recorder.addStubbing(s -> s.startsWith("DELETE"), result);
233235

‎src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static org.assertj.core.api.Assertions.*;
1919
import static org.mockito.Mockito.*;
2020

21+
import io.r2dbc.spi.Parameters;
2122
import io.r2dbc.spi.Row;
2223
import io.r2dbc.spi.RowMetadata;
2324
import io.r2dbc.spi.test.MockColumnMetadata;
@@ -198,7 +199,8 @@ private <T> void testType(BiConsumer<PrimitiveTypes, T> setter, Function<Primiti
198199
ReactiveDataAccessStrategy strategy = getStrategy();
199200
Row rowMock = mock(Row.class);
200201
RowMetadata metadataMock = MockRowMetadata.builder()
201-
.columnMetadata(MockColumnMetadata.builder().name(fieldname).build()).build();
202+
.columnMetadata(MockColumnMetadata.builder().name(fieldname).type(Parameters.in(testValue).getType()).build())
203+
.build();
202204

203205
PrimitiveTypes toSave = new PrimitiveTypes();
204206
setter.accept(toSave, testValue);

‎src/test/java/org/springframework/data/r2dbc/core/ReactiveInsertOperationUnitTests.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20+
import io.r2dbc.spi.R2dbcType;
2021
import io.r2dbc.spi.test.MockColumnMetadata;
2122
import io.r2dbc.spi.test.MockResult;
2223
import io.r2dbc.spi.test.MockRow;
@@ -55,10 +56,11 @@ void before() {
5556
@Test // gh-220
5657
void shouldInsert() {
5758

58-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
59+
MockRowMetadata metadata = MockRowMetadata.builder()
60+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
5961
.build();
60-
MockResult result = MockResult.builder().rowMetadata(metadata)
61-
.row(MockRow.builder().identified("id", Object.class, 42).build()).build();
62+
MockResult result = MockResult.builder()
63+
.row(MockRow.builder().identified("id", Object.class, 42).metadata(metadata).build()).build();
6264

6365
recorder.addStubbing(s -> s.startsWith("INSERT"), result);
6466

@@ -83,10 +85,11 @@ void shouldInsert() {
8385
@Test // gh-220
8486
void shouldUpdateInTable() {
8587

86-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
88+
MockRowMetadata metadata = MockRowMetadata.builder()
89+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
8790
.build();
88-
MockResult result = MockResult.builder().rowMetadata(metadata)
89-
.row(MockRow.builder().identified("id", Object.class, 42).build()).build();
91+
MockResult result = MockResult.builder()
92+
.row(MockRow.builder().identified("id", Object.class, 42).metadata(metadata).build()).build();
9093

9194
recorder.addStubbing(s -> s.startsWith("INSERT"), result);
9295

0 commit comments

Comments
 (0)