Skip to content

Migrate to JUnit 5 #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 19, 2025
Merged

Migrate to JUnit 5 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fcba2a2
Migrate to JUnit 5 (#292)
devin-ai-integration[bot] May 18, 2025
0dd3896
Fix test class visibility and make getCreatedBy() method public
devin-ai-integration[bot] May 18, 2025
a8d0cd2
Make entity classes and handlers public to fix Doma compilation errors
devin-ai-integration[bot] May 18, 2025
f796d82
Make all test methods package-private
devin-ai-integration[bot] May 18, 2025
b9db6e5
Make DomaApplicationListenerTest and DomaEventEntityListenerTest pack…
devin-ai-integration[bot] May 18, 2025
e7125bb
Make nested test classes public to fix Doma entity requirements
devin-ai-integration[bot] May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions doma-spring-boot-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
58 changes: 29 additions & 29 deletions ...configure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;

public class DomaAutoConfigurationTest {
class DomaAutoConfigurationTest {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(DomaAutoConfiguration.class,
DataSourceAutoConfiguration.class));

@Test
public void testAutoRegisteredConfig() {
void testAutoRegisteredConfig() {
this.contextRunner
.run(context -> {
Config config = context.getBean(Config.class);
Expand Down Expand Up @@ -104,7 +104,7 @@ public void testAutoRegisteredConfig() {
}

@Test
public void testConfigWithDomaConfigBuilder() {
void testConfigWithDomaConfigBuilder() {
this.contextRunner
.withUserConfiguration(ConfigBuilderConfigure.class)
.run(context -> {
Expand Down Expand Up @@ -135,7 +135,7 @@ public void testConfigWithDomaConfigBuilder() {
}

@Test
public void testConfigWithConfig() {
void testConfigWithConfig() {
this.contextRunner
.withUserConfiguration(ConfigConfigure.class)
.run(context -> {
Expand Down Expand Up @@ -166,7 +166,7 @@ public void testConfigWithConfig() {
}

@Test
public void testExceptionTranslationEnabledSpecifyFalse() {
void testExceptionTranslationEnabledSpecifyFalse() {
this.contextRunner
.withPropertyValues("doma.exception-translation-enabled=false")
.run(context -> {
Expand All @@ -176,7 +176,7 @@ public void testExceptionTranslationEnabledSpecifyFalse() {
}

@Test
public void testExceptionTranslationEnabledSpecifyTrue() {
void testExceptionTranslationEnabledSpecifyTrue() {
this.contextRunner
.withPropertyValues("doma.exception-translation-enabled=true")
.run(context -> {
Expand All @@ -188,7 +188,7 @@ public void testExceptionTranslationEnabledSpecifyTrue() {
}

@Test
public void testChangeDialect() {
void testChangeDialect() {
this.contextRunner
.withPropertyValues("doma.dialect=MYSQL")
.run(context -> {
Expand All @@ -198,7 +198,7 @@ public void testChangeDialect() {
}

@Test
public void testChangeMaxRows() {
void testChangeMaxRows() {
this.contextRunner
.withPropertyValues("doma.max-rows=100")
.run(context -> {
Expand All @@ -208,7 +208,7 @@ public void testChangeMaxRows() {
}

@Test
public void testSQLExceptionTranslator() {
void testSQLExceptionTranslator() {
this.contextRunner
.run(context -> {
PersistenceExceptionTranslator translator = context
Expand Down Expand Up @@ -242,7 +242,7 @@ public void testSQLExceptionTranslator() {
}

@Test
public void testAutoRegisteredCriteriaAPI() {
void testAutoRegisteredCriteriaAPI() {
this.contextRunner
.run(context -> {
Entityql entityql = context.getBean(Entityql.class);
Expand All @@ -253,7 +253,7 @@ public void testAutoRegisteredCriteriaAPI() {
}

@Test
public void testCriteriaAPIWithConfig() {
void testCriteriaAPIWithConfig() {
this.contextRunner
.withUserConfiguration(MyCriteriaAPIConfig.class)
.run(context -> {
Expand All @@ -267,7 +267,7 @@ public void testCriteriaAPIWithConfig() {
}

@Test
public void testDialectByDataSourceUrl() {
void testDialectByDataSourceUrl() {
this.contextRunner
.withPropertyValues(
"spring.datasource.url=jdbc:postgresql://localhost:1234/example",
Expand All @@ -279,7 +279,7 @@ public void testDialectByDataSourceUrl() {
}

@Test
public void testDialectByJdbConnectionDetails() {
void testDialectByJdbConnectionDetails() {
this.contextRunner
.withPropertyValues(
"doma.exception-translation-enabled=false"/* prevent database connections */)
Expand All @@ -306,7 +306,7 @@ public String getJdbcUrl() {
}

@Test
public void testDialectMissingJdbConnectionDetails() {
void testDialectMissingJdbConnectionDetails() {
this.contextRunner
.withPropertyValues(
"doma.exception-translation-enabled=false"/* prevent database connections */)
Expand All @@ -319,7 +319,7 @@ public void testDialectMissingJdbConnectionDetails() {
}

@Test
public void testDialectMissingJdbConnectionDetailsExplicitDialect() {
void testDialectMissingJdbConnectionDetailsExplicitDialect() {
this.contextRunner
.withPropertyValues(
"doma.dialect=POSTGRES",
Expand All @@ -333,7 +333,7 @@ public void testDialectMissingJdbConnectionDetailsExplicitDialect() {
}

@Test
public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
this.contextRunner
.withPropertyValues(
"spring.datasource.url=jdbc:h2:mem:example",
Expand All @@ -346,7 +346,7 @@ public void testDialectByDomaPropertiesIgnoreDataSourceUrl() {
}

@Test
public void testJdbcLoggerSlf4J() {
void testJdbcLoggerSlf4J() {
this.contextRunner
.withPropertyValues("doma.jdbcLogger=SLF4J")

Expand All @@ -357,7 +357,7 @@ public void testJdbcLoggerSlf4J() {
}

@Test
public void testAutoRegisteredQueryDsl() {
void testAutoRegisteredQueryDsl() {
this.contextRunner

.run(context -> {
Expand All @@ -367,7 +367,7 @@ public void testAutoRegisteredQueryDsl() {
}

@Test
public void testQueryDslWithConfig() {
void testQueryDslWithConfig() {
this.contextRunner
.withUserConfiguration(MyQueryDslConfig.class)

Expand All @@ -379,7 +379,7 @@ public void testQueryDslWithConfig() {
}

@Test
public void testThrowExceptionIfDuplicateColumn() {
void testThrowExceptionIfDuplicateColumn() {
this.contextRunner
.withPropertyValues("doma.throw-exception-if-duplicate-column=true")

Expand All @@ -391,7 +391,7 @@ public void testThrowExceptionIfDuplicateColumn() {
}

@Test
public void testCustomizeShouldRemoveBlockComment() {
void testCustomizeShouldRemoveBlockComment() {
Predicate<String> predicate = mock(Predicate.class);
when(predicate.test(anyString())).thenReturn(true);

Expand All @@ -411,7 +411,7 @@ public void testCustomizeShouldRemoveBlockComment() {
}

@Test
public void testCustomizeShouldRemoveLineComment() {
void testCustomizeShouldRemoveLineComment() {
Predicate<String> predicate = mock(Predicate.class);
when(predicate.test(anyString())).thenReturn(true);

Expand All @@ -431,7 +431,7 @@ public void testCustomizeShouldRemoveLineComment() {
}

@Test
public void testAnonymousPredicateAreNotAffected() {
void testAnonymousPredicateAreNotAffected() {
Predicate<String> predicate = mock(Predicate.class);
when(predicate.test(anyString())).thenReturn(true);

Expand All @@ -450,7 +450,7 @@ public void testAnonymousPredicateAreNotAffected() {
}

@Test
public void testShouldRemoveBlankLinesDefaultValue() {
void testShouldRemoveBlankLinesDefaultValue() {
this.contextRunner

.run(context -> {
Expand All @@ -460,7 +460,7 @@ public void testShouldRemoveBlankLinesDefaultValue() {
}

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

Expand All @@ -471,7 +471,7 @@ public void testShouldRemoveBlankLinesChangedValue() {
}

@Test
public void testShouldRequireInListPaddingDefaultValue() {
void testShouldRequireInListPaddingDefaultValue() {
this.contextRunner

.run(context -> {
Expand All @@ -481,7 +481,7 @@ public void testShouldRequireInListPaddingDefaultValue() {
}

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

Expand All @@ -492,7 +492,7 @@ public void testShouldRequireInListPaddingChangedValue() {
}

@Test
public void testStatisticManagerDefaultValue() {
void testStatisticManagerDefaultValue() {
this.contextRunner

.run(context -> {
Expand All @@ -502,7 +502,7 @@ public void testStatisticManagerDefaultValue() {
}

@Test
public void testStatisticManagerChangedValue() {
void testStatisticManagerChangedValue() {
this.contextRunner
.withPropertyValues("doma.statistic-manager.enabled=true")

Expand Down
10 changes: 0 additions & 10 deletions doma-spring-boot-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,11 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
Loading