Skip to content

Commit 696a60e

Browse files
committed
Full auto-configure transaction management in slice tests
Closes gh-49716
1 parent 4b37ecb commit 696a60e

13 files changed

+61
-0
lines changed

spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/mongo/DataMongoTestIntegrationTests.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2525
import org.springframework.beans.factory.annotation.Autowired;
26+
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
27+
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration;
2628
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
2729
import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration;
2830
import org.springframework.boot.testsupport.container.TestImage;
@@ -78,4 +80,11 @@ void serviceConnectionAutoConfigurationWasImported() {
7880
assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class));
7981
}
8082

83+
@Test
84+
void transactionAutoConfigurationWasImported() {
85+
assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class));
86+
assertThat(this.applicationContext)
87+
.has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class));
88+
}
89+
8190
}

spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
2525
import org.springframework.beans.factory.annotation.Autowired;
26+
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
27+
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration;
2628
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
2729
import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration;
2830
import org.springframework.boot.testsupport.container.TestImage;
@@ -80,4 +82,11 @@ void serviceConnectionAutoConfigurationWasImported() {
8082
assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class));
8183
}
8284

85+
@Test
86+
void transactionAutoConfigurationWasImported() {
87+
assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class));
88+
assertThat(this.applicationContext)
89+
.has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class));
90+
}
91+
8392
}

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.data.jdbc.AutoConfigureDataJdbc.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration
88
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration
99
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration
1010
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
11+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
1112
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfigura
66
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration
77
org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration
88
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
9+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
910
org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration
1011
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.data.neo4j.AutoConfigureDataNeo4j.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveDataAutoConfigura
55
org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveRepositoriesAutoConfiguration
66
org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration
77
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
8+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
89
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.data.r2dbc.AutoConfigureDataR2dbc.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration
77
org.springframework.boot.autoconfigure.r2dbc.R2dbcTransactionManagerAutoConfiguration
88
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration
99
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
10+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
1011
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureJdbc.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration
77
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration
88
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration
99
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
10+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
1011
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.jooq.AutoConfigureJooq.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration
66
org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration
77
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration
88
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
9+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
910
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureDataJpa.imports

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration
99
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
1010
org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration
1111
org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
12+
org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration
1213
optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/jdbc/DataJdbcTestIntegrationTests.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
27+
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
28+
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizationAutoConfiguration;
2729
import org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration;
2830
import org.springframework.context.ApplicationContext;
2931
import org.springframework.jdbc.core.JdbcTemplate;
@@ -89,4 +91,11 @@ void serviceConnectionAutoConfigurationWasImported() {
8991
assertThat(this.applicationContext).has(importedAutoConfiguration(ServiceConnectionAutoConfiguration.class));
9092
}
9193

94+
@Test
95+
void transactionAutoConfigurationWasImported() {
96+
assertThat(this.applicationContext).has(importedAutoConfiguration(TransactionAutoConfiguration.class));
97+
assertThat(this.applicationContext)
98+
.has(importedAutoConfiguration(TransactionManagerCustomizationAutoConfiguration.class));
99+
}
100+
92101
}

0 commit comments

Comments
 (0)