From ac93dc3252f36929dae41986d70ae9d091bb409f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Sun, 3 Apr 2022 10:17:28 +0200
Subject: [PATCH] Remove reference to spring.datasource.initialization-mode in
 tests

Closes gh-30511
---
 .../orm/jpa/CustomHibernateJpaAutoConfigurationTests.java    | 5 +++--
 .../orm/jpa/HibernateDefaultDdlAutoProviderTests.java        | 2 +-
 2 files changed, 4 insertions(+), 3 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 72d592f6a6f..5ee34b0c545 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,9 @@ class CustomHibernateJpaAutoConfigurationTests {
 
 	@Test
 	void defaultDatabaseIsSet() {
-		this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb",
-				"spring.datasource.initialization-mode:never").run((context) -> {
+		this.contextRunner
+				.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb", "spring.sql.init.mode:never:never")
+				.run((context) -> {
 					HibernateJpaVendorAdapter bean = context.getBean(HibernateJpaVendorAdapter.class);
 					Database database = (Database) ReflectionTestUtils.getField(bean, "database");
 					assertThat(database).isEqualTo(Database.DEFAULT);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProviderTests.java
index 14e0cffd261..295ecc1cd93 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProviderTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateDefaultDdlAutoProviderTests.java
@@ -42,7 +42,7 @@ class HibernateDefaultDdlAutoProviderTests {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(
 					AutoConfigurations.of(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class))
-			.withPropertyValues("spring.datasource.initialization-mode:never");
+			.withPropertyValues("spring.sql.init.mode:never");
 
 	@Test
 	void defaultDDlAutoForEmbedded() {