Skip to content

Commit c7f2b77

Browse files
jeffgbutlerjeffgbutler
committed
Better JUnit 5 Usage
1 parent d75e4b9 commit c7f2b77

File tree

11 files changed

+719
-692
lines changed

11 files changed

+719
-692
lines changed

‎src/test/java/examples/animal/data/AnimalDataTest.java

Lines changed: 336 additions & 317 deletions
Large diffs are not rendered by default.

‎src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapperTest.java

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static examples.generated.always.mybatis.GeneratedAlwaysDynamicSqlSupport.*;
1919
import static org.assertj.core.api.Assertions.assertThat;
20+
import static org.junit.jupiter.api.Assertions.assertAll;
2021
import static org.mybatis.dynamic.sql.SqlBuilder.*;
2122

2223
import java.io.InputStream;
@@ -35,7 +36,6 @@
3536
import org.apache.ibatis.session.SqlSessionFactory;
3637
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
3738
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
38-
import org.assertj.core.api.SoftAssertions;
3939
import org.junit.jupiter.api.BeforeEach;
4040
import org.junit.jupiter.api.Test;
4141
import org.junit.platform.runner.JUnitPlatform;
@@ -115,10 +115,10 @@ public void testInsert() {
115115

116116
int rows = mapper.insert(buildInsert(record));
117117

118-
SoftAssertions.assertSoftly(softly -> {
119-
softly.assertThat(rows).isEqualTo(1);
120-
softly.assertThat(record.getFullName()).isEqualTo("Joe Jones");
121-
});
118+
assertAll(
119+
() -> assertThat(rows).isEqualTo(1),
120+
() -> assertThat(record.getFullName()).isEqualTo("Joe Jones")
121+
);
122122
}
123123
}
124124

@@ -140,10 +140,12 @@ public void testBatchInsertWithList() {
140140

141141
session.commit();
142142

143-
assertThat(records.get(0).getFullName()).isEqualTo("George Jetson");
144-
assertThat(records.get(1).getFullName()).isEqualTo("Jane Jetson");
145-
assertThat(records.get(2).getFullName()).isEqualTo("Judy Jetson");
146-
assertThat(records.get(3).getFullName()).isEqualTo("Elroy Jetson");
143+
assertAll(
144+
() -> assertThat(records.get(0).getFullName()).isEqualTo("George Jetson"),
145+
() -> assertThat(records.get(1).getFullName()).isEqualTo("Jane Jetson"),
146+
() -> assertThat(records.get(2).getFullName()).isEqualTo("Judy Jetson"),
147+
() -> assertThat(records.get(3).getFullName()).isEqualTo("Elroy Jetson")
148+
);
147149
}
148150
}
149151

@@ -174,8 +176,10 @@ public void testBatchInsertWithArray() {
174176

175177
session.commit();
176178

177-
assertThat(record1.getFullName()).isEqualTo("George Jetson");
178-
assertThat(record2.getFullName()).isEqualTo("Jane Jetson");
179+
assertAll(
180+
() -> assertThat(record1.getFullName()).isEqualTo("George Jetson"),
181+
() -> assertThat(record2.getFullName()).isEqualTo("Jane Jetson")
182+
);
179183
}
180184
}
181185

@@ -219,10 +223,10 @@ public void testInsertSelective() {
219223

220224
int rows = mapper.insert(buildInsertSelectiveStatement(record));
221225

222-
SoftAssertions.assertSoftly(softly -> {
223-
softly.assertThat(rows).isEqualTo(1);
224-
softly.assertThat(record.getFullName()).isEqualTo("Joe Jones");
225-
});
226+
assertAll(
227+
() -> assertThat(rows).isEqualTo(1),
228+
() -> assertThat(record.getFullName()).isEqualTo("Joe Jones")
229+
);
226230
}
227231
}
228232

@@ -235,18 +239,16 @@ public void testUpdateByPrimaryKey() {
235239
record.setFirstName("Joe");
236240
record.setLastName("Jones");
237241

238-
SoftAssertions.assertSoftly(softly -> {
239-
int rows = mapper.insert(buildInsert(record));
240-
softly.assertThat(rows).isEqualTo(1);
241-
softly.assertThat(record.getFullName()).isEqualTo("Joe Jones");
242+
int rows = mapper.insert(buildInsert(record));
243+
assertThat(rows).isEqualTo(1);
244+
assertThat(record.getFullName()).isEqualTo("Joe Jones");
242245

243-
record.setLastName("Smith");
244-
rows = mapper.update(buildUpdateByPrimaryKeyStatement(record));
245-
softly.assertThat(rows).isEqualTo(1);
246+
record.setLastName("Smith");
247+
rows = mapper.update(buildUpdateByPrimaryKeyStatement(record));
248+
assertThat(rows).isEqualTo(1);
246249

247-
GeneratedAlwaysRecord newRecord = mapper.selectByPrimaryKey(selectByPrimaryKey(100));
248-
softly.assertThat(newRecord.getFullName()).isEqualTo("Joe Smith");
249-
});
250+
GeneratedAlwaysRecord newRecord = mapper.selectByPrimaryKey(selectByPrimaryKey(100));
251+
assertThat(newRecord.getFullName()).isEqualTo("Joe Smith");
250252
}
251253
}
252254

