Skip to content

Commit 9485c52

Browse files
mp911demp911de
committed
#383 - Polishing.
Use more concise assertions.
1 parent 5870877 commit 9485c52

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void shouldMapSomeNestedCriteria() {
8686

8787
BoundCondition bindings = map(criteria);
8888

89-
assertThat(bindings.getCondition().toString()).isEqualTo("((person.name = ?[$1]))");
89+
assertThat(bindings.getCondition()).hasToString("((person.name = ?[$1]))");
9090
}
9191

9292
@Test // gh-289
@@ -106,7 +106,7 @@ public void shouldMapNestedGroup() {
106106

107107
BoundCondition bindings = map(criteria);
108108

109-
assertThat(bindings.getCondition().toString()).isEqualTo(
109+
assertThat(bindings.getCondition()).hasToString(
110110
"(person.name = ?[$1]) AND (person.name = ?[$2] OR person.age < ?[$3] OR (person.name != ?[$4] AND person.age > ?[$5]))");
111111
}
112112

@@ -122,8 +122,8 @@ public void shouldMapFrom() {
122122

123123
BoundCondition bindings = map(criteria);
124124

125-
assertThat(bindings.getCondition().toString())
126-
.isEqualTo("person.name = ?[$1] AND (person.name = ?[$2] OR person.age < ?[$3])");
125+
assertThat(bindings.getCondition())
126+
.hasToString("person.name = ?[$1] AND (person.name = ?[$2] OR person.age < ?[$3])");
127127
}
128128

129129
@Test // gh-383
@@ -132,14 +132,14 @@ public void shouldMapFromConcat() {
132132
Criteria criteria = Criteria.from(Criteria.where("name").is("Foo"), Criteria.where("name").is("Bar") //
133133
.or("age").lessThan(49));
134134

135-
assertThat(map(criteria).getCondition().toString())
136-
.isEqualTo("(person.name = ?[$1] AND (person.name = ?[$2] OR person.age < ?[$3]))");
135+
assertThat(map(criteria).getCondition())
136+
.hasToString("(person.name = ?[$1] AND (person.name = ?[$2] OR person.age < ?[$3]))");
137137

138138
criteria = Criteria.from(Criteria.where("name").is("Foo"), Criteria.where("name").is("Bar") //
139139
.or("age").lessThan(49), Criteria.where("foo").is("bar"));
140140

141-
assertThat(map(criteria).getCondition().toString())
142-
.isEqualTo("(person.name = ?[$1] AND (person.name = ?[$2] OR person.age < ?[$3]) AND (person.foo = ?[$4]))");
141+
assertThat(map(criteria).getCondition())
142+
.hasToString("(person.name = ?[$1] AND (person.name = ?[$2] OR person.age < ?[$3]) AND (person.foo = ?[$4]))");
143143
}
144144

145145
@Test // gh-64
@@ -149,7 +149,7 @@ public void shouldMapSimpleCriteria() {
149149

150150
BoundCondition bindings = map(criteria);
151151

152-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name = ?[$1]");
152+
assertThat(bindings.getCondition()).hasToString("person.name = ?[$1]");
153153

154154
bindings.getBindings().apply(bindTarget);
155155
verify(bindTarget).bind(0, "foo");
@@ -164,7 +164,7 @@ public void shouldMapSimpleCriteriaWithoutEntity() {
164164

165165
BoundCondition bindings = mapper.getMappedObject(markers.create(), criteria, Table.create("person"), null);
166166

167-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name = ?[$1]");
167+
assertThat(bindings.getCondition()).hasToString("person.name = ?[$1]");
168168

169169
bindings.getBindings().apply(bindTarget);
170170
verify(bindTarget).bind(0, "foo");
@@ -220,7 +220,7 @@ public void shouldMapSimpleNullableCriteria() {
220220

221221
BoundCondition bindings = map(criteria);
222222

223-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name = ?[$1]");
223+
assertThat(bindings.getCondition()).hasToString("person.name = ?[$1]");
224224

225225
bindings.getBindings().apply(bindTarget);
226226
verify(bindTarget).bindNull(0, Integer.class);
@@ -233,7 +233,7 @@ public void shouldConsiderColumnName() {
233233

234234
BoundCondition bindings = map(criteria);
235235

236-
assertThat(bindings.getCondition().toString()).isEqualTo("person.another_name = ?[$1]");
236+
assertThat(bindings.getCondition()).hasToString("person.another_name = ?[$1]");
237237
}
238238

239239
@Test // gh-64
@@ -243,7 +243,7 @@ public void shouldMapAndCriteria() {
243243

244244
BoundCondition bindings = map(criteria);
245245

246-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name = ?[$1] AND person.bar = ?[$2]");
246+
assertThat(bindings.getCondition()).hasToString("person.name = ?[$1] AND person.bar = ?[$2]");
247247

248248
bindings.getBindings().apply(bindTarget);
249249
verify(bindTarget).bind(0, "foo");
@@ -257,7 +257,7 @@ public void shouldMapOrCriteria() {
257257

258258
BoundCondition bindings = map(criteria);
259259

260-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name = ?[$1] OR person.bar = ?[$2]");
260+
assertThat(bindings.getCondition()).hasToString("person.name = ?[$1] OR person.bar = ?[$2]");
261261
}
262262

263263
@Test // gh-64
@@ -270,7 +270,7 @@ public void shouldMapAndOrCriteria() {
270270

271271
BoundCondition bindings = map(criteria);
272272

273-
assertThat(bindings.getCondition().toString()).isEqualTo(
273+
assertThat(bindings.getCondition()).hasToString(
274274
"person.name = ?[$1] AND person.name IS NOT NULL OR person.bar = ?[$2] AND person.anotherOne = ?[$3]");
275275
}
276276

@@ -281,7 +281,7 @@ public void shouldMapNeq() {
281281

282282
BoundCondition bindings = map(criteria);
283283

284-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name != ?[$1]");
284+
assertThat(bindings.getCondition()).hasToString("person.name != ?[$1]");
285285
}
286286

287287
@Test // gh-64
@@ -291,7 +291,7 @@ public void shouldMapIsNull() {
291291

292292
BoundCondition bindings = map(criteria);
293293

294-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name IS NULL");
294+
assertThat(bindings.getCondition()).hasToString("person.name IS NULL");
295295
}
296296

297297
@Test // gh-64
@@ -301,7 +301,7 @@ public void shouldMapIsNotNull() {
301301

302302
BoundCondition bindings = map(criteria);
303303

304-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name IS NOT NULL");
304+
assertThat(bindings.getCondition()).hasToString("person.name IS NOT NULL");
305305
}
306306

307307
@Test // gh-64
@@ -311,7 +311,7 @@ public void shouldMapIsIn() {
311311

312312
BoundCondition bindings = map(criteria);
313313

314-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name IN (?[$1], ?[$2], ?[$3])");
314+
assertThat(bindings.getCondition()).hasToString("person.name IN (?[$1], ?[$2], ?[$3])");
315315
}
316316

317317
@Test // gh-64, gh-177
@@ -321,7 +321,7 @@ public void shouldMapIsNotIn() {
321321

322322
BoundCondition bindings = map(criteria);
323323

324-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name NOT IN (?[$1], ?[$2], ?[$3])");
324+
assertThat(bindings.getCondition()).hasToString("person.name NOT IN (?[$1], ?[$2], ?[$3])");
325325
}
326326

327327
@Test // gh-64
@@ -331,7 +331,7 @@ public void shouldMapIsGt() {
331331

332332
BoundCondition bindings = map(criteria);
333333

334-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name > ?[$1]");
334+
assertThat(bindings.getCondition()).hasToString("person.name > ?[$1]");
335335
}
336336

337337
@Test // gh-64
@@ -341,7 +341,7 @@ public void shouldMapIsGte() {
341341

342342
BoundCondition bindings = map(criteria);
343343

344-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name >= ?[$1]");
344+
assertThat(bindings.getCondition()).hasToString("person.name >= ?[$1]");
345345
}
346346

347347
@Test // gh-64
@@ -351,7 +351,7 @@ public void shouldMapIsLt() {
351351

352352
BoundCondition bindings = map(criteria);
353353

354-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name < ?[$1]");
354+
assertThat(bindings.getCondition()).hasToString("person.name < ?[$1]");
355355
}
356356

357357
@Test // gh-64
@@ -361,7 +361,7 @@ public void shouldMapIsLte() {
361361

362362
BoundCondition bindings = map(criteria);
363363

364-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name <= ?[$1]");
364+
assertThat(bindings.getCondition()).hasToString("person.name <= ?[$1]");
365365
}
366366

367367
@Test // gh-64
@@ -371,7 +371,7 @@ public void shouldMapIsLike() {
371371

372372
BoundCondition bindings = map(criteria);
373373

374-
assertThat(bindings.getCondition().toString()).isEqualTo("person.name LIKE ?[$1]");
374+
assertThat(bindings.getCondition()).hasToString("person.name LIKE ?[$1]");
375375
}
376376

377377
@Test // gh-64
@@ -401,7 +401,7 @@ public void mapQueryForPropertyPathInPrimitiveShouldFallBackToColumnName() {
401401

402402
BoundCondition bindings = map(criteria);
403403

404-
assertThat(bindings.getCondition().toString()).isEqualTo("person.alternative_name = ?[$1]");
404+
assertThat(bindings.getCondition()).hasToString("person.alternative_name = ?[$1]");
405405
}
406406

407407
private BoundCondition map(Criteria criteria) {

0 commit comments

Comments
 (0)