From d50b0e4602f23a7bb32526d98e715a3aecfa3f4d Mon Sep 17 00:00:00 2001 From: izeye Date: Sat, 23 Apr 2022 17:48:45 +0900 Subject: [PATCH 1/2] Fix property in defaultDatabaseIsSet test See gh-30778 --- .../orm/jpa/CustomHibernateJpaAutoConfigurationTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index 80804e8033c..0bc680a0245 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -96,8 +96,7 @@ class CustomHibernateJpaAutoConfigurationTests { @Test void defaultDatabaseIsSet() { - this.contextRunner - .withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb", "spring.sql.init.mode:never:never") + this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb", "spring.sql.init.mode:never") .run((context) -> { HibernateJpaVendorAdapter bean = context.getBean(HibernateJpaVendorAdapter.class); Database database = (Database) ReflectionTestUtils.getField(bean, "database"); From 7a986271278fbfc8f9e47b1b1990364507e1502f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 3 May 2022 11:36:12 +0100 Subject: [PATCH 2/2] Polish "Fix property in defaultDatabaseIsSet test" See gh-30778 --- .../jpa/CustomHibernateJpaAutoConfigurationTests.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index 0bc680a0245..e47926a267d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -96,12 +96,11 @@ class CustomHibernateJpaAutoConfigurationTests { @Test void defaultDatabaseIsSet() { - this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb", "spring.sql.init.mode:never") - .run((context) -> { - HibernateJpaVendorAdapter bean = context.getBean(HibernateJpaVendorAdapter.class); - Database database = (Database) ReflectionTestUtils.getField(bean, "database"); - assertThat(database).isEqualTo(Database.DEFAULT); - }); + this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb").run((context) -> { + HibernateJpaVendorAdapter bean = context.getBean(HibernateJpaVendorAdapter.class); + Database database = (Database) ReflectionTestUtils.getField(bean, "database"); + assertThat(database).isEqualTo(Database.DEFAULT); + }); } @Configuration(proxyBeanMethods = false)