Skip to content

Commit 64e373b

Browse files
backpaper0backpaper0
authored
Merge pull request #302 from domaframework/devin/1747535396-junit5-migration
Migrate to JUnit 5
2 parents 59f3e12 + e7125bb commit 64e373b

File tree

19 files changed

+225
-236
lines changed

19 files changed

+225
-236
lines changed

‎doma-spring-boot-autoconfigure/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,8 @@
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>
49-
<groupId>org.junit.vintage</groupId>
50-
<artifactId>junit-vintage-engine</artifactId>
51-
<scope>test</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>junit</groupId>
55-
<artifactId>junit</artifactId>
49+
<groupId>org.junit.jupiter</groupId>
50+
<artifactId>junit-jupiter</artifactId>
5651
<scope>test</scope>
5752
</dependency>
5853
<dependency>

‎doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@
6969
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
7070
import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
7171

72-
public class DomaAutoConfigurationTest {
72+
class DomaAutoConfigurationTest {
7373
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
7474
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
7575
DataSourceAutoConfiguration.class));
7676

7777
@Test
78-
public void testAutoRegisteredConfig() {
78+
void testAutoRegisteredConfig() {
7979
this.contextRunner
8080
.run(context -> {
8181
Config config = context.getBean(Config.class);
@@ -104,7 +104,7 @@ public void testAutoRegisteredConfig() {
104104
}
105105

106106
@Test
107-
public void testConfigWithDomaConfigBuilder() {
107+
void testConfigWithDomaConfigBuilder() {
108108
this.contextRunner
109109
.withUserConfiguration(ConfigBuilderConfigure.class)
110110
.run(context -> {
@@ -135,7 +135,7 @@ public void testConfigWithDomaConfigBuilder() {
135135
}
136136

137137
@Test
138-
public void testConfigWithConfig() {
138+
void testConfigWithConfig() {
139139
this.contextRunner
140140
.withUserConfiguration(ConfigConfigure.class)
141141
.run(context -> {
@@ -166,7 +166,7 @@ public void testConfigWithConfig() {
166166
}
167167

168168
@Test
169-
public void testExceptionTranslationEnabledSpecifyFalse() {
169+
void testExceptionTranslationEnabledSpecifyFalse() {
170170
this.contextRunner
171171
.withPropertyValues("doma.exception-translation-enabled=false")
172172
.run(context -> {
@@ -176,7 +176,7 @@ public void testExceptionTranslationEnabledSpecifyFalse() {
176176
}
177177

178178
@Test
179-
public void testExceptionTranslationEnabledSpecifyTrue() {
179+
void testExceptionTranslationEnabledSpecifyTrue() {
180180
this.contextRunner
181181
.withPropertyValues("doma.exception-translation-enabled=true")
182182
.run(context -> {
@@ -188,7 +188,7 @@ public void testExceptionTranslationEnabledSpecifyTrue() {
188188
}
189189

190190
@Test
191-
public void testChangeDialect() {
191+
void testChangeDialect() {
192192
this.contextRunner
193193
.withPropertyValues("doma.dialect=MYSQL")
194194
.run(context -> {
@@ -198,7 +198,7 @@ public void testChangeDialect() {
198198
}
199199

200200
@Test
201-
public void testChangeMaxRows() {
201+
void testChangeMaxRows() {
202202
this.contextRunner
203203
.withPropertyValues("doma.max-rows=100")
204204
.run(context -> {
@@ -208,7 +208,7 @@ public void testChangeMaxRows() {
208208
}
209209

210210
@Test
211-
public void testSQLExceptionTranslator() {
211+
void testSQLExceptionTranslator() {
212212
this.contextRunner
213213
.run(context -> {
214214
PersistenceExceptionTranslator translator = context
@@ -242,7 +242,7 @@ public void testSQLExceptionTranslator() {
242242
}
243243

244244
@Test
245-
public void testAutoRegisteredCriteriaAPI() {
245+
void testAutoRegisteredCriteriaAPI() {
246246
this.contextRunner
247247
.run(context -> {
248248
Entityql entityql = context.getBean(Entityql.class);
@@ -253,7 +253,7 @@ public void testAutoRegisteredCriteriaAPI() {
253253
}
254254

255255
@Test
256-
public void testCriteriaAPIWithConfig() {
256+
void testCriteriaAPIWithConfig() {
257257
this.contextRunner
258258
.withUserConfiguration(MyCriteriaAPIConfig.class)
259259
.run(context -> {
@@ -267,7 +267,7 @@ public void testCriteriaAPIWithConfig() {
267267
}
268268

269269
@Test
270-
public void testDialectByDataSourceUrl() {
270+
void testDialectByDataSourceUrl() {
271271
this.contextRunner
272272
.withPropertyValues(
273273
"spring.datasource.url=jdbc:postgresql://localhost:1234/example",
@@ -279,7 +279,7 @@ public void testDialectByDataSourceUrl() {
279279
}
280280

281281
@Test
282-
public void testDialectByJdbConnectionDetails() {
282+
void testDialectByJdbConnectionDetails() {
283283
this.contextRunner
284284
.withPropertyValues(
285285
"doma.exception-translation-enabled=false"/* prevent database connections */)
@@ -306,7 +306,7 @@ public String getJdbcUrl() {
306306
}
307307

308308
@Test
309-
public void testDialectMissingJdbConnectionDetails() {
309+
void testDialectMissingJdbConnectionDetails() {
310310
this.contextRunner
311311
.withPropertyValues(
312312
"doma.exception-translation-enabled=false"/* prevent database connections */)
@@ -319,7 +319,7 @@ public void testDialectMissingJdbConnectionDetails() {
319319
}
320320

321321
@Test
322-
public void testDialectMissingJdbConnectionDetailsExplicitDialect() {
322+
void testDialectMissingJdbConnectionDetailsExplicitDialect() {
323323
this.contextRunner
324324
.withPropertyValues(
325325
"doma.dialect=POSTGRES",
@@ -333,7 +333,7 @@ public void testDialectMissingJdbConnectionDetailsExplicitDialect() {
333333
}
334334

335335
@Test
336-
public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
336+
void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
337337
this.contextRunner
338338
.withPropertyValues(
339339
"spring.datasource.url=jdbc:h2:mem:example",
@@ -346,7 +346,7 @@ public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
346346
}
347347

348348
@Test
349-
public void testJdbcLoggerSlf4J() {
349+
void testJdbcLoggerSlf4J() {
350350
this.contextRunner
351351
.withPropertyValues("doma.jdbcLogger=SLF4J")
352352

@@ -357,7 +357,7 @@ public void testJdbcLoggerSlf4J() {
357357
}
358358

359359
@Test
360-
public void testAutoRegisteredQueryDsl() {
360+
void testAutoRegisteredQueryDsl() {
361361
this.contextRunner
362362

363363
.run(context -> {
@@ -367,7 +367,7 @@ public void testAutoRegisteredQueryDsl() {
367367
}
368368

369369
@Test
370-
public void testQueryDslWithConfig() {
370+
void testQueryDslWithConfig() {
371371
this.contextRunner
372372
.withUserConfiguration(MyQueryDslConfig.class)
373373

@@ -379,7 +379,7 @@ public void testQueryDslWithConfig() {
379379
}
380380

381381
@Test
382-
public void testThrowExceptionIfDuplicateColumn() {
382+
void testThrowExceptionIfDuplicateColumn() {
383383
this.contextRunner
384384
.withPropertyValues("doma.throw-exception-if-duplicate-column=true")
385385

@@ -391,7 +391,7 @@ public void testThrowExceptionIfDuplicateColumn() {
391391
}
392392

393393
@Test
394-
public void testCustomizeShouldRemoveBlockComment() {
394+
void testCustomizeShouldRemoveBlockComment() {
395395
Predicate<String> predicate = mock(Predicate.class);
396396
when(predicate.test(anyString())).thenReturn(true);
397397

@@ -411,7 +411,7 @@ public void testCustomizeShouldRemoveBlockComment() {
411411
}
412412

413413
@Test
414-
public void testCustomizeShouldRemoveLineComment() {
414+
void testCustomizeShouldRemoveLineComment() {
415415
Predicate<String> predicate = mock(Predicate.class);
416416
when(predicate.test(anyString())).thenReturn(true);
417417

@@ -431,7 +431,7 @@ public void testCustomizeShouldRemoveLineComment() {
431431
}
432432

433433
@Test
434-
public void testAnonymousPredicateAreNotAffected() {
434+
void testAnonymousPredicateAreNotAffected() {
435435
Predicate<String> predicate = mock(Predicate.class);
436436
when(predicate.test(anyString())).thenReturn(true);
437437

@@ -450,7 +450,7 @@ public void testAnonymousPredicateAreNotAffected() {
450450
}
451451

452452
@Test
453-
public void testShouldRemoveBlankLinesDefaultValue() {
453+
void testShouldRemoveBlankLinesDefaultValue() {
454454
this.contextRunner
455455

456456
.run(context -> {
@@ -460,7 +460,7 @@ public void testShouldRemoveBlankLinesDefaultValue() {
460460
}
461461

462462
@Test
463-
public void testShouldRemoveBlankLinesChangedValue() {
463+
void testShouldRemoveBlankLinesChangedValue() {
464464
this.contextRunner
465465
.withPropertyValues("doma.sql-builder-settings.should-remove-blank-lines=true")
466466

@@ -471,7 +471,7 @@ public void testShouldRemoveBlankLinesChangedValue() {
471471
}
472472

473473
@Test
474-
public void testShouldRequireInListPaddingDefaultValue() {
474+
void testShouldRequireInListPaddingDefaultValue() {
475475
this.contextRunner
476476

477477
.run(context -> {
@@ -481,7 +481,7 @@ public void testShouldRequireInListPaddingDefaultValue() {
481481
}
482482

483483
@Test
484-
public void testShouldRequireInListPaddingChangedValue() {
484+
void testShouldRequireInListPaddingChangedValue() {
485485
this.contextRunner
486486
.withPropertyValues("doma.sql-builder-settings.should-require-in-list-padding=true")
487487

@@ -492,7 +492,7 @@ public void testShouldRequireInListPaddingChangedValue() {
492492
}
493493

494494
@Test
495-
public void testStatisticManagerDefaultValue() {
495+
void testStatisticManagerDefaultValue() {
496496
this.contextRunner
497497

498498
.run(context -> {
@@ -502,7 +502,7 @@ public void testStatisticManagerDefaultValue() {
502502
}
503503

504504
@Test
505-
public void testStatisticManagerChangedValue() {
505+
void testStatisticManagerChangedValue() {
506506
this.contextRunner
507507
.withPropertyValues("doma.statistic-manager.enabled=true")
508508

‎doma-spring-boot-core/pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,11 @@
3434
<groupId>org.springframework.data</groupId>
3535
<artifactId>spring-data-commons</artifactId>
3636
</dependency>
37-
<dependency>
38-
<groupId>junit</groupId>
39-
<artifactId>junit</artifactId>
40-
<scope>test</scope>
41-
</dependency>
4237
<dependency>
4338
<groupId>org.junit.jupiter</groupId>
4439
<artifactId>junit-jupiter</artifactId>
4540
<scope>test</scope>
4641
</dependency>
47-
<dependency>
48-
<groupId>org.junit.vintage</groupId>
49-
<artifactId>junit-vintage-engine</artifactId>
50-
<scope>test</scope>
51-
</dependency>
5242
<dependency>
5343
<groupId>org.assertj</groupId>
5444
<artifactId>assertj-core</artifactId>

0 commit comments

Comments
 (0)