@@ -272,12 +274,12 @@ public void testUpdateByExampleSelective() {
272274
.render(RenderingStrategy.MYBATIS3);
273275

274276
List<GeneratedAlwaysRecord> records = mapper.selectMany(selectStatement);
275-
SoftAssertions.assertSoftly(softly -> {
276-
softly.assertThat(records.size()).isEqualTo(3);
277-
softly.assertThat(records.get(0).getFullName()).isEqualTo("Fred Jones");
278-
softly.assertThat(records.get(1).getFullName()).isEqualTo("Pebbles Jones");
279-
softly.assertThat(records.get(2).getFullName()).isEqualTo("Wilma Jones");
280-
});
277+
assertAll(
278+
() -> assertThat(records.size()).isEqualTo(3),
279+
() -> assertThat(records.get(0).getFullName()).isEqualTo("Fred Jones"),
280+
() -> assertThat(records.get(1).getFullName()).isEqualTo("Pebbles Jones"),
281+
() -> assertThat(records.get(2).getFullName()).isEqualTo("Wilma Jones")
282+
);
281283
}
282284
}
283285

@@ -300,11 +302,11 @@ public void testUpdateByExample() {
300302
assertThat(rows).isEqualTo(1);
301303

302304
GeneratedAlwaysRecord newRecord = mapper.selectByPrimaryKey(selectByPrimaryKey(100));
303-
SoftAssertions.assertSoftly(softly -> {
304-
softly.assertThat(newRecord.getFirstName()).isEqualTo("Joe");
305-
softly.assertThat(newRecord.getLastName()).isEqualTo("Smith");
306-
softly.assertThat(newRecord.getFullName()).isEqualTo("Joe Smith");
307-
});
305+
assertAll(
306+
() -> assertThat(newRecord.getFirstName()).isEqualTo("Joe"),
307+
() -> assertThat(newRecord.getLastName()).isEqualTo("Smith"),
308+
() -> assertThat(newRecord.getFullName()).isEqualTo("Joe Smith")
309+
);
308310
}
309311
}
310312
}

‎src/test/java/examples/simple/SimpleTableAnnotatedMapperTest.java

Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static examples.simple.SimpleTableDynamicSqlSupport.*;
1919
import static org.assertj.core.api.Assertions.assertThat;
20+
import static org.junit.jupiter.api.Assertions.assertAll;
2021
import static org.mybatis.dynamic.sql.SqlBuilder.*;
2122

2223
import java.io.InputStream;
@@ -35,7 +36,6 @@
3536
import org.apache.ibatis.session.SqlSessionFactory;
3637
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
3738
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
38-
import org.assertj.core.api.SoftAssertions;
3939
import org.junit.jupiter.api.BeforeEach;
4040
import org.junit.jupiter.api.Test;
4141
import org.junit.platform.runner.JUnitPlatform;
@@ -141,11 +141,11 @@ public void testSelectByExampleWithTypeHandler() {
141141
.build()
142142
.execute();
143143

144-
SoftAssertions.assertSoftly(softly -> {
145-
softly.assertThat(rows.size()).isEqualTo(2);
146-
softly.assertThat(rows.get(0).getId()).isEqualTo(3);
147-
softly.assertThat(rows.get(1).getId()).isEqualTo(6);
148-
});
144+
assertAll(
145+
() -> assertThat(rows.size()).isEqualTo(2),
146+
() -> assertThat(rows.get(0).getId()).isEqualTo(3),
147+
() -> assertThat(rows.get(1).getId()).isEqualTo(6)
148+
);
149149
}
150150
}
151151

@@ -159,9 +159,11 @@ public void testFirstNameIn() {
159159
.build()
160160
.execute();
161161

162-
assertThat(rows.size()).isEqualTo(2);
163-
assertThat(rows.get(0).getLastName().getName()).isEqualTo("Flintstone");
164-
assertThat(rows.get(1).getLastName().getName()).isEqualTo("Rubble");
162+
assertAll(
163+
() -> assertThat(rows.size()).isEqualTo(2),
164+
() -> assertThat(rows.get(0).getLastName().getName()).isEqualTo("Flintstone"),
165+
() -> assertThat(rows.get(1).getLastName().getName()).isEqualTo("Rubble")
166+
);
165167
}
166168
}
167169

