Skip to content

Commit d7b9fb3

Browse files
devin-ai-integration[bot]backpaper0
devin-ai-integration[bot]
and
backpaper0
committed
Address PR feedback: remove unnecessary comments and consolidate auto-configurations
Co-Authored-By: [email protected] <[email protected]>
1 parent 037728c commit d7b9fb3

File tree

1 file changed

+19
-61
lines changed

1 file changed

+19
-61
lines changed

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

Lines changed: 19 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@
7474
import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
7575

7676
public class DomaAutoConfigurationTest {
77-
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
77+
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
78+
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
79+
DataSourceAutoConfiguration.class));
7880

7981
@Test
8082
public void testAutoRegisteredConfig() {
8183
this.contextRunner
82-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
83-
DataSourceAutoConfiguration.class))
8484
.run(context -> {
8585
Config config = context.getBean(Config.class);
8686
assertThat(config, is(notNullValue()));
@@ -111,8 +111,6 @@ public void testAutoRegisteredConfig() {
111111
public void testConfigWithDomaConfigBuilder() {
112112
this.contextRunner
113113
.withUserConfiguration(ConfigBuilderConfigure.class)
114-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
115-
DataSourceAutoConfiguration.class))
116114
.run(context -> {
117115
Config config = context.getBean(Config.class);
118116
assertThat(config, is(notNullValue()));
@@ -144,8 +142,6 @@ public void testConfigWithDomaConfigBuilder() {
144142
public void testConfigWithConfig() {
145143
this.contextRunner
146144
.withUserConfiguration(ConfigConfigure.class)
147-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
148-
DataSourceAutoConfiguration.class))
149145
.run(context -> {
150146
Config config = context.getBean(Config.class);
151147
assertThat(config, is(notNullValue()));
@@ -177,8 +173,6 @@ public void testConfigWithConfig() {
177173
public void testExceptionTranslationEnabledSpecifyFalse() {
178174
this.contextRunner
179175
.withPropertyValues("doma.exception-translation-enabled=false")
180-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
181-
DataSourceAutoConfiguration.class))
182176
.run(context -> {
183177
assertThrows(NoSuchBeanDefinitionException.class,
184178
() -> context.getBean(PersistenceExceptionTranslator.class));
@@ -189,8 +183,6 @@ public void testExceptionTranslationEnabledSpecifyFalse() {
189183
public void testExceptionTranslationEnabledSpecifyTrue() {
190184
this.contextRunner
191185
.withPropertyValues("doma.exception-translation-enabled=true")
192-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
193-
DataSourceAutoConfiguration.class))
194186
.run(context -> {
195187
PersistenceExceptionTranslator translator = context
196188
.getBean(PersistenceExceptionTranslator.class);
@@ -203,8 +195,6 @@ public void testExceptionTranslationEnabledSpecifyTrue() {
203195
public void testChangeDialect() {
204196
this.contextRunner
205197
.withPropertyValues("doma.dialect=MYSQL")
206-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
207-
DataSourceAutoConfiguration.class))
208198
.run(context -> {
209199
Dialect dialect = context.getBean(Dialect.class);
210200
assertThat(dialect, is(instanceOf(MysqlDialect.class)));
@@ -215,8 +205,6 @@ public void testChangeDialect() {
215205
public void testChangeMaxRows() {
216206
this.contextRunner
217207
.withPropertyValues("doma.max-rows=100")
218-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
219-
DataSourceAutoConfiguration.class))
220208
.run(context -> {
221209
Config config = context.getBean(Config.class);
222210
assertThat(config.getMaxRows(), is(100));
@@ -226,8 +214,6 @@ public void testChangeMaxRows() {
226214
@Test
227215
public void testSQLExceptionTranslator() {
228216
this.contextRunner
229-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
230-
DataSourceAutoConfiguration.class))
231217
.run(context -> {
232218
PersistenceExceptionTranslator translator = context
233219
.getBean(PersistenceExceptionTranslator.class);
@@ -262,8 +248,6 @@ public void testSQLExceptionTranslator() {
262248
@Test
263249
public void testAutoRegisteredCriteriaAPI() {
264250
this.contextRunner
265-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
266-
DataSourceAutoConfiguration.class))
267251
.run(context -> {
268252
Entityql entityql = context.getBean(Entityql.class);
269253
assertNotNull(entityql);
@@ -276,8 +260,6 @@ public void testAutoRegisteredCriteriaAPI() {
276260
public void testCriteriaAPIWithConfig() {
277261
this.contextRunner
278262
.withUserConfiguration(MyCriteriaAPIConfig.class)
279-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
280-
DataSourceAutoConfiguration.class))
281263
.run(context -> {
282264
Map<String, Entityql> entityqlBeans = context.getBeansOfType(Entityql.class);
283265
assertEquals(1, entityqlBeans.size());
@@ -294,8 +276,6 @@ public void testDialectByDataSourceUrl() {
294276
.withPropertyValues(
295277
"spring.datasource.url=jdbc:postgresql://localhost:1234/example",
296278
"doma.exception-translation-enabled=false" /* prevent database connections */)
297-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
298-
DataSourceAutoConfiguration.class))
299279
.run(context -> {
300280
Dialect dialect = context.getBean(Dialect.class);
301281
assertThat(dialect, is(instanceOf(PostgresDialect.class)));
@@ -307,8 +287,6 @@ public void testDialectByJdbConnectionDetails() {
307287
this.contextRunner
308288
.withPropertyValues(
309289
"doma.exception-translation-enabled=false"/* prevent database connections */)
310-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
311-
DataSourceAutoConfiguration.class))
312290
.withBean(JdbcConnectionDetails.class, () -> new JdbcConnectionDetails() {
313291
@Override
314292
public String getUsername() {
@@ -336,8 +314,7 @@ public void testDialectMissingJdbConnectionDetails() {
336314
this.contextRunner
337315
.withPropertyValues(
338316
"doma.exception-translation-enabled=false"/* prevent database connections */)
339-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
340-
DataSourceAutoConfiguration.class))
317+
341318
.withBean(DataSource.class, SimpleDriverDataSource::new)
342319
.run(context -> {
343320
assertThat(context.getStartupFailure().getMessage(), containsString(
@@ -351,8 +328,7 @@ public void testDialectMissingJdbConnectionDetailsExplicitDialect() {
351328
.withPropertyValues(
352329
"doma.dialect=POSTGRES",
353330
"doma.exception-translation-enabled=false"/* prevent database connections */)
354-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
355-
DataSourceAutoConfiguration.class))
331+
356332
.withBean(DataSource.class, SimpleDriverDataSource::new)
357333
.run(context -> {
358334
Dialect dialect = context.getBean(Dialect.class);
@@ -366,8 +342,7 @@ public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
366342
.withPropertyValues(
367343
"spring.datasource.url=jdbc:h2:mem:example",
368344
"doma.dialect=POSTGRES")
369-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
370-
DataSourceAutoConfiguration.class))
345+
371346
.run(context -> {
372347
Dialect dialect = context.getBean(Dialect.class);
373348
assertThat(dialect, is(instanceOf(PostgresDialect.class)));
@@ -378,8 +353,7 @@ public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
378353
public void testJdbcLoggerSlf4J() {
379354
this.contextRunner
380355
.withPropertyValues("doma.jdbcLogger=SLF4J")
381-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
382-
DataSourceAutoConfiguration.class))
356+
383357
.run(context -> {
384358
JdbcLogger jdbcLogger = context.getBean(JdbcLogger.class);
385359
assertThat(jdbcLogger.getClass().getSimpleName(), is("Slf4jJdbcLogger"));
@@ -389,8 +363,7 @@ public void testJdbcLoggerSlf4J() {
389363
@Test
390364
public void testAutoRegisteredQueryDsl() {
391365
this.contextRunner
392-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
393-
DataSourceAutoConfiguration.class))
366+
394367
.run(context -> {
395368
QueryDsl queryDsl = context.getBean(QueryDsl.class);
396369
assertNotNull(queryDsl);
@@ -401,8 +374,7 @@ public void testAutoRegisteredQueryDsl() {
401374
public void testQueryDslWithConfig() {
402375
this.contextRunner
403376
.withUserConfiguration(MyQueryDslConfig.class)
404-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
405-
DataSourceAutoConfiguration.class))
377+
406378
.run(context -> {
407379
Map<String, QueryDsl> queryDslBeans = context.getBeansOfType(QueryDsl.class);
408380
assertEquals(1, queryDslBeans.size());
@@ -414,8 +386,7 @@ public void testQueryDslWithConfig() {
414386
public void testThrowExceptionIfDuplicateColumn() {
415387
this.contextRunner
416388
.withPropertyValues("doma.throw-exception-if-duplicate-column=true")
417-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
418-
DataSourceAutoConfiguration.class))
389+
419390
.run(context -> {
420391
Config config = context.getBean(Config.class);
421392
assertThat(config.getDuplicateColumnHandler(),
@@ -429,8 +400,7 @@ public void testCustomizeShouldRemoveBlockComment() {
429400
when(predicate.test(anyString())).thenReturn(true);
430401

431402
this.contextRunner
432-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
433-
DataSourceAutoConfiguration.class))
403+
434404
.withBean("shouldRemoveBlockComment", Predicate.class, () -> predicate)
435405
.run(context -> {
436406
Config config = context.getBean(Config.class);
@@ -450,8 +420,7 @@ public void testCustomizeShouldRemoveLineComment() {
450420
when(predicate.test(anyString())).thenReturn(true);
451421

452422
this.contextRunner
453-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
454-
DataSourceAutoConfiguration.class))
423+
455424
.withBean("shouldRemoveLineComment", Predicate.class, () -> predicate)
456425
.run(context -> {
457426
Config config = context.getBean(Config.class);
@@ -471,8 +440,7 @@ public void testAnonymousPredicateAreNotAffected() {
471440
when(predicate.test(anyString())).thenReturn(true);
472441

473442
this.contextRunner
474-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
475-
DataSourceAutoConfiguration.class))
443+
476444
.withBean(Predicate.class, () -> predicate)
477445
.run(context -> {
478446
Config config = context.getBean(Config.class);
@@ -488,8 +456,7 @@ public void testAnonymousPredicateAreNotAffected() {
488456
@Test
489457
public void testShouldRemoveBlankLinesDefaultValue() {
490458
this.contextRunner
491-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
492-
DataSourceAutoConfiguration.class))
459+
493460
.run(context -> {
494461
Config config = context.getBean(Config.class);
495462
assertFalse(config.getSqlBuilderSettings().shouldRemoveBlankLines());
@@ -500,8 +467,7 @@ public void testShouldRemoveBlankLinesDefaultValue() {
500467
public void testShouldRemoveBlankLinesChangedValue() {
501468
this.contextRunner
502469
.withPropertyValues("doma.sql-builder-settings.should-remove-blank-lines=true")
503-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
504-
DataSourceAutoConfiguration.class))
470+
505471
.run(context -> {
506472
Config config = context.getBean(Config.class);
507473
assertTrue(config.getSqlBuilderSettings().shouldRemoveBlankLines());
@@ -511,8 +477,7 @@ public void testShouldRemoveBlankLinesChangedValue() {
511477
@Test
512478
public void testShouldRequireInListPaddingDefaultValue() {
513479
this.contextRunner
514-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
515-
DataSourceAutoConfiguration.class))
480+
516481
.run(context -> {
517482
Config config = context.getBean(Config.class);
518483
assertFalse(config.getSqlBuilderSettings().shouldRequireInListPadding());
@@ -523,8 +488,7 @@ public void testShouldRequireInListPaddingDefaultValue() {
523488
public void testShouldRequireInListPaddingChangedValue() {
524489
this.contextRunner
525490
.withPropertyValues("doma.sql-builder-settings.should-require-in-list-padding=true")
526-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
527-
DataSourceAutoConfiguration.class))
491+
528492
.run(context -> {
529493
Config config = context.getBean(Config.class);
530494
assertTrue(config.getSqlBuilderSettings().shouldRequireInListPadding());
@@ -534,8 +498,7 @@ public void testShouldRequireInListPaddingChangedValue() {
534498
@Test
535499
public void testStatisticManagerDefaultValue() {
536500
this.contextRunner
537-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
538-
DataSourceAutoConfiguration.class))
501+
539502
.run(context -> {
540503
Config config = context.getBean(Config.class);
541504
assertFalse(config.getStatisticManager().isEnabled());
@@ -546,16 +509,13 @@ public void testStatisticManagerDefaultValue() {
546509
public void testStatisticManagerChangedValue() {
547510
this.contextRunner
548511
.withPropertyValues("doma.statistic-manager.enabled=true")
549-
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
550-
DataSourceAutoConfiguration.class))
512+
551513
.run(context -> {
552514
Config config = context.getBean(Config.class);
553515
assertTrue(config.getStatisticManager().isEnabled());
554516
});
555517
}
556518

557-
// tearDown method removed - no longer needed with ApplicationContextRunner
558-
559519
@Configuration
560520
public static class ConfigBuilderConfigure {
561521
static DuplicateColumnHandler testDuplicateColumnHandler = new DuplicateColumnHandler() {
@@ -649,8 +609,6 @@ public StatisticManager getStatisticManager() {
649609
static class TestEntityListenerProvider implements EntityListenerProvider {
650610
}
651611

652-
// EnvironmentTestUtils inner class removed - no longer needed with ApplicationContextRunner
653-
654612
@Configuration
655613
public static class MyCriteriaAPIConfig {
656614

0 commit comments

Comments
 (0)