From eb439875266592d62c40ec45640014b69e2d965f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 9 Mar 2026 10:15:30 +0000 Subject: [PATCH] Improve test assertions for bean container enablement Closes gh-49519 --- .../HibernateJpaAutoConfigurationTests.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 204e632492d..5b15d3933e0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -471,6 +471,21 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes }); } + @Test + void beanContainerIsConfiguredByDefault() { + contextRunner().run((context) -> assertThat( + context.getBean(LocalContainerEntityManagerFactoryBean.class).getJpaPropertyMap()) + .containsKey(ManagedBeanSettings.BEAN_CONTAINER)); + } + + @Test + void hibernatePropertiesCustomizerCanDisableBeanContainer() { + contextRunner().withUserConfiguration(DisableBeanContainerConfiguration.class) + .run((context) -> assertThat( + context.getBean(LocalContainerEntityManagerFactoryBean.class).getJpaPropertyMap()) + .doesNotContainKey(ManagedBeanSettings.BEAN_CONTAINER)); + } + @Test @WithResource(name = "city.sql", content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google')") @@ -487,12 +502,6 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes }); } - @Test - void hibernatePropertiesCustomizerCanDisableBeanContainer() { - contextRunner().withUserConfiguration(DisableBeanContainerConfiguration.class) - .run((context) -> assertThat(context).doesNotHaveBean(City.class)); - } - @Test void vendorPropertiesWithEmbeddedDatabaseAndNoDdlProperty() { contextRunner().run(vendorProperties((vendorProperties) -> {