@@ -232,17 +234,15 @@ public void testUpdateByPrimaryKey() {
232234
record.setEmployed(true);
233235
record.setOccupation("Developer");
234236

235-
SoftAssertions.assertSoftly(softly -> {
236-
int rows = mapper.insert(record);
237-
softly.assertThat(rows).isEqualTo(1);
237+
int rows = mapper.insert(record);
238+
assertThat(rows).isEqualTo(1);
238239

239-
record.setOccupation("Programmer");
240-
rows = mapper.updateByPrimaryKey(record);
241-
softly.assertThat(rows).isEqualTo(1);
240+
record.setOccupation("Programmer");
241+
rows = mapper.updateByPrimaryKey(record);
242+
assertThat(rows).isEqualTo(1);
242243

243-
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
244-
softly.assertThat(newRecord.getOccupation()).isEqualTo("Programmer");
245-
});
244+
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
245+
assertThat(newRecord.getOccupation()).isEqualTo("Programmer");
246246
}
247247
}
248248

@@ -258,20 +258,18 @@ public void testUpdateByPrimaryKeySelective() {
258258
record.setEmployed(true);
259259
record.setOccupation("Developer");
260260

261-
SoftAssertions.assertSoftly(softly -> {
262-
int rows = mapper.insert(record);
263-
softly.assertThat(rows).isEqualTo(1);
261+
int rows = mapper.insert(record);
262+
assertThat(rows).isEqualTo(1);
264263

265-
SimpleTableRecord updateRecord = new SimpleTableRecord();
266-
updateRecord.setId(100);
267-
updateRecord.setOccupation("Programmer");
268-
rows = mapper.updateByPrimaryKeySelective(updateRecord);
269-
softly.assertThat(rows).isEqualTo(1);
264+
SimpleTableRecord updateRecord = new SimpleTableRecord();
265+
updateRecord.setId(100);
266+
updateRecord.setOccupation("Programmer");
267+
rows = mapper.updateByPrimaryKeySelective(updateRecord);
268+
assertThat(rows).isEqualTo(1);
270269

271-
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
272-
softly.assertThat(newRecord.getOccupation()).isEqualTo("Programmer");
273-
softly.assertThat(newRecord.getFirstName()).isEqualTo("Joe");
274-
});
270+
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
271+
assertThat(newRecord.getOccupation()).isEqualTo("Programmer");
272+
assertThat(newRecord.getFirstName()).isEqualTo("Joe");
275273
}
276274
}
277275

@@ -287,25 +285,25 @@ public void testUpdateWithNulls() {
287285
record.setEmployed(true);
288286
record.setOccupation("Developer");
289287

290-
SoftAssertions.assertSoftly(softly -> {
291-
int rows = mapper.insert(record);
292-
softly.assertThat(rows).isEqualTo(1);
288+
int rows = mapper.insert(record);
289+
assertThat(rows).isEqualTo(1);
293290

294-
UpdateStatementProvider updateStatement = update(simpleTable)
295-
.set(occupation).equalToNull()
296-
.set(employed).equalTo(false)
297-
.where(id, isEqualTo(100))
298-
.build()
299-
.render(RenderingStrategy.MYBATIS3);
291+
UpdateStatementProvider updateStatement = update(simpleTable)
292+
.set(occupation).equalToNull()
293+
.set(employed).equalTo(false)
294+
.where(id, isEqualTo(100))
295+
.build()
296+
.render(RenderingStrategy.MYBATIS3);
300297

301-
rows = mapper.update(updateStatement);
302-
softly.assertThat(rows).isEqualTo(1);
298+
rows = mapper.update(updateStatement);
299+
assertThat(rows).isEqualTo(1);
303300

304-
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
305-
softly.assertThat(newRecord.getOccupation()).isNull();
306-
softly.assertThat(newRecord.getEmployed()).isEqualTo(false);
307-
softly.assertThat(newRecord.getFirstName()).isEqualTo("Joe");
308-
});
301+
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
302+
assertAll(
303+
() -> assertThat(newRecord.getOccupation()).isNull(),
304+
() -> assertThat(newRecord.getEmployed()).isEqualTo(false),
305+
() -> assertThat(newRecord.getFirstName()).isEqualTo("Joe")
306+
);
309307
}
310308
}
311309

