From 6cb35f72090791729070075c37469648b25f7d9b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 9 Jul 2024 18:48:31 +0100 Subject: [PATCH] Adapt to changes in Oracle Database 23.4.0.24.05 See gh-41147 --- .../jdbc/OracleUcpDataSourceConfigurationTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java index a31f631d3b..8448c9b2f8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.jdbc; import java.sql.Connection; +import java.time.Duration; import javax.sql.DataSource; @@ -82,10 +83,10 @@ class OracleUcpDataSourceConfigurationTests { this.contextRunner.run((context) -> { PoolDataSourceImpl ds = context.getBean(PoolDataSourceImpl.class); assertThat(ds.getInitialPoolSize()).isZero(); - assertThat(ds.getMinPoolSize()).isZero(); + assertThat(ds.getMinPoolSize()).isOne(); assertThat(ds.getMaxPoolSize()).isEqualTo(Integer.MAX_VALUE); assertThat(ds.getInactiveConnectionTimeout()).isZero(); - assertThat(ds.getConnectionWaitTimeout()).isEqualTo(3); + assertThat(ds.getConnectionWaitDuration()).isEqualTo(Duration.ofSeconds(3)); assertThat(ds.getTimeToLiveConnectionTimeout()).isZero(); assertThat(ds.getAbandonedConnectionTimeout()).isZero(); assertThat(ds.getTimeoutCheckInterval()).isEqualTo(30);