Skip to content

Commit 7c3ff05

Browse files
mp911demp911de
committed
Upgrade tests to use R2DBC 0.9.
See #710
1 parent 907f486 commit 7c3ff05

9 files changed

+95
-64
lines changed

‎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/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/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;
@@ -56,10 +57,11 @@ void before() {
5657
@Test // gh-220
5758
void shouldInsert() {
5859

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

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

@@ -84,10 +86,11 @@ void shouldInsert() {
8486
@Test // gh-220
8587
void shouldUpdateInTable() {
8688

87-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
89+
MockRowMetadata metadata = MockRowMetadata.builder()
90+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
8891
.build();
89-
MockResult result = MockResult.builder().rowMetadata(metadata)
90-
.row(MockRow.builder().identified("id", Object.class, 42).build()).build();
92+
MockResult result = MockResult.builder()
93+
.row(MockRow.builder().identified("id", Object.class, 42).metadata(metadata).build()).build();
9194

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

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

+27-19
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static org.springframework.data.relational.core.query.Criteria.*;
2020
import static org.springframework.data.relational.core.query.Query.*;
2121

22+
import io.r2dbc.spi.R2dbcType;
2223
import io.r2dbc.spi.test.MockColumnMetadata;
2324
import io.r2dbc.spi.test.MockResult;
2425
import io.r2dbc.spi.test.MockRow;
@@ -57,10 +58,11 @@ void before() {
5758
@Test // gh-220
5859
void shouldSelectAll() {
5960

60-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
61+
MockRowMetadata metadata = MockRowMetadata.builder()
62+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
6163
.build();
62-
MockResult result = MockResult.builder().rowMetadata(metadata)
63-
.row(MockRow.builder().identified("id", Object.class, "Walter").build()).build();
64+
MockResult result = MockResult.builder()
65+
.row(MockRow.builder().identified("id", Object.class, "Walter").metadata(metadata).build()).build();
6466

6567
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
6668

@@ -80,10 +82,11 @@ void shouldSelectAll() {
8082
@Test // gh-220
8183
void shouldSelectAs() {
8284

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

8891
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
8992

@@ -103,10 +106,11 @@ void shouldSelectAs() {
103106
@Test // gh-220
104107
void shouldSelectFromTable() {
105108

106-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
109+
MockRowMetadata metadata = MockRowMetadata.builder()
110+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
107111
.build();
108112
MockResult result = MockResult.builder().rowMetadata(metadata)
109-
.row(MockRow.builder().identified("id", Object.class, "Walter").build()).build();
113+
.row(MockRow.builder().identified("id", Object.class, "Walter").metadata(metadata).build()).build();
110114

111115
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
112116

@@ -126,10 +130,11 @@ void shouldSelectFromTable() {
126130
@Test // gh-220
127131
void shouldSelectFirst() {
128132

129-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
133+
MockRowMetadata metadata = MockRowMetadata.builder()
134+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
130135
.build();
131136
MockResult result = MockResult.builder().rowMetadata(metadata)
132-
.row(MockRow.builder().identified("id", Object.class, "Walter").build()).build();
137+
.row(MockRow.builder().identified("id", Object.class, "Walter").metadata(metadata).build()).build();
133138

134139
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
135140

@@ -148,10 +153,11 @@ void shouldSelectFirst() {
148153
@Test // gh-220
149154
void shouldSelectOne() {
150155

151-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
156+
MockRowMetadata metadata = MockRowMetadata.builder()
157+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
152158
.build();
153-
MockResult result = MockResult.builder().rowMetadata(metadata)
154-
.row(MockRow.builder().identified("id", Object.class, "Walter").build()).build();
159+
MockResult result = MockResult.builder()
160+
.row(MockRow.builder().identified("id", Object.class, "Walter").metadata(metadata).build()).build();
155161

156162
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
157163

@@ -170,10 +176,11 @@ void shouldSelectOne() {
170176
@Test // gh-220
171177
void shouldSelectExists() {
172178

173-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
179+
MockRowMetadata metadata = MockRowMetadata.builder()
180+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
174181
.build();
175-
MockResult result = MockResult.builder().rowMetadata(metadata)
176-
.row(MockRow.builder().identified("id", Object.class, "Walter").build()).build();
182+
MockResult result = MockResult.builder()
183+
.row(MockRow.builder().identified("id", Object.class, "Walter").metadata(metadata).build()).build();
177184

178185
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
179186

@@ -192,10 +199,11 @@ void shouldSelectExists() {
192199
@Test // gh-220
193200
void shouldSelectCount() {
194201

195-
MockRowMetadata metadata = MockRowMetadata.builder().columnMetadata(MockColumnMetadata.builder().name("id").build())
202+
MockRowMetadata metadata = MockRowMetadata.builder()
203+
.columnMetadata(MockColumnMetadata.builder().name("id").type(R2dbcType.INTEGER).build())
196204
.build();
197-
MockResult result = MockResult.builder().rowMetadata(metadata)
198-
.row(MockRow.builder().identified(0, Long.class, 1L).build()).build();
205+
MockResult result = MockResult.builder()
206+
.row(MockRow.builder().identified(0, Long.class, 1L).metadata(metadata).build()).build();
199207

200208
recorder.addStubbing(s -> s.startsWith("SELECT"), result);
201209

‎src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java

+3-2
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;
@@ -288,9 +289,9 @@ void usesDtoTypeForDtoResultMapping() {
288289
void selectsSimpleType() {
289290

290291
MockRowMetadata metadata = MockRowMetadata.builder()
291-
.columnMetadata(MockColumnMetadata.builder().name("date").build()).build();
292+
.columnMetadata(MockColumnMetadata.builder().name("date").type(R2dbcType.DATE).build()).build();
292293
LocalDate value = LocalDate.now();
293-
MockResult result = MockResult.builder().rowMetadata(metadata)
294+
MockResult result = MockResult.builder()
294295
.row(MockRow.builder().identified(0, LocalDate.class, value).build()).build();
295296

296297
StatementRecorder recorder = StatementRecorder.newInstance();

0 commit comments

Comments
 (0)