@@ -321,22 +319,20 @@ public void testUpdateByExample() {
321319
record.setEmployed(true);
322320
record.setOccupation("Developer");
323321

324-
SoftAssertions.assertSoftly(softly -> {
325-
int rows = mapper.insert(record);
326-
softly.assertThat(rows).isEqualTo(1);
322+
int rows = mapper.insert(record);
323+
assertThat(rows).isEqualTo(1);
327324

328-
record.setOccupation("Programmer");
329-
rows = mapper.updateByExample(record)
330-
.where(id, isEqualTo(100))
331-
.and(firstName, isEqualTo("Joe"))
332-
.build()
333-
.execute();
325+
record.setOccupation("Programmer");
326+
rows = mapper.updateByExample(record)
327+
.where(id, isEqualTo(100))
328+
.and(firstName, isEqualTo("Joe"))
329+
.build()
330+
.execute();
334331

335-
softly.assertThat(rows).isEqualTo(1);
332+
assertThat(rows).isEqualTo(1);
336333

337-
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
338-
softly.assertThat(newRecord.getOccupation()).isEqualTo("Programmer");
339-
});
334+
SimpleTableRecord newRecord = mapper.selectByPrimaryKey(100);
335+
assertThat(newRecord.getOccupation()).isEqualTo("Programmer");
340336
}
341337
}
342338

‎src/test/java/org/mybatis/dynamic/sql/delete/DeleteStatementTest.java

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
*/
1616
package org.mybatis.dynamic.sql.delete;
1717

18+
import static org.assertj.core.api.Assertions.assertThat;
19+
import static org.junit.jupiter.api.Assertions.assertAll;
1820
import static org.mybatis.dynamic.sql.SqlBuilder.*;
1921

2022
import java.sql.JDBCType;
2123

22-
import org.assertj.core.api.SoftAssertions;
2324
import org.junit.jupiter.api.Test;
2425
import org.junit.platform.runner.JUnitPlatform;
2526
import org.junit.runner.RunWith;
@@ -42,15 +43,15 @@ public void testFullStatement() {
4243
.build()
4344
.render(RenderingStrategy.MYBATIS3);
4445

45-
SoftAssertions.assertSoftly(softly -> {
46-
String expectedFullStatement = "delete from foo where (id = #{parameters.p1,jdbcType=INTEGER} and first_name = #{parameters.p2,jdbcType=VARCHAR}) or upper(first_name) like #{parameters.p3,jdbcType=VARCHAR}";
47-
softly.assertThat(deleteStatement.getDeleteStatement()).isEqualTo(expectedFullStatement);
46+
String expectedFullStatement = "delete from foo where (id = #{parameters.p1,jdbcType=INTEGER} and first_name = #{parameters.p2,jdbcType=VARCHAR}) or upper(first_name) like #{parameters.p3,jdbcType=VARCHAR}";
4847

49-
softly.assertThat(deleteStatement.getParameters().size()).isEqualTo(3);
50-
softly.assertThat(deleteStatement.getParameters().get("p1")).isEqualTo(3);
51-
softly.assertThat(deleteStatement.getParameters().get("p2")).isEqualTo("Betty");
52-
softly.assertThat(deleteStatement.getParameters().get("p3")).isEqualTo("%FR%");
53-
});
48+
assertAll(
49+
() -> assertThat(deleteStatement.getDeleteStatement()).isEqualTo(expectedFullStatement),
50+
() -> assertThat(deleteStatement.getParameters().size()).isEqualTo(3),
51+
() -> assertThat(deleteStatement.getParameters().get("p1")).isEqualTo(3),
52+
() -> assertThat(deleteStatement.getParameters().get("p2")).isEqualTo("Betty"),
53+
() -> assertThat(deleteStatement.getParameters().get("p3")).isEqualTo("%FR%")
54+
);
5455
}
5556

5657
@Test
@@ -59,10 +60,11 @@ public void testFullStatementWithoutWhere() {
5960
.build()
6061
.render(RenderingStrategy.MYBATIS3);
6162

62-
SoftAssertions.assertSoftly(softly -> {
63-
String expectedFullStatement = "delete from foo";
64-
softly.assertThat(deleteStatement.getDeleteStatement()).isEqualTo(expectedFullStatement);
65-
softly.assertThat(deleteStatement.getParameters().size()).isEqualTo(0);
66-
});
63+
String expectedFullStatement = "delete from foo";
64+
65+
assertAll(
66+
() -> assertThat(deleteStatement.getDeleteStatement()).isEqualTo(expectedFullStatement),
67+
() -> assertThat(deleteStatement.getParameters().size()).isEqualTo(0)
68+
);
6769
}
6870
}

0 commit comments

Comments
 (0)